From 01e8263febb9634564b4b73af49b81a36567a11b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 20 Sep 2018 19:56:30 +0200 Subject: gnu: Use GCC 7 as the default compiler. * gnu/packages/cross-base.scm (%gcc-cross-include-paths): Remove CROSS_C_INCLUDE_PATH & co in favor of CROSS_CPATH. * gnu/build/cross-toolchain.scm (%gcc-cross-include-paths): Likewise. (cross-gcc-build-phases): Set CROSS_C_INCLUDE_PATH and CROSS_CPLUS_INCLUDE_PATH when building the cross GCC. * gnu/packages/commencement.scm (libstdc++): Add "--disable-libstdcxx-dual-abi" to #:configure-flags. (gcc-boot0)[arguments]: Add "--disable-libmpx" to #:configure-flags. (gcc-final): Add phase to set C_INCLUDE_PATH and CPLUS_INCLUDE_PATH before building GCC. (gcc-toolchain-5): Use MAKE-GCC-TOOLCHAIN. (gcc-toolchain-7): Change to GCC-TOOLCHAIN. * gnu/packages/gcc.scm (gcc): Change from GCC-5 to GCC-7. (gfortran): Change to GFORTRAN-7. (gcc-objc): Change to GCC-OBJC-7. (gcc-objc++): Change to GCC-OBJC++-7. * gnu/packages/rust.scm (rust-1.19.0)[native-search-paths]: Change from C_INCLUDE_PATH & co to CPATH. --- gnu/packages/rust.scm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'gnu/packages/rust.scm') diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 501736d898..6e3ea79845 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -406,10 +406,7 @@ test = { path = \"../libtest\" } ;; modules (see ). (native-search-paths (list (search-path-specification - (variable "C_INCLUDE_PATH") - (files '("include"))) - (search-path-specification - (variable "CPLUS_INCLUDE_PATH") + (variable "CPATH") (files '("include"))) (search-path-specification (variable "LIBRARY_PATH") -- cgit v1.2.3 From e74f153a10ca387a50c3acaf685981048c1bdb70 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 1 Mar 2019 17:52:57 +0100 Subject: gnu: Use OpenSSL 1.1 as the default OpenSSL package. * gnu/packages/tls.scm (openssl-next): Delete variable. Move related code ... (openssl) ... here. (openssl-1.0): New public variable. Retain old arguments. * gnu/packages/crypto.scm (asignify)[inputs]: Change OPENSSL-NEXT to OPENSSL. * gnu/packages/databases.scm (mariadb)[inputs]: Change from OPENSSL to OPENSSL-1.0. * gnu/packages/node.scm (node)[inputs]: Likewise. * gnu/packages/rust.scm (rust-1.19)[inputs]: Likewise. --- gnu/packages/crypto.scm | 2 +- gnu/packages/databases.scm | 2 +- gnu/packages/node.scm | 2 +- gnu/packages/rust.scm | 2 +- gnu/packages/tls.scm | 211 ++++++++++++++++++++++----------------------- 5 files changed, 106 insertions(+), 113 deletions(-) (limited to 'gnu/packages/rust.scm') diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index cc09f4abe1..cfd1df123d 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -817,7 +817,7 @@ security.") ("automake" ,automake) ("libtool" ,libtool))) (inputs - `(("openssl" ,openssl-next))) + `(("openssl" ,openssl))) (home-page "https://github.com/vstakhov/asignify") (synopsis "Cryptographic authentication and encryption tool and library") (description "Asignify offers public cryptographic signatures and diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index f63257034f..e151a5d9e2 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -671,7 +671,7 @@ Language.") ("zlib" ,zlib))) (propagated-inputs ;; mariadb.pc says -lssl -lcrypto, so propagate it. - `(("openssl" ,openssl))) + `(("openssl" ,openssl-1.0))) ;; The test suite is very resource intensive and can take more than three ;; hours on a x86_64 system. Give slow and busy machines some leeway. (properties '((timeout . 64800))) ;18 hours diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index a0221601dd..2772f56d9f 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -186,7 +186,7 @@ ("icu4c" ,icu4c) ("libuv" ,libuv-1.19) ("nghttp2" ,nghttp2 "lib") - ("openssl" ,openssl) + ("openssl" ,openssl-1.0) ("zlib" ,zlib))) (synopsis "Evented I/O for V8 JavaScript") (description "Node.js is a platform built on Chrome's JavaScript runtime diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 2c9668c2f2..abd873aefa 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -400,7 +400,7 @@ test = { path = \"../libtest\" } (inputs `(("jemalloc" ,jemalloc-4.5.0) ("llvm" ,llvm-3.9.1) - ("openssl" ,openssl) + ("openssl" ,openssl-1.0) ("libssh2" ,libssh2) ; For "cargo" ("libcurl" ,curl))) ; For "cargo" diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index f736447523..1ab9ec5a54 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2016, 2017, 2018 Nils Gillmann ;;; Copyright © 2016 Hartmut Goebel ;;; Copyright © 2017 Ricardo Wurmus -;;; Copyright © 2017, 2018 Marius Bakke +;;; Copyright © 2017, 2018, 2019 Marius Bakke ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2017 Rutger Helling ;;; Copyright © 2018 Clément Lassieur @@ -262,7 +262,7 @@ required structures.") (define-public openssl (package (name "openssl") - (version "1.0.2r") + (version "1.1.1b") (source (origin (method url-fetch) (uri (list (string-append "https://www.openssl.org/source/openssl-" @@ -274,13 +274,12 @@ required structures.") "/openssl-" version ".tar.gz"))) (sha256 (base32 - "1mnh27zf6r1bhm5d9fxqq9slv2gz0d9z2ij9i679b0wapa5x0ldf")) - (patches (search-patches "openssl-runpath.patch" - "openssl-c-rehash-in.patch")))) + "0jza8cmznnyiia43056dij1jdmz62dx17wsn0zxksh9h6817nmaw")) + (patches (search-patches "openssl-1.1-c-rehash-in.patch")))) (build-system gnu-build-system) (outputs '("out" - "doc" ;1.5MiB of man3 pages - "static")) ;6MiB of .a files + "doc" ;6.8 MiB of man3 pages and full HTML documentation + "static")) ;6.4 MiB of .a files (native-inputs `(("perl" ,perl))) (arguments `(#:disallowed-references (,perl) @@ -293,31 +292,27 @@ required structures.") #:disallowed-references ,(list (canonical-package perl)) #:phases (modify-phases %standard-phases - (add-before - 'configure 'patch-Makefile.org - (lambda* (#:key outputs #:allow-other-keys) - ;; The default MANDIR is some unusual place. Fix that. - (let ((out (assoc-ref outputs "out"))) - (patch-makefile-SHELL "Makefile.org") - (substitute* "Makefile.org" - (("^MANDIR[[:blank:]]*=.*$") - (string-append "MANDIR = " out "/share/man\n"))) - #t))) - (replace - 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (invoke "./config" - "shared" ;build shared libraries - "--libdir=lib" - - ;; The default for this catch-all directory is - ;; PREFIX/ssl. Change that to something more - ;; conventional. - (string-append "--openssldir=" out - "/share/openssl-" ,version) - - (string-append "--prefix=" out))))) + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (lib (string-append out "/lib"))) + ;; It's not a shebang so patch-source-shebangs misses it. + (substitute* "config" + (("/usr/bin/env") + (string-append (assoc-ref %build-inputs "coreutils") + "/bin/env"))) + (invoke "./config" + "shared" ;build shared libraries + "--libdir=lib" + + ;; The default for this catch-all directory is + ;; PREFIX/ssl. Change that to something more + ;; conventional. + (string-append "--openssldir=" out + "/share/openssl-" ,version) + + (string-append "--prefix=" out) + (string-append "-Wl,-rpath," lib))))) (add-after 'install 'move-static-libraries (lambda* (#:key outputs #:allow-other-keys) ;; Move static libraries to the "static" output. @@ -330,31 +325,20 @@ required structures.") (delete-file file)) (find-files lib "\\.a$")) #t))) - (add-after 'install 'move-man3-pages + (add-after 'install 'move-extra-documentation (lambda* (#:key outputs #:allow-other-keys) - ;; Move section 3 man pages to "doc". - (let* ((out (assoc-ref outputs "out")) - (man3 (string-append out "/share/man/man3")) - (doc (assoc-ref outputs "doc")) - (target (string-append doc "/share/man/man3"))) - (mkdir-p target) - (for-each (lambda (file) - (rename-file file - (string-append target "/" - (basename file)))) - (find-files man3)) - (delete-file-recursively man3) - #t))) - (add-before - 'patch-source-shebangs 'patch-tests - (lambda* (#:key inputs native-inputs #:allow-other-keys) - (let ((bash (assoc-ref (or native-inputs inputs) "bash"))) - (substitute* (find-files "test" ".*") - (("/bin/sh") - (string-append bash "/bin/sh")) - (("/bin/rm") - "rm")) - #t))) + ;; Move man3 pages and full HTML documentation to "doc". + (let* ((out (assoc-ref outputs "out")) + (man3 (string-append out "/share/man/man3")) + (html (string-append out "/share/doc/openssl")) + (doc (assoc-ref outputs "doc")) + (man-target (string-append doc "/share/man/man3")) + (html-target (string-append doc "/share/doc/openssl"))) + (copy-recursively man3 man-target) + (delete-file-recursively man3) + (copy-recursively html html-target) + (delete-file-recursively html) + #t))) (add-after 'install 'remove-miscellany (lambda* (#:key outputs #:allow-other-keys) @@ -380,72 +364,81 @@ required structures.") (license license:openssl) (home-page "https://www.openssl.org/"))) -(define-public openssl-next +(define-public openssl-1.0 (package (inherit openssl) (name "openssl") - (version "1.1.1b") + (version "1.0.2r") (source (origin - (method url-fetch) - (uri (list (string-append "https://www.openssl.org/source/openssl-" - version ".tar.gz") - (string-append "ftp://ftp.openssl.org/source/" - "openssl-" version ".tar.gz") - (string-append "ftp://ftp.openssl.org/source/old/" - (string-trim-right version char-set:letter) - "/openssl-" version ".tar.gz"))) - (patches (search-patches "openssl-1.1-c-rehash-in.patch")) + (method url-fetch) + (uri (list (string-append "https://www.openssl.org/source/openssl-" + version ".tar.gz") + (string-append "ftp://ftp.openssl.org/source/" + "openssl-" version ".tar.gz") + (string-append "ftp://ftp.openssl.org/source/old/" + (string-trim-right version char-set:letter) + "/openssl-" version ".tar.gz"))) (sha256 (base32 - "0jza8cmznnyiia43056dij1jdmz62dx17wsn0zxksh9h6817nmaw")))) + "1mnh27zf6r1bhm5d9fxqq9slv2gz0d9z2ij9i679b0wapa5x0ldf")) + (patches (search-patches "openssl-runpath.patch" + "openssl-c-rehash-in.patch")))) (outputs '("out" - "doc" ; 6.8 MiB of man3 pages and full HTML documentation - "static")) ; 6.4 MiB of .a files + "doc" ;1.5MiB of man3 pages + "static")) ;6MiB of .a files (arguments (substitute-keyword-arguments (package-arguments openssl) ((#:phases phases) `(modify-phases ,phases - (delete 'patch-tests) ; These two phases are not needed by - (delete 'patch-Makefile.org) ; OpenSSL 1.1. - - ;; Override configure phase since -rpath is now a configure option. - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (lib (string-append out "/lib"))) - ;; It's not a shebang so patch-source-shebangs misses it. - (substitute* "config" - (("/usr/bin/env") - (string-append (assoc-ref %build-inputs "coreutils") - "/bin/env"))) - (invoke "./config" - "shared" ;build shared libraries - "--libdir=lib" - - ;; The default for this catch-all directory is - ;; PREFIX/ssl. Change that to something more - ;; conventional. - (string-append "--openssldir=" out - "/share/openssl-" ,version) - - (string-append "--prefix=" out) - (string-append "-Wl,-rpath," lib))))) - - (delete 'move-man3-pages) - (add-after 'install 'move-extra-documentation + (add-before 'patch-source-shebangs 'patch-tests + (lambda* (#:key inputs native-inputs #:allow-other-keys) + (let ((bash (assoc-ref (or native-inputs inputs) "bash"))) + (substitute* (find-files "test" ".*") + (("/bin/sh") + (string-append bash "/bin/sh")) + (("/bin/rm") + "rm")) + #t))) + (add-before 'configure 'patch-Makefile.org (lambda* (#:key outputs #:allow-other-keys) - ;; Move man3 pages and full HTML documentation to "doc". - (let* ((out (assoc-ref outputs "out")) - (man3 (string-append out "/share/man/man3")) - (html (string-append out "/share/doc/openssl")) - (doc (assoc-ref outputs "doc")) - (man-target (string-append doc "/share/man/man3")) - (html-target (string-append doc "/share/doc/openssl"))) - (copy-recursively man3 man-target) - (delete-file-recursively man3) - (copy-recursively html html-target) - (delete-file-recursively html) + ;; The default MANDIR is some unusual place. Fix that. + (let ((out (assoc-ref outputs "out"))) + (patch-makefile-SHELL "Makefile.org") + (substitute* "Makefile.org" + (("^MANDIR[[:blank:]]*=.*$") + (string-append "MANDIR = " out "/share/man\n"))) #t))) + (replace 'configure + ;; Override this phase because OpenSSL 1.0 does not understand -rpath. + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (invoke "./config" + "shared" ;build shared libraries + "--libdir=lib" + + ;; The default for this catch-all directory is + ;; PREFIX/ssl. Change that to something more + ;; conventional. + (string-append "--openssldir=" out + "/share/openssl-" ,version) + + (string-append "--prefix=" out))))) + (delete 'move-extra-documentation) + (add-after 'install 'move-man3-pages + (lambda* (#:key outputs #:allow-other-keys) + ;; Move section 3 man pages to "doc". + (let* ((out (assoc-ref outputs "out")) + (man3 (string-append out "/share/man/man3")) + (doc (assoc-ref outputs "doc")) + (target (string-append doc "/share/man/man3"))) + (mkdir-p target) + (for-each (lambda (file) + (rename-file file + (string-append target "/" + (basename file)))) + (find-files man3)) + (delete-file-recursively man3) + #t))) ;; XXX: Duplicate this phase to make sure 'version' evaluates ;; in the current scope and not the inherited one. (replace 'remove-miscellany -- cgit v1.2.3 From c69959f0545e5383a8caab53944c86abc5dfeeed Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 17 Jun 2019 17:24:24 +0200 Subject: gnu: Replace uses of 'cmake' with 'cmake-minimal'. This follows up commit 2f33a7321e5e37d37f57c229c8079cb4ffd10834 which introduced a new CMAKE-MINIMAL variant for use in package inputs. * gnu/packages/databases.scm (python-pyarrow)[native-inputs]: Replace CMAKE with CMAKE-MINIMAL. * gnu/packages/emacs-xyz.scm (emacs-scel)[native-inputs]: Likewise. * gnu/packages/firmware.scm (ath9k-htc-firmware)[native-inputs]: Likewise. * gnu/packages/games.scm (0ad, the-butterfly-effect)[native-inputs]: Likewise. * gnu/packages/gnome.scm (deja-dup)[native-inputs]: Likewise. * gnu/packages/ibus.scm (ibus-rime)[native-inputs]: Likewise. * gnu/packages/rust.scm (rust-1.19)[native-inputs]: Likewise. * gnu/packages/simulation.scm (fenics)[native-inputs]: Likewise. * gnu/packages/squirrel.scm (squirrel)[native-inputs]: Likewise. * gnu/packages/video.scm (handbrake)[native-inputs]: Likewise. * gnu/packages/virtualization.scm (xen)[native-inputs]: Likewise. * gnu/packages/vulkan.scm (shaderc)[native-inputs]: Likewise. --- gnu/packages/databases.scm | 2 +- gnu/packages/emacs-xyz.scm | 2 +- gnu/packages/firmware.scm | 2 +- gnu/packages/games.scm | 4 ++-- gnu/packages/gnome.scm | 2 +- gnu/packages/ibus.scm | 2 +- gnu/packages/rust.scm | 2 +- gnu/packages/simulation.scm | 2 +- gnu/packages/squirrel.scm | 2 +- gnu/packages/video.scm | 2 +- gnu/packages/virtualization.scm | 2 +- gnu/packages/vulkan.scm | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) (limited to 'gnu/packages/rust.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index c38f6d2db7..f4966276a0 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -3052,7 +3052,7 @@ algorithm implementations.") ("python-pandas" ,python-pandas) ("python-six" ,python-six))) (native-inputs - `(("cmake" ,cmake) + `(("cmake" ,cmake-minimal) ("python-cython" ,python-cython) ("python-pytest" ,python-pytest) ("python-pytest-runner" ,python-pytest-runner) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 9bf101ab31..176aa90eab 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3470,7 +3470,7 @@ to a key in your preferred mode.") (inputs `(("supercollider" ,supercollider))) (native-inputs - `(("cmake" ,cmake))) + `(("cmake" ,cmake-minimal))) (home-page "https://github.com/supercollider/scel") (synopsis "SuperCollider Emacs interface") (description "@code{emacs-scel} is an Emacs interface to SuperCollider. diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index 90cb8845cf..8f0b6cb15e 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -84,7 +84,7 @@ ;; Use our own tool chain for that. (native-inputs `(("cross-gcc" ,(cross-gcc "xtensa-elf")) ("cross-binutils" ,(cross-binutils "xtensa-elf")) - ("cmake" ,cmake) + ("cmake" ,cmake-minimal) ("perl" ,perl))) (home-page "http://wireless.kernel.org/en/users/Drivers/ath9k_htc") (synopsis "Firmware for the Atheros AR7010 and AR9271 USB 802.11n NICs") diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index b177c0b2f0..8e8c6c8058 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -4779,7 +4779,7 @@ fight against their plot and save his fellow rabbits from slavery.") ("zlib" ,zlib))) (native-inputs `(("boost" ,boost) - ("cmake" ,cmake) + ("cmake" ,cmake-minimal) ("mesa" ,mesa) ("pkg-config" ,pkg-config) ("python-2" ,python-2))) @@ -5272,7 +5272,7 @@ making Yamagi Quake II one of the most solid Quake II implementations available. `(("qtbase" ,qtbase) ("qtsvg" ,qtsvg))) (native-inputs - `(("cmake" ,cmake) + `(("cmake" ,cmake-minimal) ("gettext-minimal" ,gettext-minimal) ("qttools" ,qttools))) (synopsis "Realistic physics puzzle game") diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 3c455b2838..ab2bd4e3e9 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -299,7 +299,7 @@ features to enable users to create their discs easily and quickly.") ("gettext" ,gettext-minimal) ("itstool" ,itstool) ("intltool" ,intltool) - ("cmake" ,cmake))) + ("cmake" ,cmake-minimal))) (home-page "https://launchpad.net/deja-dup") (synopsis "Simple backup tool, for regular encrypted backups") (description diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index f652cca1c2..eab35dbadd 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -677,7 +677,7 @@ Method Engine.") ("librime" ,librime) ("rime-data" ,rime-data))) (native-inputs - `(("cmake" ,cmake) + `(("cmake" ,cmake-minimal) ("pkg-config" ,pkg-config))) (home-page "https://rime.im/") (synopsis "Rime Input Method Engine for IBus") diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 43725c64ce..f90bc52506 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -387,7 +387,7 @@ test = { path = \"../libtest\" } (build-system gnu-build-system) (native-inputs `(("bison" ,bison) ; For the tests - ("cmake" ,cmake) + ("cmake" ,cmake-minimal) ("flex" ,flex) ; For the tests ("gdb" ,gdb) ; For the tests ("procps" ,procps) ; For the tests diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm index a8d214794e..edc8d6e190 100644 --- a/gnu/packages/simulation.scm +++ b/gnu/packages/simulation.scm @@ -620,7 +620,7 @@ user interface to the FEniCS core components and external libraries.") ("python-matplotlib" ,python-matplotlib) ,@(alist-delete "python" (package-inputs fenics-dolfin)))) (native-inputs - `(("cmake" ,cmake) + `(("cmake" ,cmake-minimal) ("ply" ,python-ply) ("pytest" ,python-pytest) ("python-decorator" ,python-decorator) diff --git a/gnu/packages/squirrel.scm b/gnu/packages/squirrel.scm index 2c3ed6e570..1b9489882f 100644 --- a/gnu/packages/squirrel.scm +++ b/gnu/packages/squirrel.scm @@ -71,7 +71,7 @@ (find-files "../squirrel3/include"))) #t))))) (native-inputs - `(("cmake" ,cmake) + `(("cmake" ,cmake-minimal) ("python-sphinx" ,python-sphinx))) (home-page "https://squirrel-lang.org/") (synopsis "High level imperative, object-oriented programming language") diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index dc6d2fb9b4..9859c55f98 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2604,7 +2604,7 @@ supported players in addition to this package.") (native-inputs `(("automake" ,automake) ;gui subpackage must be bootstrapped ("autoconf" ,autoconf) - ("cmake" ,cmake) ;TODO: could probably strip check from make/configure.py + ("cmake" ,cmake-minimal) ;TODO: could probably strip check from make/configure.py ("curl" ,curl) ;not actually used, but tested for ("intltool" ,intltool) ("libtool" ,libtool) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 87839490b2..303171e61d 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1291,7 +1291,7 @@ override CC = " (assoc-ref inputs "cross-gcc") "/bin/i686-linux-gnu-gcc")) (native-inputs `(("dev86" ,dev86) ("bison" ,bison) - ("cmake" ,cmake) + ("cmake" ,cmake-minimal) ("figlet" ,figlet) ("flex" ,flex) ("gettext" ,gettext-minimal) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 6b151f0a31..6ae9ba9b87 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -326,7 +326,7 @@ API.") `(("googletest" ,googletest) ("python" ,python))) (native-inputs - `(("cmake" ,cmake) + `(("cmake" ,cmake-minimal) ("glslang-source" ,(package-source glslang)) ("pkg-config" ,pkg-config) ("spirv-headers-source" ,(package-source spirv-headers)) -- cgit v1.2.3 From 02c61278f1327d403f072f42e6b92a1dc62fc93a Mon Sep 17 00:00:00 2001 From: Ivan Petkov Date: Sun, 11 Aug 2019 15:07:05 -0700 Subject: gnu: rust: Update to 1.37.0. * gnu/packages/rust.scm (rust): Rename to... (rust-1.36): ...this. (rust): New variable. --- gnu/packages/rust.scm | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) (limited to 'gnu/packages/rust.scm') diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index b4c50437f7..6d1b9f1fe4 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -1073,7 +1073,7 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" (("bins::check") "//bins::check")) #t))))))))) -(define-public rust +(define-public rust-1.36 (let ((base-rust (rust-bootstrapped-package rust-1.35 "1.36.0" "06xv2p6zq03lidr0yaf029ii8wnjjqa894nkmrm6s0rx47by9i04"))) @@ -1084,3 +1084,20 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" ((#:phases phases) `(modify-phases ,phases (delete 'patch-process-docs-rev-cmd)))))))) + +(define-public rust + (let ((base-rust + (rust-bootstrapped-package rust-1.36 "1.37.0" + "1hrqprybhkhs6d9b5pjskfnc5z9v2l2gync7nb39qjb5s0h703hj"))) + (package + (inherit base-rust) + (arguments + (substitute-keyword-arguments (package-arguments base-rust) + ((#:phases phases) + `(modify-phases ,phases + (add-before 'configure 'configure-cargo-home + (lambda _ + (let ((cargo-home (string-append (getcwd) "/.cargo"))) + (mkdir-p cargo-home) + (setenv "CARGO_HOME" cargo-home) + #t)))))))))) -- cgit v1.2.3