From dc9ec009235fb42d73827ab2a462006b6c74e60d Mon Sep 17 00:00:00 2001 From: Wilko Meyer Date: Sun, 18 Feb 2024 22:17:05 +0100 Subject: gnu: linux-libre 6.7: Update to 6.7.5. * gnu/packages/linux.scm (linux-libre-6.7-version): Update to 6.7.5. (linux-libre-6.7-pristine-source): Update hashes. Change-Id: I29490cd45a43a960b380a23cfb810494ea238691 Signed-off-by: Leo Famulari --- 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 d798c44a8f..bb154a1724 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -496,7 +496,7 @@ (define (%upstream-linux-source version hash) ;; The current "mainline" kernel. -(define-public linux-libre-6.7-version "6.7.4") +(define-public linux-libre-6.7-version "6.7.5") (define-public linux-libre-6.7-gnu-revision "gnu") (define deblob-scripts-6.7 (linux-libre-deblob-scripts @@ -506,7 +506,7 @@ (define deblob-scripts-6.7 (base32 "1vb2pd0wdfl9p5qi8hj1i5xg1p4pyrp01iqhap9xbb2yai4l80j5"))) (define-public linux-libre-6.7-pristine-source (let ((version linux-libre-6.7-version) - (hash (base32 "036nk3h7vqzd7gnxan2173kpss5qm2pci1lvd58gh90azigrz3gn"))) + (hash (base32 "1zrralagnv9yr8qdg7lc05735691dbh92mgwfyxrq5xqc504dxi9"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-6.7))) -- cgit v1.2.3 From a673109d08632dd5fa225b33d2f4fb66116b2e63 Mon Sep 17 00:00:00 2001 From: Wilko Meyer Date: Sun, 18 Feb 2024 22:17:06 +0100 Subject: gnu: linux-libre 6.6: Update to 6.6.17. * gnu/packages/linux.scm (linux-libre-6.6-version): Update to 6.6.17. (linux-libre-6.6-pristine-source): Update hashes. Change-Id: I911c604ff188f80068ec49edaa8df5aab00439a7 Signed-off-by: Leo Famulari --- 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 bb154a1724..14ebd53fd1 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -514,7 +514,7 @@ (define-public linux-libre-6.7-pristine-source ;; The current "stable" kernels. That is, the most recently released major ;; versions that are still supported upstream. -(define-public linux-libre-6.6-version "6.6.16") +(define-public linux-libre-6.6-version "6.6.17") (define-public linux-libre-6.6-gnu-revision "gnu") (define deblob-scripts-6.6 (linux-libre-deblob-scripts @@ -524,7 +524,7 @@ (define deblob-scripts-6.6 (base32 "0kavbby960k7wg355p3hjb9v1c4gnk8dv3lkfhpz44ayhv7kihg5"))) (define-public linux-libre-6.6-pristine-source (let ((version linux-libre-6.6-version) - (hash (base32 "0c5a9agdr27bwd1z6790whczb858z8i34hhn548lzbdylfamf7dj"))) + (hash (base32 "0si20m9ckir826jg40bh7sh4kwlp610rnc3gwsgs4nm7dfcm0xpf"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-6.6))) -- cgit v1.2.3 From d51ac341050b8f1b6b22515c356ed3d6e3c85797 Mon Sep 17 00:00:00 2001 From: Wilko Meyer Date: Sun, 18 Feb 2024 22:17:07 +0100 Subject: gnu: linux-libre 6.1: Update to 6.1.78. * gnu/packages/linux.scm (linux-libre-6.1-version): Update to 6.1.78. (linux-libre-6.1-pristine-source): Update hash. Change-Id: I1293b6494fa26f2c786d8cbabe6c855610eca499 Signed-off-by: Leo Famulari --- 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 14ebd53fd1..932685ef68 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -532,7 +532,7 @@ (define-public linux-libre-6.6-pristine-source ;; The "longterm" kernels — the older releases with long-term upstream support. ;; Here are the support timelines: ;; -(define-public linux-libre-6.1-version "6.1.77") +(define-public linux-libre-6.1-version "6.1.78") (define-public linux-libre-6.1-gnu-revision "gnu") (define deblob-scripts-6.1 (linux-libre-deblob-scripts @@ -542,7 +542,7 @@ (define deblob-scripts-6.1 (base32 "1jg2v1nxd6i5x536vmd1l14xhpzrcimpmjfipb1zkrwil102y25f"))) (define-public linux-libre-6.1-pristine-source (let ((version linux-libre-6.1-version) - (hash (base32 "07grng6rrgpy6c3465hwqhn3gcdam1c8rwya30vgpk8nfxbfqm1v"))) + (hash (base32 "12fn23m2xwdlv6gr1s8872lk8mvigqkblvlhr54nh8rik2b6n835"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-6.1))) -- cgit v1.2.3 From b6f82b9ef1a3d51a39995598eab9f793656e9123 Mon Sep 17 00:00:00 2001 From: Tomas Volf <~@wolfsden.cz> Date: Tue, 13 Feb 2024 17:22:09 +0100 Subject: gnu: linux-libre-documentation: Fix compilation. When compiling linux-libre-documentation@6.6.16, the compilation fails with following error message: ------ Exception occurred: File "/tmp/guix-build-linux-libre-documentation-6.6.16.drv-0/linux-6.6.16/Documentation/sphinx/kernel_feat.py", line 112, in run nodeList = self.nestedParse(out_lines, fname) UnboundLocalError: local variable 'fname' referenced before assignment ------ This is already fixed upstream[0], so this commit backports the change. 0: https://lore.kernel.org/all/20240206054907.066a0325@coco.lan/t/ * gnu/packages/linux.scm (linux-libre-documentation): Apply patch fixing compilation. Change-Id: Ic96f14aa25df09f38e029ca70d2647cbf37c2365 Signed-off-by: Leo Famulari --- gnu/packages/linux.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 932685ef68..339add4d82 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2004,6 +2004,17 @@ (define-public linux-libre-documentation (package (inherit linux-libre) (name "linux-libre-documentation") + (source + (origin + (inherit linux-libre-source) + (patches + (list + (origin + (method url-fetch) + (uri "https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/patch/Documentation/sphinx/kernel_feat.py?id=c23de7ceae59e4ca5894c3ecf4f785c50c0fa428") + (sha256 + (base32 + "0inw2pl7nh82sw8bhvvzqa61552bisl78yc1nyl2x6dmpyppzrld"))))))) (arguments (list #:tests? #f -- cgit v1.2.3 From 8ded262f048ff457e0095070decb20603bb83763 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Thu, 15 Feb 2024 13:57:50 +0000 Subject: gnu: Add python-spython. * gnu/packages/linux.scm (python-spython): New variable. Change-Id: I758f879608bc4b0c0411918b4ee0fa9cc3abc639 Signed-off-by: Arun Isaac --- gnu/packages/linux.scm | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 339add4d82..8eb6d9b7d3 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -80,6 +80,7 @@ ;;; Copyright © 2023 Jaeme Sifat ;;; Copyright © 2024 Gabriel Wicki ;;; Copyright © 2024 Sharlatan Hellseher +;;; Copyright © 2024 Arun Isaac ;;; ;;; This file is part of GNU Guix. ;;; @@ -5276,6 +5277,51 @@ (define-public singularity isolation or root privileges.") (license license:bsd-3))) +(define-public python-spython + (package + (name "python-spython") + (version "0.3.13") + (source + (origin + (method url-fetch) + (uri (pypi-uri "spython" version)) + (sha256 + (base32 "0kly851k6mj7xzcybciav5d0pq5q04pzg7c5a1g712bqbxkha4ck")))) + (build-system pyproject-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + ;; Configure absolute path to singularity. + (add-after 'unpack 'configure + (lambda* (#:key inputs #:allow-other-keys) + (let ((singularity (search-input-file inputs "bin/singularity"))) + (substitute* "spython/utils/terminal.py" + (("software=\"singularity\"") + (string-append "software=\"" singularity "\""))) + (substitute* (list "spython/utils/terminal.py" + "spython/main/help.py" + "spython/main/base/command.py") + (("\\[\"singularity\"") + (string-append "[\"" singularity "\""))) + (substitute* "spython/main/execute.py" + (("shutil.which\\(\"singularity\"\\)") + (string-append "shutil.which(\"" singularity "\")")))))) + ;; Skip tests that require network access. + (add-before 'check 'skip-tests + (lambda _ + (delete-file "spython/tests/test_client.py")))))) + (inputs + (list singularity)) + (native-inputs + (list python-pytest + python-pytest-runner)) + (home-page "https://github.com/singularityhub/singularity-cli") + (synopsis "Singularity Python client") + (description "@code{python-spython} is a Python library to interact with +Singularity containers.") + (license license:mpl2.0))) + (define-public libnvme (package (name "libnvme") -- cgit v1.2.3 From aefc7428203203ae88c64cc4769113453c01a185 Mon Sep 17 00:00:00 2001 From: Juliana Sims Date: Thu, 22 Feb 2024 17:56:58 -0500 Subject: gnu: tlpui: Fix build. * gnu/packages/linux.scm (tlpui)[arguments]: Fix location for "defaults.conf". Change-Id: I047375f875492aa5c6ef3f9ea673e366f00d89ad Signed-off-by: Nicolas Goaziou --- 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 8eb6d9b7d3..ef225479ca 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -7879,7 +7879,7 @@ (define-public tlpui (("\"tlp-stat\"") (string-append "'" tlp-stat "'")) (("/usr/share/tlp/defaults.conf") - (string-append "'" defaults.conf "'"))) + defaults.conf)) (substitute* "ui_config_objects/gtkusblist.py" (("\"lsusb\"") (string-append "'" lsusb "'"))) -- cgit v1.2.3