[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into staging
|
From: |
guix-commits |
|
Subject: |
01/01: Merge branch 'master' into staging |
|
Date: |
Sun, 10 Jan 2021 07:36:11 -0500 (EST) |
efraim pushed a commit to branch staging
in repository guix.
commit 6985a1acb3e9cc4cad8b6f63d77154842d25c929
Merge: 87eaa42 d0fff8f
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Sun Jan 10 14:30:36 2021 +0200
Merge branch 'master' into staging
Makefile.am | 13 +-
doc/contributing.texi | 17 +-
doc/guix.texi | 16 +-
etc/guix-install.sh | 15 +-
gnu/local.mk | 10 +-
gnu/machine/ssh.scm | 17 +-
gnu/packages/accessibility.scm | 12 +-
gnu/packages/admin.scm | 12 +-
gnu/packages/algebra.scm | 6 +-
gnu/packages/aspell.scm | 7 +-
gnu/packages/astronomy.scm | 6 +-
gnu/packages/audio.scm | 27 +-
gnu/packages/authentication.scm | 6 +-
gnu/packages/backup.scm | 14 +
gnu/packages/base.scm | 31 +-
gnu/packages/c.scm | 9 +-
gnu/packages/compression.scm | 10 +-
gnu/packages/cpp.scm | 3 +-
gnu/packages/cran.scm | 82 +
gnu/packages/crates-gtk.scm | 4 +-
gnu/packages/crates-io.scm | 6069 ++++++++++++++++++--
gnu/packages/crypto.scm | 10 +-
gnu/packages/curl.scm | 69 +-
gnu/packages/databases.scm | 3 -
gnu/packages/dictionaries.scm | 57 +
gnu/packages/digest.scm | 36 +
gnu/packages/disk.scm | 73 +-
gnu/packages/display-managers.scm | 5 +-
gnu/packages/ebook.scm | 6 +-
gnu/packages/electronics.scm | 11 +-
gnu/packages/emacs-xyz.scm | 348 +-
gnu/packages/emulators.scm | 6 +-
gnu/packages/engineering.scm | 209 +-
gnu/packages/enlightenment.scm | 6 +-
gnu/packages/file-systems.scm | 4 +-
gnu/packages/finance.scm | 26 +-
gnu/packages/fonts.scm | 16 +-
gnu/packages/fpga.scm | 35 +-
gnu/packages/game-development.scm | 29 +-
gnu/packages/games.scm | 26 +-
gnu/packages/geo.scm | 7 +-
gnu/packages/gnome-xyz.scm | 348 +-
gnu/packages/gnome.scm | 199 +-
gnu/packages/gnuzilla.scm | 14 +-
gnu/packages/gobby.scm | 16 +-
gnu/packages/golang.scm | 355 ++
gnu/packages/gps.scm | 40 +-
gnu/packages/graphics.scm | 61 +-
gnu/packages/gsasl.scm | 8 +-
gnu/packages/gtk.scm | 67 +-
gnu/packages/guile-xyz.scm | 264 +-
gnu/packages/guile.scm | 4 +-
gnu/packages/hardware.scm | 54 +-
gnu/packages/icu4c.scm | 4 +-
gnu/packages/image-processing.scm | 117 +-
gnu/packages/image-viewers.scm | 73 +-
gnu/packages/image.scm | 14 +-
gnu/packages/imagemagick.scm | 6 +-
gnu/packages/javascript.scm | 111 +
gnu/packages/kde-multimedia.scm | 15 +-
gnu/packages/kde-pim.scm | 4 +-
gnu/packages/kde-plasma.scm | 30 +
gnu/packages/kde-systemtools.scm | 50 +
gnu/packages/kde.scm | 82 +-
gnu/packages/linux.scm | 200 +-
gnu/packages/lisp-xyz.scm | 282 +-
gnu/packages/lisp.scm | 8 +-
gnu/packages/mail.scm | 40 +-
gnu/packages/maths.scm | 9 +-
gnu/packages/messaging.scm | 243 +-
gnu/packages/moe.scm | 6 +-
gnu/packages/monitoring.scm | 7 +-
gnu/packages/moreutils.scm | 6 +-
gnu/packages/mpd.scm | 4 +-
gnu/packages/music.scm | 75 +-
gnu/packages/networking.scm | 11 +-
gnu/packages/ocaml.scm | 613 +-
gnu/packages/package-management.scm | 23 +-
gnu/packages/parallel.scm | 25 +-
.../emacs-scheme-complete-scheme-r5rs-info.patch | 14 -
gnu/packages/patches/gpsbabel-fix-i686-test.patch | 46 +
gnu/packages/patches/gpsbabel-minizip.patch | 13 -
gnu/packages/patches/gpsbabel-qstring.patch | 69 -
gnu/packages/patches/icecat-makeicecat.patch | 4 +-
gnu/packages/patches/pidgin-libnm.patch | 60 -
gnu/packages/patches/pidgin-vv-gst.patch | 48 +
gnu/packages/patches/pulseview-qt515-compat.patch | 145 +
gnu/packages/patches/rust-1.48-linker-locale.patch | 14 +
.../smalltalk-multiplication-overflow.patch | 121 +
gnu/packages/perl-check.scm | 7 +-
gnu/packages/perl.scm | 36 +
gnu/packages/php.scm | 4 +-
gnu/packages/pretty-print.scm | 6 +-
gnu/packages/printers.scm | 62 +-
gnu/packages/python-crypto.scm | 15 +-
gnu/packages/python-xyz.scm | 136 +-
gnu/packages/qt.scm | 33 +
gnu/packages/radio.scm | 6 +-
gnu/packages/rcm.scm | 5 +-
gnu/packages/rpc.scm | 4 +-
gnu/packages/rsync.scm | 5 +-
gnu/packages/rust-apps.scm | 73 +-
gnu/packages/rust.scm | 71 +-
gnu/packages/sagemath.scm | 5 +-
gnu/packages/samba.scm | 12 +-
gnu/packages/search.scm | 7 +-
gnu/packages/security-token.scm | 16 +-
gnu/packages/sequoia.scm | 28 +-
gnu/packages/shells.scm | 6 +-
gnu/packages/shellutils.scm | 43 +
gnu/packages/smalltalk.scm | 52 +-
gnu/packages/spice.scm | 5 +-
gnu/packages/syndication.scm | 38 +-
gnu/packages/terminals.scm | 15 +-
gnu/packages/text-editors.scm | 9 +
gnu/packages/tls.scm | 10 +-
gnu/packages/tor.scm | 2 +-
gnu/packages/upnp.scm | 56 +-
gnu/packages/version-control.scm | 62 +-
gnu/packages/video.scm | 31 +-
gnu/packages/vim.scm | 16 +-
gnu/packages/virtualization.scm | 10 +-
gnu/packages/visidata.scm | 4 +-
gnu/packages/vpn.scm | 6 +-
gnu/packages/web.scm | 27 +-
gnu/packages/wm.scm | 39 +-
gnu/packages/xdisorg.scm | 10 +-
gnu/packages/xfce.scm | 52 +-
gnu/packages/xiph.scm | 6 +-
gnu/packages/xml.scm | 10 +-
gnu/packages/xorg.scm | 6 +-
gnu/services/linux.scm | 59 +-
guix/build/cargo-build-system.scm | 6 +-
d3.v3.js => guix/d3.v3.js | 0
graph.js => guix/graph.js | 0
guix/graph.scm | 6 +-
guix/import/elpa.scm | 43 +-
guix/import/utils.scm | 4 +-
guix/lint.scm | 4 +-
guix/scripts.scm | 4 +-
guix/scripts/environment.scm | 2 -
guix/scripts/hash.scm | 5 +-
guix/scripts/import/elpa.scm | 15 +-
guix/scripts/substitute.scm | 6 +-
guix/scripts/system.scm | 43 +-
guix/self.scm | 7 +-
guix/ui.scm | 71 +-
guix/upstream.scm | 16 +-
tests/guix-hash.sh | 3 +-
149 files changed, 10534 insertions(+), 2196 deletions(-)
diff --cc gnu/packages/rust.scm
index 17aaeff,58a9092..e646cd0
--- a/gnu/packages/rust.scm
+++ b/gnu/packages/rust.scm
@@@ -1317,70 -1317,77 +1317,139 @@@ move around.
#t)))))))))
(define-public rust-1.46
- (rust-bootstrapped-package rust-1.45 "1.46.0"
- "0a17jby2pd050s24cy4dfc0gzvgcl585v3vvyfilniyvjrqknsid"))
+ (let ((base-rust
+ (rust-bootstrapped-package rust-1.45 "1.46.0"
+ "0a17jby2pd050s24cy4dfc0gzvgcl585v3vvyfilniyvjrqknsid")))
+ (package
+ (inherit base-rust)
+ (outputs (cons "rustfmt" (package-outputs base-rust)))
+ (arguments
+ (substitute-keyword-arguments (package-arguments base-rust)
+ ((#:phases phases)
+ `(modify-phases ,phases
+ (replace 'build
+ (lambda* _
+ (invoke "./x.py" "build")
+ (invoke "./x.py" "build" "src/tools/cargo")
+ (invoke "./x.py" "build" "src/tools/rustfmt")))
+ (replace 'check
+ (lambda* _
+ ;; Test rustfmt.
+ (let ((parallel-job-spec
+ (string-append "-j" (number->string
+ (min 4
+ (parallel-job-count))))))
+ (invoke "./x.py" parallel-job-spec "test" "-vv")
+ (invoke "./x.py" parallel-job-spec "test"
+ "src/tools/cargo")
+ (invoke "./x.py" parallel-job-spec "test"
+ "src/tools/rustfmt"))))
+ (replace 'install
+ (lambda* (#:key outputs #:allow-other-keys)
+ (invoke "./x.py" "install")
+ (substitute* "config.toml"
+ ;; replace prefix to specific output
+ (("prefix = \"[^\"]*\"")
+ (string-append "prefix = \"" (assoc-ref outputs "cargo")
"\"")))
+ (invoke "./x.py" "install" "cargo")
+ (substitute* "config.toml"
+ ;; replace prefix to specific output
+ (("prefix = \"[^\"]*\"")
+ (string-append "prefix = \"" (assoc-ref outputs
"rustfmt") "\"")))
+ (invoke "./x.py" "install" "rustfmt")))
+ (replace 'delete-install-logs
+ (lambda* (#:key outputs #:allow-other-keys)
+ (define (delete-manifest-file out-path file)
+ (delete-file (string-append out-path "/lib/rustlib/"
file)))
+
+ (let ((out (assoc-ref outputs "out"))
+ (cargo-out (assoc-ref outputs "cargo"))
+ (rustfmt-out (assoc-ref outputs "rustfmt")))
+ (for-each
+ (lambda (file) (delete-manifest-file out file))
+ '("install.log"
+ "manifest-rust-docs"
+ ,(string-append "manifest-rust-std-"
+ (nix-system->gnu-triplet-for-rust))
+ "manifest-rustc"))
+ (for-each
+ (lambda (file) (delete-manifest-file cargo-out file))
+ '("install.log"
+ "manifest-cargo"))
+ (for-each
+ (lambda (file) (delete-manifest-file rustfmt-out file))
+ '("install.log"
+ "manifest-rustfmt-preview"))
+ #t))))))))))
+ (define-public rust-1.47
+ (let ((base-rust
+ (rust-bootstrapped-package rust-1.46 "1.47.0"
+ "07fqd2vp7cf1ka3hr207dnnz93ymxml4935vp74g4is79h3dz19i")))
+ (package
+ (inherit base-rust)
+ (inputs
+ (alist-replace "llvm" (list llvm-11)
+ (package-inputs base-rust)))
+ (arguments
+ (substitute-keyword-arguments (package-arguments base-rust)
+ ((#:phases phases)
+ `(modify-phases ,phases
+ ;; The source code got rearranged: libstd is now in the newly
created library folder.
+ (replace 'patch-tests
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((bash (assoc-ref inputs "bash")))
+ (substitute* "library/std/src/process.rs"
+ (("\"/bin/sh\"") (string-append "\"" bash "/bin/sh\"")))
+ ;;
<https://lists.gnu.org/archive/html/guix-devel/2017-06/msg00222.html>
+ (substitute*
"library/std/src/sys/unix/process/process_common.rs"
+ (("fn test_process_mask") "#[allow(unused_attributes)]
+ #[ignore]
+ fn test_process_mask"))
+ #t)))
+ (delete 'patch-cargo-checksums)
+ (add-after 'patch-generated-file-shebangs 'patch-cargo-checksums
+ ;; Generate checksums after patching generated files (in
+ ;; particular, vendor/jemalloc/rep/Makefile).
+ (lambda* _
+ (use-modules (guix build cargo-utils))
+ (substitute* "Cargo.lock"
+ (("(checksum = )\".*\"" all name)
+ (string-append name "\"" ,%cargo-reference-hash "\"")))
+ (generate-all-checksums "vendor")
+ #t)))))))))
+
+ (define-public rust-1.48
+ (let ((base-rust
+ (rust-bootstrapped-package rust-1.47 "1.48.0"
+ "0fz4gbb5hp5qalrl9lcl8yw4kk7ai7wx511jb28nypbxninkwxhf")))
+ (package
+ (inherit base-rust)
+ (source
+ (origin
+ (inherit (package-source base-rust))
+ ;; New patch required due to the second part of the source code
rearrangement:
+ ;; the relevant source code is now in the compiler directory.
+ (patches (search-patches "rust-1.48-linker-locale.patch"))))
+ (arguments
+ (substitute-keyword-arguments (package-arguments base-rust)
+ ((#:phases phases)
+ `(modify-phases ,phases
+ ;; Some tests got split out into separate files.
+ (replace 'patch-tests
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((bash (assoc-ref inputs "bash")))
+ (substitute* "library/std/src/process/tests.rs"
+ (("\"/bin/sh\"") (string-append "\"" bash "/bin/sh\"")))
+ (substitute*
"library/std/src/sys/unix/process/process_common/tests.rs"
+ (("fn test_process_mask") "#[allow(unused_attributes)]
+ #[ignore]
+ fn test_process_mask"))
+ #t))))))))))
+
+ (define-public rust-1.49
+ (rust-bootstrapped-package rust-1.48 "1.49.0"
+ "0yf7kll517398dgqsr7m3gldzj0iwsp3ggzxrayckpqzvylfy2mm"))
+
;; TODO(staging): Bump this variable to the latest packaged rust.
(define-public rust rust-1.45)