From 2e5c71b2a21ec5f89f8bc38ca01480405b9767a1 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 24 May 2019 10:29:39 +0200 Subject: gnu: guix: Add dependency on lzlib. * gnu/packages/package-management.scm (guix)[inputs]: Add LZLIB. --- gnu/packages/package-management.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/package-management.scm') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index a356a6dab7..985fa801b1 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -272,6 +272,7 @@ `(("bzip2" ,bzip2) ("gzip" ,gzip) ("zlib" ,zlib) ;for 'guix publish' + ("lzlib" ,lzlib) ;for 'guix publish' and 'guix substitute' ("sqlite" ,sqlite) ("libgcrypt" ,libgcrypt) -- cgit 1.4.1 From e7f078c337c98e8bb14e9f419cbc4f632d495384 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 28 May 2019 09:33:05 +0200 Subject: gnu: guix: Update to 35d1354. * gnu/packages/package-management.scm (guix): Update to 35d1354. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/package-management.scm') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 985fa801b1..2113e49565 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -111,8 +111,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.0.1") - (commit "820429517f9cc8333704a839b4346ac4b02468c4") - (revision 1)) + (commit "35d1354fe87003dbe19b1b97aa64db1f7d989701") + (revision 2)) (package (name "guix") @@ -128,7 +128,7 @@ (commit commit))) (sha256 (base32 - "1vfp7ps1k1cwn8p0gsgarlxcy982hzyvb7zqnj66jqd258a1qfgh")) + "1fd7g31fgdn7pzfxki7pkn1335ffmbklygha8d16771widqbpla5")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit 1.4.1 From ff793da66918ace85048f90dc069415ef067ba06 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Thu, 30 May 2019 15:36:20 -0700 Subject: gnu: diffoscope: Update to version 115-1.7f3416f. * gnu/packages/package-management (diffoscope): [package] Update to version 115-1.7f3416f. [source] Switch to using git-fetch. [inputs] Move python-pytest and python-chardet ... [native-inputs] ... to here. [arguments] Move comment to fit line length. --- gnu/packages/package-management.scm | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) (limited to 'gnu/packages/package-management.scm') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 2113e49565..9e0bfb6973 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -548,13 +548,16 @@ transactions from C or Python.") (define-public diffoscope (package (name "diffoscope") - (version "114") + (version (git-version "115" "1" "7f3416ffd12572b42c814e43ac15cee44ef48155")) (source (origin - (method url-fetch) - (uri (pypi-uri name version)) + (method git-fetch) + (uri (git-reference + (url "https://salsa.debian.org/reproducible-builds/diffoscope.git") + (commit "7f3416ffd12572b42c814e43ac15cee44ef48155"))) + (file-name (git-file-name name version)) (sha256 (base32 - "07sma4izcqxdv0zi1s5fnsybvkc47c3vbpm372sg83q8l7rhizzp")))) + "1pn2rwlz5shdx7s63798wx2v7029bl5if6dlq3i2r6zsnpp0laki")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases @@ -590,7 +593,8 @@ transactions from C or Python.") #t)) (add-before 'check 'delete-failing-test (lambda _ - (delete-file "tests/test_tools.py") ;this requires /sbin to be on the path + ;; this requires /sbin to be on the path + (delete-file "tests/test_tools.py") #t))))) (inputs `(("rpm" ,rpm) ;for rpm-python ("python-file" ,python-file) @@ -599,11 +603,10 @@ transactions from C or Python.") ("python-tlsh" ,python-tlsh) ("acl" ,acl) ;for getfacl ("colordiff" ,colordiff) - ("xxd" ,xxd) - - ;; Below are modules used for tests. - ("python-pytest" ,python-pytest) - ("python-chardet" ,python-chardet))) + ("xxd" ,xxd))) + ;; Below are modules used for tests. + (native-inputs `(("python-pytest" ,python-pytest) + ("python-chardet" ,python-chardet))) (home-page "https://diffoscope.org/") (synopsis "Compare files, archives, and directories in depth") (description -- cgit 1.4.1 From 3092f1b835d79655eecb2f8a79dda20ad9ba6bd6 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 2 Jun 2019 23:30:17 +0200 Subject: gnu: guix: Update to 4a54ed7. * gnu/packages/package-management.scm (guix): Update to 4a54ed7. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/package-management.scm') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 9e0bfb6973..e1e7d6a5a0 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -111,8 +111,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.0.1") - (commit "35d1354fe87003dbe19b1b97aa64db1f7d989701") - (revision 2)) + (commit "4a54ed774913480c0f8dad3caf0cd627e4fa8ebf") + (revision 3)) (package (name "guix") @@ -128,7 +128,7 @@ (commit commit))) (sha256 (base32 - "1fd7g31fgdn7pzfxki7pkn1335ffmbklygha8d16771widqbpla5")) + "14m4a4bn0d5hav6mrks5d7r223knx9dpswgbsc875wgr2921na2h")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit 1.4.1