ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 21:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: nix: Update to 2.0.4.

Browse source 
* gnu/packages/package-management.scm (nix): Update to 2.0.4.
This commit is contained in:
宋文武 2018-06-10 21:29:04 +08:00
parent 1bfde769f6
commit e6c8199b66
No known key found for this signature in database
GPG key ID: 26525665AE727D37
1 changed files with 10 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
gnu/packages/package-management.scm
View file

@ -33,6 +33,7 @@ (define-module (gnu packages package-management)
#:use-module (gnu packages check) #:use-module (gnu packages check)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages cpio) #:use-module (gnu packages cpio)
#:use-module (gnu packages crypto)
#:use-module (gnu packages curl) #:use-module (gnu packages curl)
#:use-module (gnu packages databases) #:use-module (gnu packages databases)
#:use-module (gnu packages file) #:use-module (gnu packages file)
@ -376,41 +377,24 @@ (define-public current-guix
(define-public nix (define-public nix
(package (package
(name "nix") (name "nix")
(version "1.11.9") (version "2.0.4")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://nixos.org/releases/nix/nix-" (uri (string-append "http://nixos.org/releases/nix/nix-"
version "/nix-" version ".tar.xz")) version "/nix-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1qg7qrfr60dysmyfg3ijgani71l23p1kqadhjs8kz11pgwkkx50f")))) "0ss9svxlh1pvrdmnqjvjyqjmbqmrdbyfarvbb14i9d4bggzl0r8n"))))
(build-system gnu-build-system) (build-system gnu-build-system)
;; XXX: Should we pass '--with-store-dir=/gnu/store'? But then we'd also (native-inputs `(("pkg-config" ,pkg-config)))
;; need '--localstatedir=/var'. But then! The thing would use /var/nix
;; instead of /var/guix. So in the end, we do nothing special.
(arguments
'(#:configure-flags
;; Set the prefixes of Perl libraries to avoid propagation.
(let ((perl-libdir (lambda (p)
(string-append
(assoc-ref %build-inputs p)
"/lib/perl5/site_perl"))))
(list (string-append "--with-dbi="
(perl-libdir "perl-dbi"))
(string-append "--with-dbd-sqlite="
(perl-libdir "perl-dbd-sqlite"))
(string-append "--with-www-curl="
(perl-libdir "perl-www-curl"))))))
(native-inputs `(("perl" ,perl)
("pkg-config" ,pkg-config)))
(inputs `(("curl" ,curl) (inputs `(("curl" ,curl)
("openssl" ,openssl)
("libgc" ,libgc)
("sqlite" ,sqlite)
("bzip2" ,bzip2) ("bzip2" ,bzip2)
("perl-www-curl" ,perl-www-curl) ("libgc" ,libgc)
("perl-dbi" ,perl-dbi) ("libseccomp" ,libseccomp)
("perl-dbd-sqlite" ,perl-dbd-sqlite))) ("libsodium" ,libsodium)
("openssl" ,openssl)
("sqlite" ,sqlite)
("xz" ,xz)))
(home-page "https://nixos.org/nix/") (home-page "https://nixos.org/nix/")
(synopsis "The Nix package manager") (synopsis "The Nix package manager")
(description (description