From 54f777ca4e0935dd408d5cc0445d82e72325a989 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 8 Dec 2020 22:10:33 -0500 Subject: gnu: linux-libre: Update to 5.9.13. * gnu/packages/linux.scm (linux-libre-5.9-version): Update to 5.9.13. (linux-libre-5.9-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 3d36468172..7325083581 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -352,7 +352,7 @@ (define (%upstream-linux-source version hash) ;; The current "stable" kernel. That is, the most recently released major ;; version. -(define-public linux-libre-5.9-version "5.9.12") +(define-public linux-libre-5.9-version "5.9.13") (define deblob-scripts-5.9 (linux-libre-deblob-scripts linux-libre-5.9-version @@ -360,7 +360,7 @@ (define deblob-scripts-5.9 (base32 "0yb04a4j2wq3mwvks3cj7kcm2pscmfs29lrz3falkxpbvjxbbgq2"))) (define-public linux-libre-5.9-pristine-source (let ((version linux-libre-5.9-version) - (hash (base32 "1gfrn3sz3h4cbsf3r8f9jxja400qsmbrk8sclk4cjx1l5qcmczyr"))) + (hash (base32 "0ancdbfmrhq7wnvzrrnayiw8j4k1pjjnmvjxkl12lal7bjdahdml"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.9))) -- cgit v1.2.3 From 66b1b55148f03bac5bf6d5f7d747f60bb254ce61 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 8 Dec 2020 22:11:05 -0500 Subject: gnu: linux-libre 5.4: Update to 5.4.82. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.82. (linux-libre-5.4-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 7325083581..6226cb6b3d 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -368,7 +368,7 @@ (define-public linux-libre-5.9-pristine-source ;; The "longterm" kernels — the older releases with long-term upstream support. ;; Here are the support timelines: ;; -(define-public linux-libre-5.4-version "5.4.81") +(define-public linux-libre-5.4-version "5.4.82") (define deblob-scripts-5.4 (linux-libre-deblob-scripts linux-libre-5.4-version @@ -376,7 +376,7 @@ (define deblob-scripts-5.4 (base32 "167zcfkw62pm6nv1xdvvhxw0ca724sywcywnv3z00189f8f8p3vg"))) (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "09w4bpr3v9rzcvxics5wddabplwbpk1mynl45lh9csbjfpjbsw4l"))) + (hash (base32 "1byx163v83aw0ixphwz20znml2s2n3cy1kp89vgwbdiqxbj5hi7v"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit v1.2.3 From a2eae5ec4a6ac2df9c6d92f13b49cbfb8469fde2 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 8 Dec 2020 22:11:40 -0500 Subject: gnu: linux-libre 4.19: Update to 4.19.162. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.162. (linux-libre-4.19-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 6226cb6b3d..6cf55bdc25 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -381,7 +381,7 @@ (define-public linux-libre-5.4-pristine-source (%upstream-linux-source version hash) deblob-scripts-5.4))) -(define-public linux-libre-4.19-version "4.19.161") +(define-public linux-libre-4.19-version "4.19.162") (define deblob-scripts-4.19 (linux-libre-deblob-scripts linux-libre-4.19-version @@ -389,7 +389,7 @@ (define deblob-scripts-4.19 (base32 "1jiaw0as1ippkrjdpd52657w5mz9qczg3y2hlra7m9k0xawwiqlf"))) (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "0h9wskmz9wridwnicnjlcmj1112qnlvqk01bhjkxv6b8jsajjh87"))) + (hash (base32 "052nk889fcvw7p4vll5dky6dcr1g6mvn1i93xykhch6yxkl26ds5"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit v1.2.3 From 2b0185a74bfae4adde46142ea0fc5fb02c4b1c4a Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 8 Dec 2020 22:12:23 -0500 Subject: gnu: linux-libre 4.14: Update to 4.14.211. * gnu/packages/linux.scm (linux-libre-4.14-version): Update to 4.14.211. (linux-libre-4.14-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 6cf55bdc25..ee460c38b2 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -394,7 +394,7 @@ (define-public linux-libre-4.19-pristine-source (%upstream-linux-source version hash) deblob-scripts-4.19))) -(define-public linux-libre-4.14-version "4.14.210") +(define-public linux-libre-4.14-version "4.14.211") (define deblob-scripts-4.14 (linux-libre-deblob-scripts linux-libre-4.14-version @@ -402,7 +402,7 @@ (define deblob-scripts-4.14 (base32 "1qij18inijj6c3ma8hv98yjagnzxdxyn134da9fd23ky8q6hbvky"))) (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) - (hash (base32 "067xqi6sgf50p7s3n6y77cgf5bj5062s3bz3kqpp6f9wnk85267r"))) + (hash (base32 "0hp9457m0hal2d3bf5fs3ghp59s6hlc9bwl0s1apjgqa8fmkjdss"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.14))) -- cgit v1.2.3 From 8e344e36771e35702ab3e4bef72529dcd3498809 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 10 Dec 2020 14:22:20 +0200 Subject: gnu: singularity: Update command substitutions. Reported by Hao Chen . * gnu/packages/linux.scm (singularity)[arguments]: Update 'patch-references phase to actually patch mksquashfs calls and to patch sed calls. --- gnu/packages/linux.scm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index ee460c38b2..4b1fe7e15a 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4045,18 +4045,18 @@ (define-public singularity (modify-phases %standard-phases (add-after 'unpack 'patch-references (lambda _ - (substitute* "libexec/cli/build.exec" - (("if ! singularity_which mksquashfs") "if 0") - (("if ! mksquashfs") - (string-append "if ! " (which "mksquashfs")))) - (substitute* (list "libexec/cli/help.exec" - "libexec/bootstrap-scripts/functions" - "libexec/bootstrap-scripts/post.sh" - "libexec/functions") + (substitute* "libexec/cli/build.exec.in" + (("-mksquashfs") (string-append "-" (which "mksquashfs")))) + (substitute* (append + (find-files "libexec" "functions") + (find-files "libexec/bootstrap-scripts" ".*sh$") + (find-files "libexec/cli" ".*exec$")) (("\\| grep ") (string-append "| " (which "grep") " ")) (("egrep ") - (string-append (which "egrep") " "))) + (string-append (which "egrep") " ")) + ((" sed ") + (string-append " " (which "sed") " "))) #t)) (add-after 'install 'set-PATH (lambda* (#:key inputs outputs #:allow-other-keys) -- cgit v1.2.3 From 92d99bf2c4bb65bae72a93f70c9e32eda9c85075 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 12 Dec 2020 00:36:23 -0500 Subject: gnu: linux-libre: Update to 5.9.14. * gnu/packages/linux.scm (linux-libre-5.9-version): Update to 5.9.14. (linux-libre-5.9-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 4b1fe7e15a..002f1581ca 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -352,7 +352,7 @@ (define (%upstream-linux-source version hash) ;; The current "stable" kernel. That is, the most recently released major ;; version. -(define-public linux-libre-5.9-version "5.9.13") +(define-public linux-libre-5.9-version "5.9.14") (define deblob-scripts-5.9 (linux-libre-deblob-scripts linux-libre-5.9-version @@ -360,7 +360,7 @@ (define deblob-scripts-5.9 (base32 "0yb04a4j2wq3mwvks3cj7kcm2pscmfs29lrz3falkxpbvjxbbgq2"))) (define-public linux-libre-5.9-pristine-source (let ((version linux-libre-5.9-version) - (hash (base32 "0ancdbfmrhq7wnvzrrnayiw8j4k1pjjnmvjxkl12lal7bjdahdml"))) + (hash (base32 "0jbb3rzbkh0l75zq9bnc60w55ryvrvcg7vw85fsbcwfzvi0zpz1r"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.9))) -- cgit v1.2.3 From 0fae07917ba33c314ae2db601d20db2473a20bca Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 12 Dec 2020 00:36:53 -0500 Subject: gnu: linux-libre 5.4: Update to 5.4.83. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.83. (linux-libre-5.4-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 002f1581ca..6d2b8582e1 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -368,7 +368,7 @@ (define-public linux-libre-5.9-pristine-source ;; The "longterm" kernels — the older releases with long-term upstream support. ;; Here are the support timelines: ;; -(define-public linux-libre-5.4-version "5.4.82") +(define-public linux-libre-5.4-version "5.4.83") (define deblob-scripts-5.4 (linux-libre-deblob-scripts linux-libre-5.4-version @@ -376,7 +376,7 @@ (define deblob-scripts-5.4 (base32 "167zcfkw62pm6nv1xdvvhxw0ca724sywcywnv3z00189f8f8p3vg"))) (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "1byx163v83aw0ixphwz20znml2s2n3cy1kp89vgwbdiqxbj5hi7v"))) + (hash (base32 "1ik14pfgynkn1sjhgyhgmxjvviq0mgvk0ygj76w8mplkpc5rgv5y"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit v1.2.3 From a3a81a8703295b6ac2f0ffde5a2e8e72196178bb Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 12 Dec 2020 00:37:29 -0500 Subject: gnu: linux-libre 4.19: Update to 4.19.163. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.163. (linux-libre-4.19-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 6d2b8582e1..c9377cc8f5 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -381,7 +381,7 @@ (define-public linux-libre-5.4-pristine-source (%upstream-linux-source version hash) deblob-scripts-5.4))) -(define-public linux-libre-4.19-version "4.19.162") +(define-public linux-libre-4.19-version "4.19.163") (define deblob-scripts-4.19 (linux-libre-deblob-scripts linux-libre-4.19-version @@ -389,7 +389,7 @@ (define deblob-scripts-4.19 (base32 "1jiaw0as1ippkrjdpd52657w5mz9qczg3y2hlra7m9k0xawwiqlf"))) (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "052nk889fcvw7p4vll5dky6dcr1g6mvn1i93xykhch6yxkl26ds5"))) + (hash (base32 "1z65iwwyx2b01fncygckmhpxirzs52qfqmv3agirn4laxgjw9viy"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit v1.2.3 From 4c327e025277dd59b864200d5ecf671b5656e7c9 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 12 Dec 2020 00:38:00 -0500 Subject: gnu: linux-libre 4.14: Update to 4.14.212. * gnu/packages/linux.scm (linux-libre-4.14-version): Update to 4.14.212. (linux-libre-4.14-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index c9377cc8f5..f67545b033 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -394,7 +394,7 @@ (define-public linux-libre-4.19-pristine-source (%upstream-linux-source version hash) deblob-scripts-4.19))) -(define-public linux-libre-4.14-version "4.14.211") +(define-public linux-libre-4.14-version "4.14.212") (define deblob-scripts-4.14 (linux-libre-deblob-scripts linux-libre-4.14-version @@ -402,7 +402,7 @@ (define deblob-scripts-4.14 (base32 "1qij18inijj6c3ma8hv98yjagnzxdxyn134da9fd23ky8q6hbvky"))) (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) - (hash (base32 "0hp9457m0hal2d3bf5fs3ghp59s6hlc9bwl0s1apjgqa8fmkjdss"))) + (hash (base32 "0y8ck8pfxm8862wi4cz8qp9x9b18yl448i8m7bpbphs290nc66qf"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.14))) -- cgit v1.2.3 From b7b9ee75885426a6ed27a78f351c6cdd9cf7f952 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 12 Dec 2020 00:38:34 -0500 Subject: gnu: linux-libre 4.9: Update to 4.9.248. * gnu/packages/linux.scm (linux-libre-4.9-version): Update to 4.9.248. (linux-libre-4.9-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index f67545b033..4c5917bc59 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -407,7 +407,7 @@ (define-public linux-libre-4.14-pristine-source (%upstream-linux-source version hash) deblob-scripts-4.14))) -(define-public linux-libre-4.9-version "4.9.247") +(define-public linux-libre-4.9-version "4.9.248") (define deblob-scripts-4.9 (linux-libre-deblob-scripts linux-libre-4.9-version @@ -415,7 +415,7 @@ (define deblob-scripts-4.9 (base32 "0fxajshb75siq39lj5h8xvhdj8lcmddkslwlyj65rhlwk6g2r4b2"))) (define-public linux-libre-4.9-pristine-source (let ((version linux-libre-4.9-version) - (hash (base32 "1mngdbsq8pdzd0x9hif4715cc7wzc3ahgp1yrknnqk598q0fnfpp"))) + (hash (base32 "1kzczy0lz3lnjkhvx90dgjmzn3d3y55qxlihiclkr4y9c602d1s6"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.9))) -- cgit v1.2.3 From ea50795d7f54582d5c439f60e836ff2ee5d8aed2 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 12 Dec 2020 00:39:26 -0500 Subject: gnu: linux-libre 4.4: Update to 4.4.248. * gnu/packages/linux.scm (linux-libre-4.4-version): Update to 4.4.248. (linux-libre-4.4-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 4c5917bc59..73dec7d1b7 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -420,7 +420,7 @@ (define-public linux-libre-4.9-pristine-source (%upstream-linux-source version hash) deblob-scripts-4.9))) -(define-public linux-libre-4.4-version "4.4.247") +(define-public linux-libre-4.4-version "4.4.248") (define deblob-scripts-4.4 (linux-libre-deblob-scripts linux-libre-4.4-version @@ -428,7 +428,7 @@ (define deblob-scripts-4.4 (base32 "0hhin1jpfkd6nwrb6xqxjzl3hdxy4pn8a15hy2d3d83yw6pflbsf"))) (define-public linux-libre-4.4-pristine-source (let ((version linux-libre-4.4-version) - (hash (base32 "1jh7vmyx55krk6y2r9v48liifs5wwkgns3gp8rs5sm4klfm36r2a"))) + (hash (base32 "1z1xbkm0z0v6k3scszii5hi24pn391332g0li93p3n1rnv74jap5"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.4))) -- cgit v1.2.3 From 9e78ec5d2459b5b74caa4fd98a68029b4d8c1697 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 12 Dec 2020 16:58:08 +0100 Subject: gnu: multipath-tools: Use the latest json-c. * gnu/packages/linux.scm (multipath-tools)[inputs]: Change from JSON-C-0.13 to JSON-C. --- gnu/packages/linux.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 73dec7d1b7..0e9932785d 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4544,7 +4544,7 @@ (define-public multipath-tools ;; For tests. ("cmocka" ,cmocka))) (inputs - `(("json-c" ,json-c-0.13) + `(("json-c" ,json-c) ("libaio" ,libaio) ("liburcu" ,liburcu) ("lvm2" ,lvm2) -- cgit v1.2.3