From 3410e50833a4dfa3667530dd66cb4ca57a2b761f Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 15 May 2022 22:05:11 -0400 Subject: gnu: linux-libre: Update to 5.17.8. * gnu/packages/linux.scm (linux-libre-5.17-version): Update to 5.17.8. (linux-libre-5.17-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 0b30108d7c..079367e053 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -361,7 +361,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The current "stable" kernels. That is, the most recently released major ;; versions that are still supported upstream. -(define-public linux-libre-5.17-version "5.17.7") +(define-public linux-libre-5.17-version "5.17.8") (define-public linux-libre-5.17-gnu-revision "gnu") (define deblob-scripts-5.17 (linux-libre-deblob-scripts @@ -371,7 +371,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1zd4ds6ha4a2acqnalp234r2m9rz9p30qmy1aqri78i06aw7flwn"))) (define-public linux-libre-5.17-pristine-source (let ((version linux-libre-5.17-version) - (hash (base32 "16ccf7n6fns9z93c65lchn5v3fgl9c5vkr1v6p0c1xifn7v7xxi2"))) + (hash (base32 "0si34i1hrhbapv1a8xghyvkywij0wgidxhdan23d6y2iqzc62y8i"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.17))) -- cgit v1.2.3 From d233674441e6603aa38ee7e44daa6a1dc8c5bba9 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 15 May 2022 22:05:28 -0400 Subject: gnu: linux-libre 5.15: Update to 5.15.40. * gnu/packages/linux.scm (linux-libre-5.15-version): Update to 5.15.40. (linux-libre-5.15-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 079367e053..3dc73a03fd 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -379,7 +379,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The "longterm" kernels — the older releases with long-term upstream support. ;; Here are the support timelines: ;; -(define-public linux-libre-5.15-version "5.15.39") +(define-public linux-libre-5.15-version "5.15.40") (define-public linux-libre-5.15-gnu-revision "gnu") (define deblob-scripts-5.15 (linux-libre-deblob-scripts @@ -389,7 +389,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0gs92qbpvirwd02rpwwnja7771z2azbiy9ppy9ynpr14lxmzxnnh"))) (define-public linux-libre-5.15-pristine-source (let ((version linux-libre-5.15-version) - (hash (base32 "1bfpiyccjggysd04flaana0x69n1lcpckzpw1v6kh3ly9xil31l8"))) + (hash (base32 "0fy3p1ds5yqljy2lpq66f0rqxfaz58ljfj12sd6wmgxbrgpgg1y7"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.15))) -- cgit v1.2.3 From 1dec28c0b4c3f3cc9ccae61be6d16281b66a0642 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 15 May 2022 22:05:42 -0400 Subject: gnu: linux-libre 5.10: Update to 5.10.116. * gnu/packages/linux.scm (linux-libre-5.10-version): Update to 5.10.116. (linux-libre-5.10-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 3dc73a03fd..26cf282851 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -394,7 +394,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.15))) -(define-public linux-libre-5.10-version "5.10.115") +(define-public linux-libre-5.10-version "5.10.116") (define-public linux-libre-5.10-gnu-revision "gnu1") (define deblob-scripts-5.10 (linux-libre-deblob-scripts @@ -404,7 +404,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1xyhz0dyrkg2avz382ly3dzpa5v89x49gfzx80c1drpwsk7jg6gp"))) (define-public linux-libre-5.10-pristine-source (let ((version linux-libre-5.10-version) - (hash (base32 "0w9gwizyqjgsj93dqqvlh6bqkmpzjajhj09319nqncc95yrigr7m"))) + (hash (base32 "0j8bsbjirndi74pmibplwbjlmpnvjw0f57vh6ayczy9nfjx94rl0"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.10))) -- cgit v1.2.3 From da2a19bfc81f0130c405a01eca156b520819adeb Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 15 May 2022 22:06:00 -0400 Subject: gnu: linux-libre 5.4: Update to 5.4.194. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.194. (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 26cf282851..730646be25 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -409,7 +409,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.10))) -(define-public linux-libre-5.4-version "5.4.193") +(define-public linux-libre-5.4-version "5.4.194") (define-public linux-libre-5.4-gnu-revision "gnu1") (define deblob-scripts-5.4 (linux-libre-deblob-scripts @@ -419,7 +419,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "05i286d98fm2pdf9724x1dsmfcm7gsd7yyyvxqlpisyj1kx14hda"))) (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "187jfk9hf52n5z9yv56vq1knp3kdcbyk5w5k98ziwcbdjm1x65hd"))) + (hash (base32 "1xix3ndgzj7axmj9py7lip3n9qqw1jc4gi6lvls6zwi9364mfh98"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit v1.2.3 From 6a06481aae51d1da759513c5b73eddccf7d6a722 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 15 May 2022 22:06:15 -0400 Subject: gnu: linux-libre 4.19: Update to 4.19.243. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.243. (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 730646be25..d40ea514ff 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -424,7 +424,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.4))) -(define-public linux-libre-4.19-version "4.19.242") +(define-public linux-libre-4.19-version "4.19.243") (define-public linux-libre-4.19-gnu-revision "gnu1") (define deblob-scripts-4.19 (linux-libre-deblob-scripts @@ -434,7 +434,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1dnjgx1nmawm9gm0yf15nl80nmg7hy7q2vl3jxjbwj6hlrfv5dmx"))) (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "18k5fbzclk7g657bs8idwqjk7hakzx6256b1a3506sy29q4zvg2r"))) + (hash (base32 "17bsy1nwhkx90fh3zls5iwrs830ky7w68f8knqylxvmwwhqj1v3p"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit v1.2.3 From 928a1b39f9e9901c1b00cfbb78b300bf2cf03e55 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 15 May 2022 22:06:29 -0400 Subject: gnu: linux-libre 4.14: Update to 4.14.279. * gnu/packages/linux.scm (linux-libre-4.14-version): Update to 4.14.279. (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 d40ea514ff..e666cfb2fe 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -439,7 +439,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.19))) -(define-public linux-libre-4.14-version "4.14.278") +(define-public linux-libre-4.14-version "4.14.279") (define-public linux-libre-4.14-gnu-revision "gnu1") (define deblob-scripts-4.14 (linux-libre-deblob-scripts @@ -449,7 +449,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1dnjgx1nmawm9gm0yf15nl80nmg7hy7q2vl3jxjbwj6hlrfv5dmx"))) (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) - (hash (base32 "1glb6z3nicd2lzhvwcqj54642agk0bbg022wnc3ckld5ngpd9miw"))) + (hash (base32 "0f8v9lv2sr7r8n4pa4lgvk9ci948a0zwpgdm6k8rdqbafdca4y2k"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.14))) -- cgit v1.2.3 From 4d374b23ecf10672ffa2f541a6508810a4c323f6 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 15 May 2022 22:06:42 -0400 Subject: gnu: linux-libre 4.9: Update to 4.9.314. * gnu/packages/linux.scm (linux-libre-4.9-version): Update to 4.9.314. (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 e666cfb2fe..e179a5c2f7 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -454,7 +454,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.14))) -(define-public linux-libre-4.9-version "4.9.313") +(define-public linux-libre-4.9-version "4.9.314") (define-public linux-libre-4.9-gnu-revision "gnu1") (define deblob-scripts-4.9 (linux-libre-deblob-scripts @@ -464,7 +464,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "14jyn2yrbm6ayp0bszs4f9jy3p1qkrj5p5gf5c42spr67aa2lv2v"))) (define-public linux-libre-4.9-pristine-source (let ((version linux-libre-4.9-version) - (hash (base32 "1p3vr1h01ph6x0pxrr6y6k5c4nrhvq650dfngv5mkrgsc5w7ffz0"))) + (hash (base32 "1nd3pkjkivx45k0lh1zlchv4vk7jb6mh9fm1jqnr02xkmld9bcr2"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.9))) -- cgit v1.2.3 From f1bc3536e719990f490f77197537a3c3f2cc7816 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 18 May 2022 21:57:25 -0400 Subject: gnu: linux-libre: Update to 5.17.9. * gnu/packages/linux.scm (linux-libre-5.17-version): Update to 5.17.9. (linux-libre-5.17-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 e179a5c2f7..94df48b184 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -361,7 +361,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The current "stable" kernels. That is, the most recently released major ;; versions that are still supported upstream. -(define-public linux-libre-5.17-version "5.17.8") +(define-public linux-libre-5.17-version "5.17.9") (define-public linux-libre-5.17-gnu-revision "gnu") (define deblob-scripts-5.17 (linux-libre-deblob-scripts @@ -371,7 +371,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1zd4ds6ha4a2acqnalp234r2m9rz9p30qmy1aqri78i06aw7flwn"))) (define-public linux-libre-5.17-pristine-source (let ((version linux-libre-5.17-version) - (hash (base32 "0si34i1hrhbapv1a8xghyvkywij0wgidxhdan23d6y2iqzc62y8i"))) + (hash (base32 "0y2rmn86z3cvgv71b6sjjyafnlbanlib1kjpjjqzjbgg86y2890p"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.17))) -- cgit v1.2.3 From 732ba8acd787b346047832d583e2397f90d2522e Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 18 May 2022 21:58:44 -0400 Subject: gnu: linux-libre 5.15: Update to 5.15.41. * gnu/packages/linux.scm (linux-libre-5.15-version): Update to 5.15.41. (linux-libre-5.15-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 94df48b184..4a9a580a94 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -379,7 +379,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The "longterm" kernels — the older releases with long-term upstream support. ;; Here are the support timelines: ;; -(define-public linux-libre-5.15-version "5.15.40") +(define-public linux-libre-5.15-version "5.15.41") (define-public linux-libre-5.15-gnu-revision "gnu") (define deblob-scripts-5.15 (linux-libre-deblob-scripts @@ -389,7 +389,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0gs92qbpvirwd02rpwwnja7771z2azbiy9ppy9ynpr14lxmzxnnh"))) (define-public linux-libre-5.15-pristine-source (let ((version linux-libre-5.15-version) - (hash (base32 "0fy3p1ds5yqljy2lpq66f0rqxfaz58ljfj12sd6wmgxbrgpgg1y7"))) + (hash (base32 "07jrsr54rvhry3g401h58r1773zinq49dbrkb9v1p6q27gyb2z1w"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.15))) -- cgit v1.2.3 From 11f2cd9b7b579bf146544c46e86d331305e712db Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 18 May 2022 21:59:02 -0400 Subject: gnu: linux-libre 5.10: Update to 5.10.117. * gnu/packages/linux.scm (linux-libre-5.10-version): Update to 5.10.117. (linux-libre-5.10-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 4a9a580a94..9d7547fe11 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -394,7 +394,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.15))) -(define-public linux-libre-5.10-version "5.10.116") +(define-public linux-libre-5.10-version "5.10.117") (define-public linux-libre-5.10-gnu-revision "gnu1") (define deblob-scripts-5.10 (linux-libre-deblob-scripts @@ -404,7 +404,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1xyhz0dyrkg2avz382ly3dzpa5v89x49gfzx80c1drpwsk7jg6gp"))) (define-public linux-libre-5.10-pristine-source (let ((version linux-libre-5.10-version) - (hash (base32 "0j8bsbjirndi74pmibplwbjlmpnvjw0f57vh6ayczy9nfjx94rl0"))) + (hash (base32 "1iyw3nmsga2binmrhfnzsf1pvn2bs21a8jw6vm89k26z5h8zfgkh"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.10))) -- cgit v1.2.3 From 61b8f98c36155210f00e013d35dbd51ede8ee872 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 18 May 2022 21:59:28 -0400 Subject: gnu: linux-libre 5.4: Update to 5.4.195. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.195. (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 9d7547fe11..69edd83932 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -409,7 +409,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.10))) -(define-public linux-libre-5.4-version "5.4.194") +(define-public linux-libre-5.4-version "5.4.195") (define-public linux-libre-5.4-gnu-revision "gnu1") (define deblob-scripts-5.4 (linux-libre-deblob-scripts @@ -419,7 +419,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "05i286d98fm2pdf9724x1dsmfcm7gsd7yyyvxqlpisyj1kx14hda"))) (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "1xix3ndgzj7axmj9py7lip3n9qqw1jc4gi6lvls6zwi9364mfh98"))) + (hash (base32 "078380qhds2jwfmrchna6p27wpfb74pvnj4xiyc5k38gysfmnbzj"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit v1.2.3 From 52418e9928a1c4d8d795815d902503eb98cd3396 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 18 May 2022 21:59:44 -0400 Subject: gnu: linux-libre 4.19: Update to 4.19.244. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.244. (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 69edd83932..e7175d86b0 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -424,7 +424,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.4))) -(define-public linux-libre-4.19-version "4.19.243") +(define-public linux-libre-4.19-version "4.19.244") (define-public linux-libre-4.19-gnu-revision "gnu1") (define deblob-scripts-4.19 (linux-libre-deblob-scripts @@ -434,7 +434,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1dnjgx1nmawm9gm0yf15nl80nmg7hy7q2vl3jxjbwj6hlrfv5dmx"))) (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "17bsy1nwhkx90fh3zls5iwrs830ky7w68f8knqylxvmwwhqj1v3p"))) + (hash (base32 "1g9562v6ny196rw2n3kj43nrz65qa7imwnmfasvj6x8fm8bdhz79"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit v1.2.3 From ff6b693d1beb21b8828c3b094e467cef669880a9 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 18 May 2022 22:00:07 -0400 Subject: gnu: linux-libre 4.14: Update to 4.14.280. * gnu/packages/linux.scm (linux-libre-4.14-version): Update to 4.14.280. (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 e7175d86b0..46731d61eb 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -439,7 +439,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.19))) -(define-public linux-libre-4.14-version "4.14.279") +(define-public linux-libre-4.14-version "4.14.280") (define-public linux-libre-4.14-gnu-revision "gnu1") (define deblob-scripts-4.14 (linux-libre-deblob-scripts @@ -449,7 +449,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1dnjgx1nmawm9gm0yf15nl80nmg7hy7q2vl3jxjbwj6hlrfv5dmx"))) (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) - (hash (base32 "0f8v9lv2sr7r8n4pa4lgvk9ci948a0zwpgdm6k8rdqbafdca4y2k"))) + (hash (base32 "01jr0f7mq919s7xxvv8sc1mg6isc1ggij33l2s0n6jvykm23ghrr"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.14))) -- cgit v1.2.3 From cb38c7c169e467fd5c2a4e556fe9df8ff56ddb5d Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 18 May 2022 22:00:26 -0400 Subject: gnu: linux-libre 4.9: Update to 4.9.315. * gnu/packages/linux.scm (linux-libre-4.9-version): Update to 4.9.315. (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 46731d61eb..8c29776b64 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -454,7 +454,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.14))) -(define-public linux-libre-4.9-version "4.9.314") +(define-public linux-libre-4.9-version "4.9.315") (define-public linux-libre-4.9-gnu-revision "gnu1") (define deblob-scripts-4.9 (linux-libre-deblob-scripts @@ -464,7 +464,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "14jyn2yrbm6ayp0bszs4f9jy3p1qkrj5p5gf5c42spr67aa2lv2v"))) (define-public linux-libre-4.9-pristine-source (let ((version linux-libre-4.9-version) - (hash (base32 "1nd3pkjkivx45k0lh1zlchv4vk7jb6mh9fm1jqnr02xkmld9bcr2"))) + (hash (base32 "1171p90s00jxg1clyz8kp81ilmdzygg131mxysr6lpkaisahkjg6"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.9))) -- cgit v1.2.3 From 014f97544dbe4f08405320d129a1a5d9c1f775f0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 15 May 2022 02:00:06 +0200 Subject: gnu: btrfs-progs: Fix cross-compilation. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/linux.scm (btrfs-progs)[arguments]: Add "--disable-python" support to #:configure-flags. [inputs]: Move eudev here… [native-inputs]: …from here. Reported by Pavel Shlyak . --- gnu/packages/linux.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 8c29776b64..7b564e7ef1 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -5549,7 +5549,11 @@ and copy/paste text in the console and in xterm.") (outputs '("out" "static")) ; static versions of the binaries in "out" (arguments - '(#:phases (modify-phases %standard-phases + '(#:configure-flags + ;; The ‘Python support’ was never actually installed by previous + ;; versions of this package, but did prevent cross-compilation. + (list "--disable-python") + #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-makefile (lambda* (#:key outputs #:allow-other-keys) (substitute* "Makefile" @@ -5576,6 +5580,7 @@ and copy/paste text in the console and in xterm.") #:test-target "test" #:parallel-tests? #f)) ; tests fail when run in parallel (inputs `(("e2fsprogs" ,e2fsprogs) ; for btrfs-convert + ("eudev" ,eudev) ("lzo" ,lzo) ("util-linux:lib" ,util-linux "lib") ;for libblkid and libuuid ("util-linux:static" ,util-linux "static") ;ditto @@ -5594,7 +5599,6 @@ and copy/paste text in the console and in xterm.") ("acl" ,acl) ("which" ,which) ("dmsetup" ,lvm2) - ("udevadm" ,eudev) ;; The tests need 'grep' with perl regexp support. ("grep" ,grep))) (home-page "https://btrfs.wiki.kernel.org/index.php/Main_Page") -- cgit v1.2.3 From b55310603f0df7d5ae02d47cb8d4be58bf1d41ca Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sat, 7 May 2022 16:45:40 +0200 Subject: linux: Remove system->linux-architecture procedure. * gnu/packages/linux.scm (system->linux-architecture): Remove it. (make-linux-libre-headers*, make-linux-libre*): Adapt them. * guix/build-system/linux-module.scm (system->arch): Adapt it. * gnu/packages/instrumentation.scm (uftrace): Ditto. * gnu/packages/cross-base.scm (cross-kernel-headers): Ditto. * gnu/packages/bioinformatics.scm (ncbi-vdb): Ditto. * doc/guix.texi (Porting to a new platform): Update it. --- doc/guix.texi | 30 ++++++++++++++++-------------- gnu/packages/bioinformatics.scm | 11 +++++++---- gnu/packages/cross-base.scm | 4 +++- gnu/packages/instrumentation.scm | 8 +++++--- gnu/packages/linux.scm | 34 ++++++++++++---------------------- guix/build-system/linux-module.scm | 4 ++-- 6 files changed, 45 insertions(+), 46 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/doc/guix.texi b/doc/guix.texi index 761fceb9c3..df9cbf4851 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -40276,20 +40276,22 @@ one: guix build --target=armv5tel-linux-gnueabi bootstrap-tarballs @end example -For this to work, the @code{glibc-dynamic-linker} procedure in -@code{(gnu packages bootstrap)} must be augmented to return the right -file name for libc's dynamic linker on that platform; likewise, -@code{system->linux-architecture} in @code{(gnu packages linux)} must be -taught about the new platform. - -Once these are built, the @code{(gnu packages bootstrap)} module needs -to be updated to refer to these binaries on the target platform. That -is, the hashes and URLs of the bootstrap tarballs for the new platform -must be added alongside those of the currently supported platforms. The -bootstrap Guile tarball is treated specially: it is expected to be -available locally, and @file{gnu/local.mk} has rules to download it for -the supported architectures; a rule for the new platform must be added -as well. +For this to work, it is first required to register a new platform as +defined in the @code{(gnu platform)} module. A platform is making the +connection between a GNU triplet (@pxref{Specifying Target Triplets, GNU +configuration triplets,, autoconf, Autoconf}), the equivalent +@var{system} in Nix notation, the name of the +@var{glibc-dynamic-linker}, and the corresponding Linux architecture +name if applicable. + +Once the bootstrap tarball are built, the @code{(gnu packages +bootstrap)} module needs to be updated to refer to these binaries on the +target platform. That is, the hashes and URLs of the bootstrap tarballs +for the new platform must be added alongside those of the currently +supported platforms. The bootstrap Guile tarball is treated specially: +it is expected to be available locally, and @file{gnu/local.mk} has +rules to download it for the supported architectures; a rule for the new +platform must be added as well. In practice, there may be some complications. First, it may be that the extended GNU triplet that specifies an ABI (like the @code{eabi} suffix diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 33bf0921d1..2a312b1989 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -161,6 +161,7 @@ #:use-module (gnu packages wget) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) + #:use-module (gnu platform) #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) #:use-module (ice-9 match)) @@ -6576,10 +6577,12 @@ simultaneously.") ;; architecture name ("i386") instead of the target system prefix ;; ("i686"). (mkdir (string-append (assoc-ref outputs "out") "/ilib")) - (copy-recursively (string-append "build/ncbi-vdb/linux/gcc/" - ,(system->linux-architecture - (or (%current-target-system) - (%current-system))) + (copy-recursively (string-append + "build/ncbi-vdb/linux/gcc/" + ,(platform-linux-architecture + (lookup-platform-by-target-or-system + (or (%current-target-system) + (%current-system)))) "/rel/ilib") (string-append (assoc-ref outputs "out") "/ilib")) diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index 66412b9e92..427fefbcd2 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -30,6 +30,7 @@ #:use-module (gnu packages linux) #:use-module (gnu packages hurd) #:use-module (gnu packages mingw) + #:use-module (gnu platform) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix utils) @@ -345,7 +346,8 @@ target that libc." `(modify-phases ,phases (replace 'build (lambda _ - (setenv "ARCH" ,(system->linux-architecture target)) + (setenv "ARCH" ,(platform-linux-architecture + (lookup-platform-by-target target))) (format #t "`ARCH' set to `~a' (cross compiling)~%" (getenv "ARCH")) diff --git a/gnu/packages/instrumentation.scm b/gnu/packages/instrumentation.scm index c9ca9083e4..c5062388f8 100644 --- a/gnu/packages/instrumentation.scm +++ b/gnu/packages/instrumentation.scm @@ -42,6 +42,7 @@ #:use-module (gnu packages swig) #:use-module (gnu packages tbb) #:use-module (gnu packages xml) + #:use-module (gnu platform) #:use-module (guix build-system cmake) #:use-module (guix build-system copy) #:use-module (guix build-system gnu) @@ -312,9 +313,10 @@ line for tracing control, a @code{lttng-ctl} library for tracing control and a (modify-phases %standard-phases (replace 'configure (lambda* (#:key outputs target #:allow-other-keys) - (let ((arch ,(system->linux-architecture - (or (%current-target-system) - (%current-system))))) + (let ((arch ,(platform-linux-architecture + (lookup-platform-by-target-or-system + (or (%current-target-system) + (%current-system)))))) (setenv "ARCH" (cond ((string=? arch "arm64") "aarch64") diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 7b564e7ef1..4101d4897b 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -158,6 +158,7 @@ #:use-module (gnu packages groff) #:use-module (gnu packages selinux) #:use-module (gnu packages swig) + #:use-module (gnu platform) #:use-module (guix build-system cmake) #:use-module (guix build-system copy) #:use-module (guix build-system gnu) @@ -181,20 +182,6 @@ #:use-module (ice-9 match) #:use-module (ice-9 regex)) -(define-public (system->linux-architecture arch) - "Return the Linux architecture name for ARCH, a Guix system name such as -\"x86_64-linux\" or a target triplet such as \"arm-linux-gnueabihf\"." - (let ((arch (car (string-split arch #\-)))) - (cond ((string=? arch "i686") "i386") - ((string-prefix? "mips" arch) "mips") - ((string-prefix? "arm" arch) "arm") - ((string-prefix? "aarch64" arch) "arm64") - ((string-prefix? "alpha" arch) "alpha") - ((string-prefix? "powerpc" arch) "powerpc") ;including "powerpc64le" - ((string-prefix? "s390" arch) "s390") - ((string-prefix? "riscv" arch) "riscv") - (else arch)))) - (define-public (system->defconfig system) "Some systems (notably powerpc-linux) require a special target for kernel defconfig. Return the appropriate make target if applicable, otherwise return @@ -567,9 +554,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (delete 'configure) (replace 'build (lambda _ - (let ((arch ,(system->linux-architecture - (or (%current-target-system) - (%current-system)))) + (let ((arch ,(platform-linux-architecture + (lookup-platform-by-target-or-system + (or (%current-target-system) + (%current-system))))) (defconfig ,(system->defconfig (or (%current-target-system) (%current-system)))) @@ -807,8 +795,9 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration." ,@(match (and configuration-file (configuration-file - (system->linux-architecture - (or (%current-target-system) (%current-system))) + (platform-linux-architecture + (lookup-platform-by-target-or-system + (or (%current-target-system) (%current-system)))) #:variant (version-major+minor version))) (#f ;no config for this platform '()) @@ -839,9 +828,10 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration." (setenv "KBUILD_BUILD_HOST" "guix") ;; Set ARCH and CROSS_COMPILE. - (let ((arch #$(system->linux-architecture - (or (%current-target-system) - (%current-system))))) + (let ((arch #$(platform-linux-architecture + (lookup-platform-by-target-or-system + (or (%current-target-system) + (%current-system)))))) (setenv "ARCH" arch) (format #t "`ARCH' set to `~a'~%" (getenv "ARCH")) diff --git a/guix/build-system/linux-module.scm b/guix/build-system/linux-module.scm index e82a9ca65c..761ebe25b1 100644 --- a/guix/build-system/linux-module.scm +++ b/guix/build-system/linux-module.scm @@ -50,8 +50,8 @@ (module-ref module 'linux-libre))) (define (system->arch system) - (let ((module (resolve-interface '(gnu packages linux)))) - ((module-ref module 'system->linux-architecture) system))) + (let ((module (resolve-interface '(gnu platform)))) + ((module-ref module 'lookup-platform-by-target-or-system) system))) (define (make-linux-module-builder linux) (package -- cgit v1.2.3 From 217ac6440a565af9f7c6bebe9a2246c237ffc27d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 15 May 2022 02:00:02 +0200 Subject: gnu: haveged: Update to 1.9.18. * gnu/packages/linux.scm (haveged): Update to 1.9.18. --- 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 4101d4897b..e3a37a7698 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -6401,7 +6401,7 @@ cpufreq sub-system is enabled or not.") (define-public haveged (package (name "haveged") - (version "1.9.17") + (version "1.9.18") (source (origin (method git-fetch) @@ -6410,7 +6410,7 @@ cpufreq sub-system is enabled or not.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "119iy8qrvdjkfwnzn1nfjzh2bbihb1vl44qhd6yzzcacjm6pwndr")))) + (base32 "1y1p3qhjzhpgd20xz5ffms3w1bdvpk883y38ydwsmp9mc0kzy8kz")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From eda49020323e2fc24cb4fce003a16078eebbadc3 Mon Sep 17 00:00:00 2001 From: Josselin Poiret via Guix-patches via Date: Mon, 23 May 2022 22:46:21 +0200 Subject: gnu: acpi-call-linux-module: Update hash because of upstream retag. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The old hash was for commit 9f1c0b5d046bdfdec769809435257647fd475473, 6 commits behind commit fe9dc95a83a95e4826c1a7c809d41c2f16de40a6, to which the ‘v1.2.2’ tag now points. No functional changes; only to the README, VERSION file, and an example. * gnu/packages/linux.scm (acpi-call-linux-module): Update hash. --- 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 e3a37a7698..580fef6d30 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1186,7 +1186,7 @@ It has been modified to remove all non-free binary blobs.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1s7h9y3adyfhw7cjldlfmid79lrwz3vqlvziw9nwd6x5qdj4w9vp")))) + (base32 "09ljx0jl987753r2kjqj5kxms95bijw0xn14kf82ryn38ck5c8cf")))) (build-system linux-module-build-system) (arguments (list #:tests? #f ; no tests -- cgit v1.2.3 From 01793ed03e8aa0960bff7adc21fd270e1527e68e Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Wed, 18 May 2022 17:22:04 +0000 Subject: gnu: cpuid: Update to 20220224. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/linux.scm (cpuid): Update to 20220224. Signed-off-by: Ludovic Courtès --- 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 580fef6d30..84fd8a4faf 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -7754,14 +7754,14 @@ available in the kernel Linux.") (define-public cpuid (package (name "cpuid") - (version "20211210") + (version "20220224") (source (origin (method url-fetch) (uri (string-append "http://www.etallen.com/cpuid/cpuid-" version ".src.tar.gz")) (sha256 (base32 - "0i2z1r0zwsmvnx2azwsz3x6van6dj9480lh26s1ny6ny01bqjag0")))) + "178zv8jclzg3hqm3g5bpjnsp898rbbxfq6ydavw49vla24mdw6aa")))) (build-system gnu-build-system) (arguments `(#:make-flags -- cgit v1.2.3 From 3d00f10ed592adb923eb3ac87d53220b07019f60 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 22 May 2022 02:00:00 +0200 Subject: gnu: psmisc: Update to 23.5. * gnu/packages/linux.scm (psmisc): Update to 23.5. --- 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 84fd8a4faf..8c1e2aa279 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1784,14 +1784,14 @@ deviation, and minimum and maximum values. It can show a nice histogram too.") (define-public psmisc (package (name "psmisc") - (version "23.4") + (version "23.5") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/psmisc/psmisc/psmisc-" version ".tar.xz")) (sha256 - (base32 "0y8n1jd2dn4cvc5mh806d66qnq8xl0xmzczbycjwal10rvmcw33z")))) + (base32 "12z5786dnf37n8wvv73wdcqp3nvsqzhwdk3ajna0mag4yz1fqdyw")))) (build-system gnu-build-system) (arguments `(,@(if (%current-target-system) -- cgit v1.2.3 From 1f6c2efccccf01f0be94405117598e012832269f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 22 May 2022 02:00:02 +0200 Subject: gnu: fakeroot: Update to 1.28. * gnu/packages/linux.scm (fakeroot): Update to 1.28. --- gnu/packages/linux.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 8c1e2aa279..d74e7c738c 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -8407,7 +8407,7 @@ the superuser to make device nodes.") (define-public fakeroot (package (name "fakeroot") - (version "1.26") + (version "1.28") (source (origin ;; There are no tags in the repository, so take this snapshot. @@ -8416,8 +8416,7 @@ the superuser to make device nodes.") "fakeroot/fakeroot_" version ".orig.tar.gz")) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "1sg8inv1zzp4h9ncbbmxip3svd11sd86j22cvxrjwnf5zn7mf2j8")) + (base32 "1hlh77b6m2cfm42lcav372mbjni5akbgs25yg4wgi1gndzihbm2n")) (modules '((guix build utils) (ice-9 ftw))) (snippet -- cgit v1.2.3 From 23a01dddcf88af66f3c194e0513b0602a09b890f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 22 May 2022 02:00:00 +0200 Subject: gnu: jitterentropy-rngd: Update to 1.2.7. * gnu/packages/linux.scm (jitterentropy-rngd): Update to 1.2.7. --- 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 d74e7c738c..2716e229e6 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2680,7 +2680,7 @@ Both commands are targeted at system administrators.") (define-public jitterentropy-rngd (package (name "jitterentropy-rngd") - (version "1.2.6") + (version "1.2.7") (source (origin (method git-fetch) @@ -2689,7 +2689,7 @@ Both commands are targeted at system administrators.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "03cbcxkscjcmn6ybkmssq7i39sn5cfsap9fv058pi0k2mr90djwq")))) + (base32 "098hx09bsizin9405gh1c4rzbs2fr7qknqlr3glgyjpm3nm7bx28")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no test suite -- cgit v1.2.3 From a4fa00332eef1726a41f746c5b893cd8f29d7f45 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 22 May 2022 02:00:01 +0200 Subject: gnu: libinih: Update to 55. * gnu/packages/linux.scm (libinih): Update to 55. --- 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 2716e229e6..77ffaa4507 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -8239,7 +8239,7 @@ IP addresses and routes, and configure IPsec.") (define-public libinih (package (name "libinih") - (version "53") + (version "55") (source (origin (method git-fetch) (uri (git-reference @@ -8248,7 +8248,7 @@ IP addresses and routes, and configure IPsec.") (file-name (git-file-name name version)) (sha256 (base32 - "0dqf5j2sw4hq68rqvxbrsf44ygfzx9ypiyzipk4cvp9aimbvsbc6")))) + "0g6dkcphlzgxvh9zyf6rj82gigccca6x5acjxn01gz6rykfg0lnn")))) (build-system meson-build-system) ;; Install static libraries for use by the initrd's xfsprogs/static. (outputs (list "out" "static")) -- cgit v1.2.3 From 69d99f76deb03842f464abccac4bf03534ea34d6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 22 May 2022 02:00:00 +0200 Subject: gnu: libnfnetlink: Update to 1.0.2. * gnu/packages/linux.scm (libnfnetlink): Update to 1.0.2. --- 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 77ffaa4507..4b679507a8 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -8190,7 +8190,7 @@ introduced in Linux 2.6.31.") (define-public libnfnetlink (package (name "libnfnetlink") - (version "1.0.1") + (version "1.0.2") (source (origin (method url-fetch) (uri (string-append @@ -8198,7 +8198,7 @@ introduced in Linux 2.6.31.") "libnfnetlink-" version ".tar.bz2")) (sha256 (base32 - "06mm2x4b01k3m7wnrxblk9j0mybyr4pfz28ml7944xhjx6fy2w7j")))) + "0xn3rcrzxr6g82kfxzs9bqn2zvl2kf2yda30drwb9vr6sk1wfr5h")))) (build-system gnu-build-system) (home-page "https://www.netfilter.org/projects/libnfnetlink/") (synopsis "Low-level netfilter netlink communication library") -- cgit v1.2.3 From c9038edc4fb74b7af5d320ff915603807e901d34 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 22 May 2022 02:00:03 +0200 Subject: gnu: libite: Update to 2.5.2. * gnu/packages/linux.scm (libite): Update to 2.5.2. --- gnu/packages/linux.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 4b679507a8..cfd8909b24 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4920,7 +4920,7 @@ capabilities of the Linux kernel.") (define-public libite (package (name "libite") - (version "2.5.1") + (version "2.5.2") (source (origin (method git-fetch) @@ -4929,8 +4929,7 @@ capabilities of the Linux kernel.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 - "14i0q0nxns6g4zh86zdqy97dwljkqdr5l85ammljzccsrijg9m8v")))) + (base32 "0i27ppb557kdc1hm7nf0f5r7sxvqma31pr57h79whl6qcp28gy4a")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From 23c281424ccb7909478a21ac9092893c846c614a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 22 May 2022 02:00:00 +0200 Subject: gnu: libite: Don't build static library. * gnu/packages/linux.scm (libite)[arguments]: Add "--disable-static" to #:configure-flags. --- gnu/packages/linux.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index cfd8909b24..8469f4380d 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4932,7 +4932,9 @@ capabilities of the Linux kernel.") (base32 "0i27ppb557kdc1hm7nf0f5r7sxvqma31pr57h79whl6qcp28gy4a")))) (build-system gnu-build-system) (arguments - `(#:phases + `(#:configure-flags + (list "--disable-static") + #:phases (modify-phases %standard-phases (add-after 'unpack 'fix-tests (lambda* (#:key inputs #:allow-other-keys) -- cgit v1.2.3 From 00dcdfd73170cdc89f2f033a5164e452d8b827fe Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 22 May 2022 02:00:02 +0200 Subject: gnu: iotop: Update to 0.6-0.a14256a. * gnu/packages/linux.scm (iotop): Update to 0.6-0.a14256a. [source]: Build from Git. --- gnu/packages/linux.scm | 61 +++++++++++++++++++++++++++----------------------- 1 file changed, 33 insertions(+), 28 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 8469f4380d..4664641509 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3184,35 +3184,40 @@ the command line or a script.") (license license:gpl2+))) (define-public iotop - (package - (name "iotop") - (version "0.6") - (source - (origin - (method url-fetch) - (uri (string-append "http://guichaz.free.fr/iotop/files/iotop-" - version ".tar.gz")) - (sha256 (base32 - "1kp8mqg2pbxq4xzpianypadfxcsyfgwcaqgqia6h9fsq6zyh4z0s")))) - (build-system python-build-system) - (arguments - '(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-build-with-python3 - (lambda _ - (substitute* "setup.py" - (("itervalues") "values")) - #t))) - ;; There are currently no checks in the package. - #:tests? #f)) - (native-inputs (list python)) - (home-page "http://guichaz.free.fr/iotop/") - (synopsis - "Displays the IO activity of running processes") - (description - "Iotop is a Python program with a top like user interface to show the + ;; The last release is from 2013 and gives a misleading CONFIG_TASK_DELAY_ACCT + ;; error on ‘newer’ kernels. + (let ((revision "0") + (commit "a14256a3ff74eeee59493ac088561f1bafab85a7")) + (package + (name "iotop") + (version (git-version "0.6" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://repo.or.cz/iotop.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "00h5p8fk1zi237q8mqds8apqbis9iw0yih1hl0pr63dsnyzmmrpw")))) + (build-system python-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-build-with-python3 + (lambda _ + (substitute* "setup.py" + (("itervalues") "values"))))) + ;; There are currently no checks in the package. + #:tests? #f)) + (native-inputs (list python)) + (home-page "http://guichaz.free.fr/iotop/") + (synopsis + "Displays the IO activity of running processes") + (description + "Iotop is a Python program with a top like user interface to show the processes currently causing I/O.") - (license license:gpl2+))) + (license license:gpl2+)))) (define-public fuse (package -- cgit v1.2.3 From 4275299e1105cc22e86b8f84c73459cc10e74661 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 22 May 2022 02:00:01 +0200 Subject: gnu: iotop: Rename to iotop-python. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This package is in maintenance mode, and is slower whilst having fewer features than the C implementation added in a following commit. * gnu/packages/linux.scm (iotop-python): New variable name of… (iotop): …this removed variable. --- 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 4664641509..517e3628e7 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3183,13 +3183,13 @@ settings.") the command line or a script.") (license license:gpl2+))) -(define-public iotop +(define-public iotop-python ;; The last release is from 2013 and gives a misleading CONFIG_TASK_DELAY_ACCT ;; error on ‘newer’ kernels. (let ((revision "0") (commit "a14256a3ff74eeee59493ac088561f1bafab85a7")) (package - (name "iotop") + (name "iotop-python") (version (git-version "0.6" revision commit)) (source (origin -- cgit v1.2.3 From ecdc633a05aa9f9e19f6c947062d7a7281d1d522 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 22 May 2022 02:00:00 +0200 Subject: gnu: Add iotop, now in C. * gnu/packages/linux.scm (iotop): New public variable. --- gnu/packages/linux.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 517e3628e7..048fdcec98 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3219,6 +3219,43 @@ the command line or a script.") processes currently causing I/O.") (license license:gpl2+)))) +(define-public iotop + (package + (name "iotop") + (version "1.21") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Tomas-M/iotop") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "03wdnkfl51dapilg6r9vjga1xrl9lxlypfz07k50nscvbq8v8fb7")))) + (build-system gnu-build-system) + (arguments + (list #:make-flags + #~(list (string-append "CC=" #$(cc-for-target)) + (string-append "PREFIX=" #$output)) + #:tests? #f ; no tests + #:phases + #~(modify-phases %standard-phases + (delete 'configure)))) ; no configure script + (native-inputs (list pkg-config)) + (inputs (list ncurses)) + (home-page "https://github.com/Tomas-M/iotop") + (synopsis "Interactive @command{top}-like input/output activity monitor") + (description + "iotop identifies which processes and threads are most responsible for +@acronym{I/O, input/output} activity such as disc reads and writes. It sorts +them in a live, interactive table overview similar to that of the well-known +@command{top}. + +This information makes it much easier for an administrator to see which tasks +are blocking others and adjust their priority (using @command{ionice}) or stop +or kill them altogether.") + (license license:gpl2+))) + (define-public fuse (package (name "fuse") -- cgit v1.2.3 From dab819d5c4c55609efae098c8e3c2f2757c34e5b Mon Sep 17 00:00:00 2001 From: Josselin Poiret Date: Mon, 23 May 2022 22:37:26 +0200 Subject: Move (gnu platform) and (gnu platforms ...) to guix/. * gnu/platform.scm: * gnu/platforms/arm.scm: * gnu/platforms/hurd.scm: * gnu/platforms/mips.scm: * gnu/platforms/powerpc.scm: * gnu/platforms/riscv.scm: * gnu/platforms/s390.scm: * gnu/platforms/x86.scm: Move to guix/. * Makefile.am: * doc/guix.texi (Porting to a New Platform): * etc/release-manifest.scm: * gnu/ci.scm: * gnu/image.scm: * gnu/local.mk: * gnu/packages/bioinformatics.scm: * gnu/packages/bootstrap.scm: * gnu/packages/cross-base.scm: * gnu/packages/instrumentation.scm: * gnu/packages/linux.scm: * gnu/system/image.scm: * gnu/system/images/hurd.scm: * gnu/system/images/novena.scm: * gnu/system/images/pine64.scm: * gnu/system/images/pinebook-pro.scm: * gnu/system/images/rock64.scm: * guix/scripts/build.scm: * guix/scripts/system.scm: * guix/self.scm: Update (gnu platform...) to (guix platform...). Signed-off-by: Mathieu Othacehe --- Makefile.am | 8 +++ doc/guix.texi | 2 +- etc/release-manifest.scm | 2 +- gnu/ci.scm | 2 +- gnu/image.scm | 2 +- gnu/local.mk | 8 --- gnu/packages/bioinformatics.scm | 2 +- gnu/packages/bootstrap.scm | 2 +- gnu/packages/cross-base.scm | 2 +- gnu/packages/instrumentation.scm | 2 +- gnu/packages/linux.scm | 2 +- gnu/platform.scm | 139 ------------------------------------- gnu/platforms/arm.scm | 38 ---------- gnu/platforms/hurd.scm | 29 -------- gnu/platforms/mips.scm | 30 -------- gnu/platforms/powerpc.scm | 38 ---------- gnu/platforms/riscv.scm | 30 -------- gnu/platforms/s390.scm | 30 -------- gnu/platforms/x86.scm | 59 ---------------- gnu/system/image.scm | 2 +- gnu/system/images/hurd.scm | 2 +- gnu/system/images/novena.scm | 2 +- gnu/system/images/pine64.scm | 2 +- gnu/system/images/pinebook-pro.scm | 2 +- gnu/system/images/rock64.scm | 2 +- guix/platform.scm | 139 +++++++++++++++++++++++++++++++++++++ guix/platforms/arm.scm | 37 ++++++++++ guix/platforms/hurd.scm | 28 ++++++++ guix/platforms/mips.scm | 29 ++++++++ guix/platforms/powerpc.scm | 37 ++++++++++ guix/platforms/riscv.scm | 29 ++++++++ guix/platforms/s390.scm | 29 ++++++++ guix/platforms/x86.scm | 58 ++++++++++++++++ guix/scripts/build.scm | 2 +- guix/scripts/system.scm | 2 +- guix/self.scm | 2 +- 36 files changed, 412 insertions(+), 419 deletions(-) delete mode 100644 gnu/platform.scm delete mode 100644 gnu/platforms/arm.scm delete mode 100644 gnu/platforms/hurd.scm delete mode 100644 gnu/platforms/mips.scm delete mode 100644 gnu/platforms/powerpc.scm delete mode 100644 gnu/platforms/riscv.scm delete mode 100644 gnu/platforms/s390.scm delete mode 100644 gnu/platforms/x86.scm create mode 100644 guix/platform.scm create mode 100644 guix/platforms/arm.scm create mode 100644 guix/platforms/hurd.scm create mode 100644 guix/platforms/mips.scm create mode 100644 guix/platforms/powerpc.scm create mode 100644 guix/platforms/riscv.scm create mode 100644 guix/platforms/s390.scm create mode 100644 guix/platforms/x86.scm (limited to 'gnu/packages/linux.scm') diff --git a/Makefile.am b/Makefile.am index 5a42bb90b2..e993552fe9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -132,6 +132,14 @@ MODULES = \ guix/workers.scm \ guix/least-authority.scm \ guix/ipfs.scm \ + guix/platform.scm \ + guix/platforms/arm.scm \ + guix/platforms/hurd.scm \ + guix/platforms/mips.scm \ + guix/platforms/powerpc.scm \ + guix/platforms/riscv.scm \ + guix/platforms/s390.scm \ + guix/platforms/x86.scm \ guix/build-system.scm \ guix/build-system/android-ndk.scm \ guix/build-system/ant.scm \ diff --git a/doc/guix.texi b/doc/guix.texi index 184206bec8..d3a6966a4c 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -40448,7 +40448,7 @@ guix build --target=armv5tel-linux-gnueabi bootstrap-tarballs @end example For this to work, it is first required to register a new platform as -defined in the @code{(gnu platform)} module. A platform is making the +defined in the @code{(guix platform)} module. A platform is making the connection between a GNU triplet (@pxref{Specifying Target Triplets, GNU configuration triplets,, autoconf, Autoconf}), the equivalent @var{system} in Nix notation, the name of the diff --git a/etc/release-manifest.scm b/etc/release-manifest.scm index 1098f491ba..dd70068490 100644 --- a/etc/release-manifest.scm +++ b/etc/release-manifest.scm @@ -23,7 +23,7 @@ (use-modules (gnu packages) (guix packages) (guix profiles) - ((gnu platform) #:select (targets)) + ((guix platform) #:select (targets)) ((gnu services xorg) #:select (%default-xorg-modules)) (guix utils) (srfi srfi-1) diff --git a/gnu/ci.scm b/gnu/ci.scm index 9de1b54fc8..f476e22731 100644 --- a/gnu/ci.scm +++ b/gnu/ci.scm @@ -55,7 +55,7 @@ #:use-module (gnu packages multiprecision) #:use-module (gnu packages make-bootstrap) #:use-module (gnu packages package-management) - #:use-module (gnu platform) + #:use-module (guix platform) #:use-module (gnu system) #:use-module (gnu system image) #:use-module (gnu system vm) diff --git a/gnu/image.scm b/gnu/image.scm index 0b3a5a096b..e10a495d3d 100644 --- a/gnu/image.scm +++ b/gnu/image.scm @@ -17,7 +17,7 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu image) - #:use-module (gnu platform) + #:use-module (guix platform) #:use-module (guix records) #:export (partition partition? diff --git a/gnu/local.mk b/gnu/local.mk index 06826ee0cc..a4250248ca 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -89,7 +89,6 @@ GNU_SYSTEM_MODULES = \ %D%/home/services/utils.scm \ %D%/home/services/xdg.scm \ %D%/image.scm \ - %D%/platform.scm \ %D%/packages.scm \ %D%/packages/abduco.scm \ %D%/packages/abiword.scm \ @@ -631,13 +630,6 @@ GNU_SYSTEM_MODULES = \ %D%/packages/zile.scm \ %D%/packages/zwave.scm \ \ - %D%/platforms/arm.scm \ - %D%/platforms/mips.scm \ - %D%/platforms/powerpc.scm \ - %D%/platforms/riscv.scm \ - %D%/platforms/s390.scm \ - %D%/platforms/x86.scm \ - \ %D%/services.scm \ %D%/services/admin.scm \ %D%/services/audio.scm \ diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 2a312b1989..474d85f320 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -161,7 +161,7 @@ #:use-module (gnu packages wget) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) - #:use-module (gnu platform) + #:use-module (guix platform) #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) #:use-module (ice-9 match)) diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index 5337617a53..d2914fb5a7 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -26,7 +26,7 @@ (define-module (gnu packages bootstrap) #:use-module (guix licenses) #:use-module (gnu packages) - #:use-module (gnu platform) + #:use-module (guix platform) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system) diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index 427fefbcd2..93e4f8a445 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -30,7 +30,7 @@ #:use-module (gnu packages linux) #:use-module (gnu packages hurd) #:use-module (gnu packages mingw) - #:use-module (gnu platform) + #:use-module (guix platform) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix utils) diff --git a/gnu/packages/instrumentation.scm b/gnu/packages/instrumentation.scm index c5062388f8..2db21aef1b 100644 --- a/gnu/packages/instrumentation.scm +++ b/gnu/packages/instrumentation.scm @@ -42,7 +42,7 @@ #:use-module (gnu packages swig) #:use-module (gnu packages tbb) #:use-module (gnu packages xml) - #:use-module (gnu platform) + #:use-module (guix platform) #:use-module (guix build-system cmake) #:use-module (guix build-system copy) #:use-module (guix build-system gnu) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 048fdcec98..bd24fce432 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -158,7 +158,7 @@ #:use-module (gnu packages groff) #:use-module (gnu packages selinux) #:use-module (gnu packages swig) - #:use-module (gnu platform) + #:use-module (guix platform) #:use-module (guix build-system cmake) #:use-module (guix build-system copy) #:use-module (guix build-system gnu) diff --git a/gnu/platform.scm b/gnu/platform.scm deleted file mode 100644 index fdc3685e7c..0000000000 --- a/gnu/platform.scm +++ /dev/null @@ -1,139 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2021 Mathieu Othacehe -;;; -;;; This file is part of GNU Guix. -;;; -;;; GNU Guix is free software; you can redistribute it and/or modify it -;;; under the terms of the GNU General Public License as published by -;;; the Free Software Foundation; either version 3 of the License, or (at -;;; your option) any later version. -;;; -;;; GNU Guix is distributed in the hope that it will be useful, but -;;; WITHOUT ANY WARRANTY; without even the implied warranty of -;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;;; GNU General Public License for more details. -;;; -;;; You should have received a copy of the GNU General Public License -;;; along with GNU Guix. If not, see . - -(define-module (gnu platform) - #:use-module (guix discovery) - #:use-module (guix memoization) - #:use-module (guix records) - #:use-module (guix ui) - #:use-module (srfi srfi-1) - #:export (platform - platform? - platform-target - platform-system - platform-linux-architecture - platform-glibc-dynamic-linker - - platform-modules - platforms - lookup-platform-by-system - lookup-platform-by-target - lookup-platform-by-target-or-system - platform-system->target - platform-target->system - - systems - targets)) - - -;;; -;;; Platform record. -;;; - -;; Description of a platform supported by GNU Guix. -;; -;; The 'target' field must be a valid GNU triplet as defined here: -;; https://www.gnu.org/software/autoconf/manual/autoconf-2.68/html_node/Specifying-Target-Triplets.html. -;; It is used for cross-compilation purposes. -;; -;; The 'system' field is the name of the corresponding system as defined in -;; the (gnu packages bootstrap) module. It can be for instance -;; "aarch64-linux" or "armhf-linux". It is used to emulate a different host -;; architecture, for instance i686-linux on x86_64-linux-gnu, or armhf-linux -;; on x86_64-linux, using the QEMU binfmt transparent emulation mechanism. -;; -;; The 'linux-architecture' is only relevant if the kernel is Linux. In that -;; case, it corresponds to the ARCH variable used when building Linux. -;; -;; The 'glibc-dynamic-linker' field is the name of Glibc's dynamic linker for -;; the corresponding system. -(define-record-type* platform make-platform - platform? - (target platform-target) - (system platform-system) - (linux-architecture platform-linux-architecture - (default #f)) - (glibc-dynamic-linker platform-glibc-dynamic-linker)) - - -;;; -;;; Platforms. -;;; - -(define (platform-modules) - "Return the list of platform modules." - (all-modules (map (lambda (entry) - `(,entry . "gnu/platforms")) - %load-path) - #:warn warn-about-load-error)) - -(define platforms - ;; The list of publically-known platforms. - (memoize - (lambda () - (fold-module-public-variables (lambda (obj result) - (if (platform? obj) - (cons obj result) - result)) - '() - (platform-modules))))) - -(define (lookup-platform-by-system system) - "Return the platform corresponding to the given SYSTEM." - (find (lambda (platform) - (let ((s (platform-system platform))) - (and (string? s) (string=? s system)))) - (platforms))) - -(define (lookup-platform-by-target target) - "Return the platform corresponding to the given TARGET." - (find (lambda (platform) - (let ((t (platform-target platform))) - (and (string? t) (string=? t target)))) - (platforms))) - -(define (lookup-platform-by-target-or-system target-or-system) - "Return the platform corresponding to the given TARGET or SYSTEM." - (or (lookup-platform-by-target target-or-system) - (lookup-platform-by-system target-or-system))) - -(define (platform-system->target system) - "Return the target matching the given SYSTEM if it exists or false -otherwise." - (let ((platform (lookup-platform-by-system system))) - (and=> platform platform-target))) - -(define (platform-target->system target) - "Return the system matching the given TARGET if it exists or false -otherwise." - (let ((platform (lookup-platform-by-target system))) - (and=> platform platform-system))) - - -;;; -;;; Systems & Targets. -;;; - -(define (systems) - "Return the list of supported systems." - (delete-duplicates - (filter-map platform-system (platforms)))) - -(define (targets) - "Return the list of supported targets." - (map platform-target (platforms))) diff --git a/gnu/platforms/arm.scm b/gnu/platforms/arm.scm deleted file mode 100644 index bf68b2d00f..0000000000 --- a/gnu/platforms/arm.scm +++ /dev/null @@ -1,38 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2021 Mathieu Othacehe -;;; -;;; This file is part of GNU Guix. -;;; -;;; GNU Guix is free software; you can redistribute it and/or modify it -;;; under the terms of the GNU General Public License as published by -;;; the Free Software Foundation; either version 3 of the License, or (at -;;; your option) any later version. -;;; -;;; GNU Guix is distributed in the hope that it will be useful, but -;;; WITHOUT ANY WARRANTY; without even the implied warranty of -;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;;; GNU General Public License for more details. -;;; -;;; You should have received a copy of the GNU General Public License -;;; along with GNU Guix. If not, see . - -(define-module (gnu platforms arm) - #:use-module (gnu platform) - #:use-module (gnu packages linux) - #:use-module (guix records) - #:export (armv7-linux - aarch64-linux)) - -(define armv7-linux - (platform - (target "arm-linux-gnueabihf") - (system "armhf-linux") - (linux-architecture "arm") - (glibc-dynamic-linker "/lib/ld-linux-armhf.so.3"))) - -(define aarch64-linux - (platform - (target "aarch64-linux-gnu") - (system "aarch64-linux") - (linux-architecture "arm64") - (glibc-dynamic-linker "/lib/ld-linux-aarch64.so.1"))) diff --git a/gnu/platforms/hurd.scm b/gnu/platforms/hurd.scm deleted file mode 100644 index 328e9818ad..0000000000 --- a/gnu/platforms/hurd.scm +++ /dev/null @@ -1,29 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2021 Mathieu Othacehe -;;; -;;; This file is part of GNU Guix. -;;; -;;; GNU Guix is free software; you can redistribute it and/or modify it -;;; under the terms of the GNU General Public License as published by -;;; the Free Software Foundation; either version 3 of the License, or (at -;;; your option) any later version. -;;; -;;; GNU Guix is distributed in the hope that it will be useful, but -;;; WITHOUT ANY WARRANTY; without even the implied warranty of -;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;;; GNU General Public License for more details. -;;; -;;; You should have received a copy of the GNU General Public License -;;; along with GNU Guix. If not, see . - -(define-module (gnu platforms hurd) - #:use-module (gnu platform) - #:use-module (gnu packages linux) - #:use-module (guix records) - #:export (hurd)) - -(define hurd - (platform - (target "i586-pc-gnu") - (system "i586-gnu") - (glibc-dynamic-linker "/lib/ld.so.1"))) diff --git a/gnu/platforms/mips.scm b/gnu/platforms/mips.scm deleted file mode 100644 index 174657da13..0000000000 --- a/gnu/platforms/mips.scm +++ /dev/null @@ -1,30 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2022 Mathieu Othacehe -;;; -;;; This file is part of GNU Guix. -;;; -;;; GNU Guix is free software; you can redistribute it and/or modify it -;;; under the terms of the GNU General Public License as published by -;;; the Free Software Foundation; either version 3 of the License, or (at -;;; your option) any later version. -;;; -;;; GNU Guix is distributed in the hope that it will be useful, but -;;; WITHOUT ANY WARRANTY; without even the implied warranty of -;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;;; GNU General Public License for more details. -;;; -;;; You should have received a copy of the GNU General Public License -;;; along with GNU Guix. If not, see . - -(define-module (gnu platforms mips) - #:use-module (gnu platform) - #:use-module (gnu packages linux) - #:use-module (guix records) - #:export (mips64-linux)) - -(define mips64-linux - (platform - (target "mips64el-linux-gnu") - (system "mips64el-linux") - (linux-architecture "mips") - (glibc-dynamic-linker "/lib/ld.so.1"))) diff --git a/gnu/platforms/powerpc.scm b/gnu/platforms/powerpc.scm deleted file mode 100644 index 1d0b5cb666..0000000000 --- a/gnu/platforms/powerpc.scm +++ /dev/null @@ -1,38 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2022 Mathieu Othacehe -;;; -;;; This file is part of GNU Guix. -;;; -;;; GNU Guix is free software; you can redistribute it and/or modify it -;;; under the terms of the GNU General Public License as published by -;;; the Free Software Foundation; either version 3 of the License, or (at -;;; your option) any later version. -;;; -;;; GNU Guix is distributed in the hope that it will be useful, but -;;; WITHOUT ANY WARRANTY; without even the implied warranty of -;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;;; GNU General Public License for more details. -;;; -;;; You should have received a copy of the GNU General Public License -;;; along with GNU Guix. If not, see . - -(define-module (gnu platforms powerpc) - #:use-module (gnu platform) - #:use-module (gnu packages linux) - #:use-module (guix records) - #:export (powerpc-linux - powerpc64le-linux)) - -(define powerpc-linux - (platform - (target "powerpc-linux-gnu") - (system "powerpc-linux") - (linux-architecture "powerpc") - (glibc-dynamic-linker "/lib/ld.so.1"))) - -(define powerpc64le-linux - (platform - (target "powerpc64le-linux-gnu") - (system "powerpc64le-linux") - (linux-architecture "powerpc") - (glibc-dynamic-linker "/lib/ld64.so.2"))) diff --git a/gnu/platforms/riscv.scm b/gnu/platforms/riscv.scm deleted file mode 100644 index c2b4850e55..0000000000 --- a/gnu/platforms/riscv.scm +++ /dev/null @@ -1,30 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2022 Mathieu Othacehe -;;; -;;; This file is part of GNU Guix. -;;; -;;; GNU Guix is free software; you can redistribute it and/or modify it -;;; under the terms of the GNU General Public License as published by -;;; the Free Software Foundation; either version 3 of the License, or (at -;;; your option) any later version. -;;; -;;; GNU Guix is distributed in the hope that it will be useful, but -;;; WITHOUT ANY WARRANTY; without even the implied warranty of -;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;;; GNU General Public License for more details. -;;; -;;; You should have received a copy of the GNU General Public License -;;; along with GNU Guix. If not, see . - -(define-module (gnu platforms riscv) - #:use-module (gnu platform) - #:use-module (gnu packages linux) - #:use-module (guix records) - #:export (riscv64-linux)) - -(define riscv64-linux - (platform - (target "riscv64-linux-gnu") - (system "riscv64-linux") - (linux-architecture "riscv") - (glibc-dynamic-linker "/lib/ld-linux-riscv64-lp64d.so.1"))) diff --git a/gnu/platforms/s390.scm b/gnu/platforms/s390.scm deleted file mode 100644 index d3b1133974..0000000000 --- a/gnu/platforms/s390.scm +++ /dev/null @@ -1,30 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2022 Mathieu Othacehe -;;; -;;; This file is part of GNU Guix. -;;; -;;; GNU Guix is free software; you can redistribute it and/or modify it -;;; under the terms of the GNU General Public License as published by -;;; the Free Software Foundation; either version 3 of the License, or (at -;;; your option) any later version. -;;; -;;; GNU Guix is distributed in the hope that it will be useful, but -;;; WITHOUT ANY WARRANTY; without even the implied warranty of -;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;;; GNU General Public License for more details. -;;; -;;; You should have received a copy of the GNU General Public License -;;; along with GNU Guix. If not, see . - -(define-module (gnu platforms s390) - #:use-module (gnu platform) - #:use-module (gnu packages linux) - #:use-module (guix records) - #:export (s390x-linux)) - -(define s390x-linux - (platform - (target "s390x-linux-gnu") - (system "s390x-linux") - (linux-architecture "s390") - (glibc-dynamic-linker "/lib/ld64.so.1"))) diff --git a/gnu/platforms/x86.scm b/gnu/platforms/x86.scm deleted file mode 100644 index fba7dd4fc0..0000000000 --- a/gnu/platforms/x86.scm +++ /dev/null @@ -1,59 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2022 Mathieu Othacehe -;;; -;;; This file is part of GNU Guix. -;;; -;;; GNU Guix is free software; you can redistribute it and/or modify it -;;; under the terms of the GNU General Public License as published by -;;; the Free Software Foundation; either version 3 of the License, or (at -;;; your option) any later version. -;;; -;;; GNU Guix is distributed in the hope that it will be useful, but -;;; WITHOUT ANY WARRANTY; without even the implied warranty of -;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;;; GNU General Public License for more details. -;;; -;;; You should have received a copy of the GNU General Public License -;;; along with GNU Guix. If not, see . - -(define-module (gnu platforms x86) - #:use-module (gnu platform) - #:use-module (gnu packages linux) - #:use-module (guix records) - #:export (i686-linux - x86_64-linux - i686-mingw - x86_64-mingw - hurd)) - -(define i686-linux - (platform - (target "i686-linux-gnu") - (system "i686-linux") - (linux-architecture "i386") - (glibc-dynamic-linker "/lib/ld-linux.so.2"))) - -(define x86_64-linux - (platform - (target "x86_64-linux-gnu") - (system "x86_64-linux") - (linux-architecture "x86_64") - (glibc-dynamic-linker "/lib/ld-linux-x86-64.so.2"))) - -(define i686-mingw - (platform - (target "i686-w64-mingw32") - (system #f) - (glibc-dynamic-linker #f))) - -(define x86_64-mingw - (platform - (target "x86_64-w64-mingw32") - (system #f) - (glibc-dynamic-linker #f))) - -(define hurd - (platform - (target "i586-pc-gnu") - (system "i586-gnu") - (glibc-dynamic-linker "/lib/ld.so.1"))) diff --git a/gnu/system/image.scm b/gnu/system/image.scm index 74b81d02f6..dd32e58c2d 100644 --- a/gnu/system/image.scm +++ b/gnu/system/image.scm @@ -32,7 +32,7 @@ #:use-module (gnu bootloader) #:use-module (gnu bootloader grub) #:use-module (gnu image) - #:use-module (gnu platform) + #:use-module (guix platform) #:use-module (gnu services) #:use-module (gnu services base) #:use-module (gnu system) diff --git a/gnu/system/images/hurd.scm b/gnu/system/images/hurd.scm index 4c38c46a89..36b6f3a200 100644 --- a/gnu/system/images/hurd.scm +++ b/gnu/system/images/hurd.scm @@ -23,7 +23,7 @@ #:use-module (gnu bootloader grub) #:use-module (gnu image) #:use-module (gnu packages ssh) - #:use-module (gnu platforms hurd) + #:use-module (guix platforms hurd) #:use-module (gnu services) #:use-module (gnu services ssh) #:use-module (gnu system) diff --git a/gnu/system/images/novena.scm b/gnu/system/images/novena.scm index 5b625e56c5..b9ff6dcfea 100644 --- a/gnu/system/images/novena.scm +++ b/gnu/system/images/novena.scm @@ -22,7 +22,7 @@ #:use-module (gnu bootloader u-boot) #:use-module (gnu image) #:use-module (gnu packages linux) - #:use-module (gnu platforms arm) + #:use-module (guix platforms arm) #:use-module (gnu services) #:use-module (gnu services base) #:use-module (gnu system) diff --git a/gnu/system/images/pine64.scm b/gnu/system/images/pine64.scm index aaec458766..99c4ed6ceb 100644 --- a/gnu/system/images/pine64.scm +++ b/gnu/system/images/pine64.scm @@ -21,7 +21,7 @@ #:use-module (gnu bootloader u-boot) #:use-module (gnu image) #:use-module (gnu packages linux) - #:use-module (gnu platforms arm) + #:use-module (guix platforms arm) #:use-module (gnu services) #:use-module (gnu services base) #:use-module (gnu system) diff --git a/gnu/system/images/pinebook-pro.scm b/gnu/system/images/pinebook-pro.scm index 1bfac7a8bb..7e8910427e 100644 --- a/gnu/system/images/pinebook-pro.scm +++ b/gnu/system/images/pinebook-pro.scm @@ -21,7 +21,7 @@ #:use-module (gnu bootloader u-boot) #:use-module (gnu image) #:use-module (gnu packages linux) - #:use-module (gnu platforms arm) + #:use-module (guix platforms arm) #:use-module (gnu services) #:use-module (gnu services base) #:use-module (gnu system) diff --git a/gnu/system/images/rock64.scm b/gnu/system/images/rock64.scm index d25d55e528..68cb65f115 100644 --- a/gnu/system/images/rock64.scm +++ b/gnu/system/images/rock64.scm @@ -21,7 +21,7 @@ #:use-module (gnu bootloader u-boot) #:use-module (gnu image) #:use-module (gnu packages linux) - #:use-module (gnu platforms arm) + #:use-module (guix platforms arm) #:use-module (gnu services) #:use-module (gnu services base) #:use-module (gnu services networking) diff --git a/guix/platform.scm b/guix/platform.scm new file mode 100644 index 0000000000..361241cb2e --- /dev/null +++ b/guix/platform.scm @@ -0,0 +1,139 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2021 Mathieu Othacehe +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (guix platform) + #:use-module (guix discovery) + #:use-module (guix memoization) + #:use-module (guix records) + #:use-module (guix ui) + #:use-module (srfi srfi-1) + #:export (platform + platform? + platform-target + platform-system + platform-linux-architecture + platform-glibc-dynamic-linker + + platform-modules + platforms + lookup-platform-by-system + lookup-platform-by-target + lookup-platform-by-target-or-system + platform-system->target + platform-target->system + + systems + targets)) + + +;;; +;;; Platform record. +;;; + +;; Description of a platform supported by GNU Guix. +;; +;; The 'target' field must be a valid GNU triplet as defined here: +;; https://www.gnu.org/software/autoconf/manual/autoconf-2.68/html_node/Specifying-Target-Triplets.html. +;; It is used for cross-compilation purposes. +;; +;; The 'system' field is the name of the corresponding system as defined in +;; the (gnu packages bootstrap) module. It can be for instance +;; "aarch64-linux" or "armhf-linux". It is used to emulate a different host +;; architecture, for instance i686-linux on x86_64-linux-gnu, or armhf-linux +;; on x86_64-linux, using the QEMU binfmt transparent emulation mechanism. +;; +;; The 'linux-architecture' is only relevant if the kernel is Linux. In that +;; case, it corresponds to the ARCH variable used when building Linux. +;; +;; The 'glibc-dynamic-linker' field is the name of Glibc's dynamic linker for +;; the corresponding system. +(define-record-type* platform make-platform + platform? + (target platform-target) + (system platform-system) + (linux-architecture platform-linux-architecture + (default #f)) + (glibc-dynamic-linker platform-glibc-dynamic-linker)) + + +;;; +;;; Platforms. +;;; + +(define (platform-modules) + "Return the list of platform modules." + (all-modules (map (lambda (entry) + `(,entry . "guix/platforms")) + %load-path) + #:warn warn-about-load-error)) + +(define platforms + ;; The list of publically-known platforms. + (memoize + (lambda () + (fold-module-public-variables (lambda (obj result) + (if (platform? obj) + (cons obj result) + result)) + '() + (platform-modules))))) + +(define (lookup-platform-by-system system) + "Return the platform corresponding to the given SYSTEM." + (find (lambda (platform) + (let ((s (platform-system platform))) + (and (string? s) (string=? s system)))) + (platforms))) + +(define (lookup-platform-by-target target) + "Return the platform corresponding to the given TARGET." + (find (lambda (platform) + (let ((t (platform-target platform))) + (and (string? t) (string=? t target)))) + (platforms))) + +(define (lookup-platform-by-target-or-system target-or-system) + "Return the platform corresponding to the given TARGET or SYSTEM." + (or (lookup-platform-by-target target-or-system) + (lookup-platform-by-system target-or-system))) + +(define (platform-system->target system) + "Return the target matching the given SYSTEM if it exists or false +otherwise." + (let ((platform (lookup-platform-by-system system))) + (and=> platform platform-target))) + +(define (platform-target->system target) + "Return the system matching the given TARGET if it exists or false +otherwise." + (let ((platform (lookup-platform-by-target system))) + (and=> platform platform-system))) + + +;;; +;;; Systems & Targets. +;;; + +(define (systems) + "Return the list of supported systems." + (delete-duplicates + (filter-map platform-system (platforms)))) + +(define (targets) + "Return the list of supported targets." + (map platform-target (platforms))) diff --git a/guix/platforms/arm.scm b/guix/platforms/arm.scm new file mode 100644 index 0000000000..32c0fbc032 --- /dev/null +++ b/guix/platforms/arm.scm @@ -0,0 +1,37 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2021 Mathieu Othacehe +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (guix platforms arm) + #:use-module (guix platform) + #:use-module (guix records) + #:export (armv7-linux + aarch64-linux)) + +(define armv7-linux + (platform + (target "arm-linux-gnueabihf") + (system "armhf-linux") + (linux-architecture "arm") + (glibc-dynamic-linker "/lib/ld-linux-armhf.so.3"))) + +(define aarch64-linux + (platform + (target "aarch64-linux-gnu") + (system "aarch64-linux") + (linux-architecture "arm64") + (glibc-dynamic-linker "/lib/ld-linux-aarch64.so.1"))) diff --git a/guix/platforms/hurd.scm b/guix/platforms/hurd.scm new file mode 100644 index 0000000000..baa6c23b41 --- /dev/null +++ b/guix/platforms/hurd.scm @@ -0,0 +1,28 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2021 Mathieu Othacehe +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (guix platforms hurd) + #:use-module (guix platform) + #:use-module (guix records) + #:export (hurd)) + +(define hurd + (platform + (target "i586-pc-gnu") + (system "i586-gnu") + (glibc-dynamic-linker "/lib/ld.so.1"))) diff --git a/guix/platforms/mips.scm b/guix/platforms/mips.scm new file mode 100644 index 0000000000..e6fa9eb292 --- /dev/null +++ b/guix/platforms/mips.scm @@ -0,0 +1,29 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2022 Mathieu Othacehe +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (guix platforms mips) + #:use-module (guix platform) + #:use-module (guix records) + #:export (mips64-linux)) + +(define mips64-linux + (platform + (target "mips64el-linux-gnu") + (system "mips64el-linux") + (linux-architecture "mips") + (glibc-dynamic-linker "/lib/ld.so.1"))) diff --git a/guix/platforms/powerpc.scm b/guix/platforms/powerpc.scm new file mode 100644 index 0000000000..9d0b343bc3 --- /dev/null +++ b/guix/platforms/powerpc.scm @@ -0,0 +1,37 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2022 Mathieu Othacehe +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (guix platforms powerpc) + #:use-module (guix platform) + #:use-module (guix records) + #:export (powerpc-linux + powerpc64le-linux)) + +(define powerpc-linux + (platform + (target "powerpc-linux-gnu") + (system "powerpc-linux") + (linux-architecture "powerpc") + (glibc-dynamic-linker "/lib/ld.so.1"))) + +(define powerpc64le-linux + (platform + (target "powerpc64le-linux-gnu") + (system "powerpc64le-linux") + (linux-architecture "powerpc") + (glibc-dynamic-linker "/lib/ld64.so.2"))) diff --git a/guix/platforms/riscv.scm b/guix/platforms/riscv.scm new file mode 100644 index 0000000000..c716c12c12 --- /dev/null +++ b/guix/platforms/riscv.scm @@ -0,0 +1,29 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2022 Mathieu Othacehe +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (guix platforms riscv) + #:use-module (guix platform) + #:use-module (guix records) + #:export (riscv64-linux)) + +(define riscv64-linux + (platform + (target "riscv64-linux-gnu") + (system "riscv64-linux") + (linux-architecture "riscv") + (glibc-dynamic-linker "/lib/ld-linux-riscv64-lp64d.so.1"))) diff --git a/guix/platforms/s390.scm b/guix/platforms/s390.scm new file mode 100644 index 0000000000..b5477f1e5e --- /dev/null +++ b/guix/platforms/s390.scm @@ -0,0 +1,29 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2022 Mathieu Othacehe +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (guix platforms s390) + #:use-module (guix platform) + #:use-module (guix records) + #:export (s390x-linux)) + +(define s390x-linux + (platform + (target "s390x-linux-gnu") + (system "s390x-linux") + (linux-architecture "s390") + (glibc-dynamic-linker "/lib/ld64.so.1"))) diff --git a/guix/platforms/x86.scm b/guix/platforms/x86.scm new file mode 100644 index 0000000000..5338049d6f --- /dev/null +++ b/guix/platforms/x86.scm @@ -0,0 +1,58 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2022 Mathieu Othacehe +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (guix platforms x86) + #:use-module (guix platform) + #:use-module (guix records) + #:export (i686-linux + x86_64-linux + i686-mingw + x86_64-mingw + hurd)) + +(define i686-linux + (platform + (target "i686-linux-gnu") + (system "i686-linux") + (linux-architecture "i386") + (glibc-dynamic-linker "/lib/ld-linux.so.2"))) + +(define x86_64-linux + (platform + (target "x86_64-linux-gnu") + (system "x86_64-linux") + (linux-architecture "x86_64") + (glibc-dynamic-linker "/lib/ld-linux-x86-64.so.2"))) + +(define i686-mingw + (platform + (target "i686-w64-mingw32") + (system #f) + (glibc-dynamic-linker #f))) + +(define x86_64-mingw + (platform + (target "x86_64-w64-mingw32") + (system #f) + (glibc-dynamic-linker #f))) + +(define hurd + (platform + (target "i586-pc-gnu") + (system "i586-gnu") + (glibc-dynamic-linker "/lib/ld.so.1"))) diff --git a/guix/scripts/build.scm b/guix/scripts/build.scm index 4383a399a0..75bbb701ae 100644 --- a/guix/scripts/build.scm +++ b/guix/scripts/build.scm @@ -48,7 +48,7 @@ #:use-module (srfi srfi-35) #:use-module (srfi srfi-37) #:use-module (gnu packages) - #:use-module (gnu platform) + #:use-module (guix platform) #:use-module ((guix status) #:select (with-status-verbosity)) #:use-module ((guix progress) #:select (current-terminal-columns)) #:use-module ((guix build syscalls) #:select (terminal-columns)) diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index 73e3c299c1..eaa245eb44 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -66,7 +66,7 @@ (device-module-aliases matching-modules) #:use-module (gnu system linux-initrd) #:use-module (gnu image) - #:use-module (gnu platform) + #:use-module (guix platform) #:use-module (gnu system) #:use-module (gnu bootloader) #:use-module (gnu system file-systems) diff --git a/guix/self.scm b/guix/self.scm index 9fff0ade04..9a64051c32 100644 --- a/guix/self.scm +++ b/guix/self.scm @@ -888,7 +888,7 @@ itself." ,@(scheme-modules* source "gnu/system") ,@(scheme-modules* source "gnu/services") ,@(scheme-modules* source "gnu/machine") - ,@(scheme-modules* source "gnu/platforms/")) + ,@(scheme-modules* source "guix/platforms/")) (list *core-package-modules* *package-modules* *extra-modules* *core-modules*) #:extensions dependencies -- cgit v1.2.3 From 2262ee2c63fd92a17836ff7450623db76ed39d92 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 26 May 2022 12:22:59 +0200 Subject: gnu: linux-libre: Do not call 'configuration-file' on non-Linux targets. Starting from commit b55310603f0df7d5ae02d47cb8d4be58bf1d41ca, a command like: guix build linux-libre -s i586-gnu -n would crash on a wrong-type-arg error in 'kernel-config' because it was getting #f as the 'arch' argument. This commit fixes it. * gnu/packages/linux.scm (make-linux-libre*)[inputs]: Check whether 'platform-linux-architecture' returns #f, as is the case for example on i586-gnu, before calling CONFIGURATION-FILE. --- gnu/packages/linux.scm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index bd24fce432..18bd229dcf 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -793,12 +793,14 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration." ("mpfr" ,mpfr) ("mpc" ,mpc) - ,@(match (and configuration-file - (configuration-file - (platform-linux-architecture - (lookup-platform-by-target-or-system - (or (%current-target-system) (%current-system)))) - #:variant (version-major+minor version))) + ,@(match (let ((arch (platform-linux-architecture + (lookup-platform-by-target-or-system + (or (%current-target-system) + (%current-system)))))) + (and configuration-file arch + (configuration-file + arch + #:variant (version-major+minor version)))) (#f ;no config for this platform '()) ((? string? config) -- cgit v1.2.3