From b0eb525ddba77420ff8c0930b9173b10f9ae342d Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Wed, 24 Mar 2021 23:41:05 +0100 Subject: gnu: guix: Update to 86dd54f. * gnu/packages/package-management.scm (guix): Update to 86dd54f. --- 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 888f54322d..c82ba3e213 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -132,8 +132,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.2.0") - (commit "ec7fb669945bfb47c5e1fdf7de3a5d07f7002ccf") - (revision 17)) + (commit "86dd54f2307b1f984f599c218843f49b57ac6173") + (revision 18)) (package (name "guix") @@ -149,7 +149,7 @@ (commit commit))) (sha256 (base32 - "1v9pwsqx8n4l6f7aj9vxv6m7vb4lyw8j5qg6mxf5zksia0qlcv2z")) + "1vp3k4l7qs4s6irr4ylf9yk3yyq07bppvlz4z4c84s6qq5972m6i")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 27d967dfa44aaffd610bed29d88a7161ef144119 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Thu, 25 Mar 2021 02:31:42 +0100 Subject: Revert "gnu: guix: Update to 86dd54f." A test failure (tests/print) was uncovered so revert until we fix it. This reverts commit b0eb525ddba77420ff8c0930b9173b10f9ae342d. --- 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 c82ba3e213..888f54322d 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -132,8 +132,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.2.0") - (commit "86dd54f2307b1f984f599c218843f49b57ac6173") - (revision 18)) + (commit "ec7fb669945bfb47c5e1fdf7de3a5d07f7002ccf") + (revision 17)) (package (name "guix") @@ -149,7 +149,7 @@ (commit commit))) (sha256 (base32 - "1vp3k4l7qs4s6irr4ylf9yk3yyq07bppvlz4z4c84s6qq5972m6i")) + "1v9pwsqx8n4l6f7aj9vxv6m7vb4lyw8j5qg6mxf5zksia0qlcv2z")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From f21075f039be2afb86f0735f151b94050a3d41bd Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Fri, 26 Mar 2021 05:42:48 +0100 Subject: gnu: guix: Update to 6e7ba45. * gnu/packages/package-management.scm (guix): Update to 6e7ba45. --- 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 888f54322d..5d761df47d 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -132,8 +132,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.2.0") - (commit "ec7fb669945bfb47c5e1fdf7de3a5d07f7002ccf") - (revision 17)) + (commit "6e7ba45357078b31a369b23f8a9f38302dfcbb10") + (revision 18)) (package (name "guix") @@ -149,7 +149,7 @@ (commit commit))) (sha256 (base32 - "1v9pwsqx8n4l6f7aj9vxv6m7vb4lyw8j5qg6mxf5zksia0qlcv2z")) + "14zzhjdd7igkc8vpv06hn375085n10mljv8wwpnk6r4a6r8qg5d3")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 87547517bceaddb9d67146a1e286d1d0c5017d0c Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Fri, 26 Mar 2021 10:15:23 +0000 Subject: gnu: guix-build-coordinator: Update to 0-21.6e7e63f. * gnu/packages/package-management.scm (guix-build-coordinator): Update to 0-21.6e7e63f. --- 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 5d761df47d..de549fd094 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1049,8 +1049,8 @@ environments.") (license (list license:gpl3+ license:agpl3+ license:silofl1.1)))) (define-public guix-build-coordinator - (let ((commit "1f79fc38a17ceda30f378efd4e7f80f252c99b4d") - (revision "20")) + (let ((commit "6e7e63f356cb88e3e5fe1a55a0390a1366205c9c") + (revision "21")) (package (name "guix-build-coordinator") (version (git-version "0" revision commit)) @@ -1061,7 +1061,7 @@ environments.") (commit commit))) (sha256 (base32 - "0d5zr5mv07pi195vva2fhclfgyzrgbk9vlnwrmy7z1jcw2p1d2zp")) + "01l4f0h9r864dbq4fg38fr2pdm5c7q2dysxcv8bx1clxilm58kd5")) (file-name (string-append name "-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From aed51ecea87f9b5045cc888cd1d9653a27813164 Mon Sep 17 00:00:00 2001 From: zimoun Date: Fri, 26 Mar 2021 09:05:15 +0100 Subject: gnu: guix: Fix openrc init scripts. Fixes . * gnu/packages/package-management.scm (guix)[arguments]: Fix openrc init. * nix/local.mk (openrcservicedir): Likewise. Signed-off-by: Efraim Flashner --- gnu/packages/package-management.scm | 2 +- nix/local.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/package-management.scm') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index de549fd094..6ee0bc74e9 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -212,7 +212,7 @@ $(prefix)/etc/init.d\n"))) (substitute* "nix/local.mk" (("^openrcservicedir = .*$") (string-append "openrcservicedir = \ -$(prefix)/etc/init.d\n"))) +$(prefix)/etc/openrc\n"))) (invoke "sh" "bootstrap"))) (add-before 'build 'use-host-compressors diff --git a/nix/local.mk b/nix/local.mk index d2ce349d9c..7c438ea78c 100644 --- a/nix/local.mk +++ b/nix/local.mk @@ -181,7 +181,7 @@ etc/init.d/guix-daemon: etc/init.d/guix-daemon.in \ mv "$@.tmp" "$@" # The service script for openrc. -openrcservicedir = $(sysconfdir)/init.d +openrcservicedir = $(sysconfdir)/openrc nodist_openrcservice_DATA = etc/openrc/guix-daemon etc/openrc/guix-daemon: etc/openrc/guix-daemon.in \ -- cgit v1.2.3 From cb7b577bcfa19d28a4c5dcc42449a6e019285539 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 31 Mar 2021 17:06:19 +0200 Subject: gnu: guix: Update to 8f9052d. * gnu/packages/package-management.scm (guix): Update to 8f9052d. --- 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 6ee0bc74e9..a6469e133d 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -132,8 +132,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.2.0") - (commit "6e7ba45357078b31a369b23f8a9f38302dfcbb10") - (revision 18)) + (commit "8f9052d5434a3a11e7b4ff14d6b0090256e08aa4") + (revision 19)) (package (name "guix") @@ -149,7 +149,7 @@ (commit commit))) (sha256 (base32 - "14zzhjdd7igkc8vpv06hn375085n10mljv8wwpnk6r4a6r8qg5d3")) + "0jqxabl9sqn7dd1l9q62zm9f7w274q44dya24akina8wwfi5yc4k")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 97744de9702a156d63105ad694416d3cb1d1d61b Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Thu, 8 Apr 2021 20:49:56 +0100 Subject: gnu: guix-build-coordinator: Update to 0-22.44d0006. * gnu/packages/package-management.scm (guix-build-coordinator): Update to 0-22.44d0006. --- 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 a6469e133d..a616ec6304 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1049,8 +1049,8 @@ environments.") (license (list license:gpl3+ license:agpl3+ license:silofl1.1)))) (define-public guix-build-coordinator - (let ((commit "6e7e63f356cb88e3e5fe1a55a0390a1366205c9c") - (revision "21")) + (let ((commit "44d00065cfbd0f24d2fac631608a5aeaace648a7") + (revision "22")) (package (name "guix-build-coordinator") (version (git-version "0" revision commit)) @@ -1061,7 +1061,7 @@ environments.") (commit commit))) (sha256 (base32 - "01l4f0h9r864dbq4fg38fr2pdm5c7q2dysxcv8bx1clxilm58kd5")) + "1gyrdb6gmz066d591593qvmk72qanc1psmk2l0r7smigh2bkzjka")) (file-name (string-append name "-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From f37d91adc466adfe9e83db2d1deeff7d8994a1fc Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Fri, 9 Apr 2021 10:08:57 +0100 Subject: gnu: guix-build-coordinator: Update to 0-23.44d0006. * gnu/packages/package-management.scm (guix-build-coordinator): Update to 0-23.44d0006. [arguments]: Fix missing guile-fibers when not building for the hurd. --- gnu/packages/package-management.scm | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) (limited to 'gnu/packages/package-management.scm') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index a616ec6304..d7824faeea 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1050,7 +1050,7 @@ environments.") (define-public guix-build-coordinator (let ((commit "44d00065cfbd0f24d2fac631608a5aeaace648a7") - (revision "22")) + (revision "23")) (package (name "guix-build-coordinator") (version (git-version "0" revision commit)) @@ -1088,14 +1088,18 @@ environments.") (for-each (lambda (file) (simple-format (current-error-port) "wrapping: ~A\n" file) - (let ((guile-inputs `("guile-json" - "guile-gcrypt" - "guix" - "guile-prometheus" - "guile-lib" - "guile-lzlib" - "guile-zlib" - "gnutls"))) + (let ((guile-inputs (list + "guile-json" + "guile-gcrypt" + "guix" + "guile-prometheus" + "guile-lib" + "guile-lzlib" + "guile-zlib" + "gnutls" + ,@(if (hurd-target?) + '() + '("guile-fibers"))))) (wrap-program file `("PATH" ":" prefix (,bin -- cgit v1.2.3 From a9f4001df9471a453fe8c1130110934db017b53c Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Fri, 9 Apr 2021 11:32:40 +0100 Subject: gnu: guix-build-coordinator: Update to 0-24.6fb5eaf. * gnu/packages/package-management.scm (guix-build-coordinator): Update to 0-24.6fb5eaf. --- 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 d7824faeea..ddfb2cd4e5 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1049,8 +1049,8 @@ environments.") (license (list license:gpl3+ license:agpl3+ license:silofl1.1)))) (define-public guix-build-coordinator - (let ((commit "44d00065cfbd0f24d2fac631608a5aeaace648a7") - (revision "23")) + (let ((commit "6fb5eafc33efa109b220efe71594cfcdb2efe133") + (revision "24")) (package (name "guix-build-coordinator") (version (git-version "0" revision commit)) @@ -1061,7 +1061,7 @@ environments.") (commit commit))) (sha256 (base32 - "1gyrdb6gmz066d591593qvmk72qanc1psmk2l0r7smigh2bkzjka")) + "1lf7jry18kwglvyakfkmi8bif8ppsdinl0xjgmkgkp4mvmymh2gj")) (file-name (string-append name "-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From ec8d09ee672e0d357bb5bb597464c8b168f14bfb Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 9 Apr 2021 18:09:07 +0200 Subject: gnu: guix: Update to 2d73086. * gnu/packages/package-management.scm (guix): Update to 2d73086. --- 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 ddfb2cd4e5..6df46aa35f 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -132,8 +132,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.2.0") - (commit "8f9052d5434a3a11e7b4ff14d6b0090256e08aa4") - (revision 19)) + (commit "2d73086262e1fb33cd0f0f16f74a495fe06b38aa") + (revision 20)) (package (name "guix") @@ -149,7 +149,7 @@ (commit commit))) (sha256 (base32 - "0jqxabl9sqn7dd1l9q62zm9f7w274q44dya24akina8wwfi5yc4k")) + "070frsjcbrdqh68rhrck6w3cprbq1hjpd24z44qd017zaicix1f0")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From a758a8a3c20052c5f1228e1ec80068652bbc3849 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 13 Apr 2021 19:22:48 -0400 Subject: gnu: Guix: Update to 1.2.0-21.4dff6ec. Fixes . * gnu/packages/package-management.scm (guix): Update to 1.2.0-21.4dff6ec. --- 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 6df46aa35f..08050e9747 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -132,8 +132,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.2.0") - (commit "2d73086262e1fb33cd0f0f16f74a495fe06b38aa") - (revision 20)) + (commit "4dff6ecde85eec473ab231cf75f51e98e8aca1e9") + (revision 21)) (package (name "guix") @@ -149,7 +149,7 @@ (commit commit))) (sha256 (base32 - "070frsjcbrdqh68rhrck6w3cprbq1hjpd24z44qd017zaicix1f0")) + "1n16j7rb4n4pjmp8ck5g206rphmzxii2mbyz1nk4qk70zc3mwszq")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3