diff options
Diffstat (limited to 'guix')
| -rw-r--r-- | guix/build-system/linux-module.scm | 3 | ||||
| -rw-r--r-- | guix/build-system/minetest.scm | 4 | ||||
| -rw-r--r-- | guix/build/minetest-build-system.scm | 1 | ||||
| -rw-r--r-- | guix/cpu.scm | 5 | ||||
| -rw-r--r-- | guix/gexp.scm | 2 | ||||
| -rw-r--r-- | guix/import/crate.scm | 5 | ||||
| -rw-r--r-- | guix/lint.scm | 22 | ||||
| -rw-r--r-- | guix/man-db.scm | 5 | ||||
| -rw-r--r-- | guix/read-print.scm | 2 | ||||
| -rw-r--r-- | guix/scripts/import/crate.scm | 1 | ||||
| -rw-r--r-- | guix/substitutes.scm | 6 | ||||
| -rw-r--r-- | guix/utils.scm | 3 |
12 files changed, 42 insertions, 17 deletions
diff --git a/guix/build-system/linux-module.scm b/guix/build-system/linux-module.scm index d0654a923e..d8ebef60d0 100644 --- a/guix/build-system/linux-module.scm +++ b/guix/build-system/linux-module.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2020 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2021 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2021 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -222,7 +223,7 @@ (use-modules #$@(sexp->gexp modules)) (define %build-host-inputs - '#+(input-tuples->gexp build-inputs)) + #+(input-tuples->gexp build-inputs)) (define %build-target-inputs (append #$(input-tuples->gexp host-inputs) diff --git a/guix/build-system/minetest.scm b/guix/build-system/minetest.scm index 1fae3a47e9..9774c5882a 100644 --- a/guix/build-system/minetest.scm +++ b/guix/build-system/minetest.scm @@ -37,6 +37,9 @@ (define (default-minetest) (module-ref (resolve-interface '(gnu packages minetest)) 'minetest)) +(define (default-minetest-game) + (module-ref (resolve-interface '(gnu packages minetest)) 'minetest-game)) + (define (default-xvfb-run) (module-ref (resolve-interface '(gnu packages xorg)) 'xvfb-run)) @@ -57,6 +60,7 @@ standard packages used as implicit inputs of the Minetest build system." `(("xvfb-run" ,(default-xvfb-run)) ("optipng" ,(default-optipng)) ("minetest" ,(default-minetest)) + ("minetest-game" ,(default-minetest-game)) ,@(filter (lambda (input) (member (car input) '("libc" "tar" "gzip" "bzip2" "xz" "locales"))) diff --git a/guix/build/minetest-build-system.scm b/guix/build/minetest-build-system.scm index 3bf083e004..305e9dc1ba 100644 --- a/guix/build/minetest-build-system.scm +++ b/guix/build/minetest-build-system.scm @@ -1,3 +1,4 @@ +;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be> ;;; ;;; This file is part of GNU Guix. diff --git a/guix/cpu.scm b/guix/cpu.scm index 840215cff0..ef5c3dce2a 100644 --- a/guix/cpu.scm +++ b/guix/cpu.scm @@ -167,7 +167,8 @@ corresponds to CPU, a record as returned by 'current-cpu'." ("lm" "sse3" => "k8-sse3") ("longmode" => "k8") ("lm" => "k8"))) - (if-flags ("avx512f" => "znver4") + (if-flags ("avx512vp2intersect" => "znver5") + ("avx512f" => "znver4") ("vaes" => "znver3") ("clwb" => "znver2") ("clzero" => "znver1") @@ -312,7 +313,7 @@ CPUs for compilers which don't allow for more focused optimizing." ((or "graniterapids-d" "graniterapids" "tigerlake" "sapphirerapids" "cooperlake" "icelake-server" "icelake-client" "cannonlake" "knm" "knl" "skylake-avx512" - "znver4") + "znver5" "znver4") "x86-64-v4") ((or "pantherlake" "clearwaterforest" "arrowlake-s" "sierraforest" "alderlake" "skylake" "broadwell" "haswell" diff --git a/guix/gexp.scm b/guix/gexp.scm index 871e59cfdc..e44aea6420 100644 --- a/guix/gexp.scm +++ b/guix/gexp.scm @@ -1629,7 +1629,7 @@ as returned by 'local-file' for example." (_ #f)) files) (imported-files/derivation files #:name name - #:symlink? derivation? + #:symlink? #f ;like 'interned-file-tree' #:system system #:guile guile) (interned-file-tree `(,name directory ,@(file-mapping->tree files))))) diff --git a/guix/import/crate.scm b/guix/import/crate.scm index 263c2a8b16..84c178ea3e 100644 --- a/guix/import/crate.scm +++ b/guix/import/crate.scm @@ -3,7 +3,6 @@ ;;; Copyright © 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2019, 2020 Martin Becze <mjbecze@riseup.net> ;;; Copyright © 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr> -;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev> ;;; Copyright © 2022 Hartmut Goebel <h.goebel@crazy-compilers.com> ;;; Copyright © 2023 Simon Tournier <zimon.toutoune@gmail.com> ;;; Copyright © 2023, 2024 Efraim Flashner <efraim@flashner.co.il> @@ -164,14 +163,14 @@ use in an 'inputs' field of a package definition." (() '()) ((package-inputs ...) - `(#:cargo-inputs (,'unquote (list ,@package-inputs)))))) + `(#:cargo-inputs ,package-inputs)))) (define (maybe-cargo-development-inputs package-names) (match (package-names->package-inputs package-names) (() '()) ((package-inputs ...) - `(#:cargo-development-inputs (,'unquote (list ,@package-inputs)))))) + `(#:cargo-development-inputs ,package-inputs)))) (define (maybe-arguments arguments) (match arguments diff --git a/guix/lint.scm b/guix/lint.scm index 7612832a5a..8c6c20c723 100644 --- a/guix/lint.scm +++ b/guix/lint.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com> ;;; Copyright © 2017 Alex Kost <alezost@gmail.com> ;;; Copyright © 2017, 2021 Tobias Geerinckx-Rice <me@tobias.gr> -;;; Copyright © 2017, 2018, 2020 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2017, 2018, 2020, 2024 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2018, 2019 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2020 Chris Marusich <cmmarusich@gmail.com> ;;; Copyright © 2020 Timothy Sample <samplet@ngyro.com> @@ -96,6 +96,7 @@ #:export (check-description-style check-inputs-should-be-native check-inputs-should-not-be-an-input-at-all + check-inputs-should-use-a-minimal-variant check-input-labels check-wrapper-inputs check-patch-file-names @@ -598,6 +599,21 @@ of a package, and INPUT-NAMES, a list of package specifications such as (package-input-intersection (package-direct-inputs package) input-names)))) +(define (check-inputs-should-use-a-minimal-variant package) + ;; Emit a warning if some inputs of PACKAGE should likely be replaced + ;; with their minimal variant. + (let ((input-names '("bash" + "cmake" + "gettext"))) + (map (lambda (input) + (make-warning + package + (G_ "'~a' should probably switched for its minimal variant") + (list input) + #:field 'inputs)) + (package-input-intersection (package-direct-inputs package) + input-names)))) + (define (check-input-labels package) "Emit a warning for labels that differ from the corresponding package name." (define (check input-kind package-inputs) @@ -1979,6 +1995,10 @@ them for PACKAGE." (description "Identify inputs that shouldn't be inputs at all") (check check-inputs-should-not-be-an-input-at-all)) (lint-checker + (name 'inputs-should-be-minimal) + (description "Identify inputs that should use their minimal variant") + (check check-inputs-should-use-a-minimal-variant)) + (lint-checker (name 'input-labels) (description "Identify input labels that do not match package names") (check check-input-labels)) diff --git a/guix/man-db.scm b/guix/man-db.scm index 9cb07493ba..bba90ed473 100644 --- a/guix/man-db.scm +++ b/guix/man-db.scm @@ -223,7 +223,6 @@ for it." ".gz")) (file-zst (string-append directory "/" link ".zst"))) - (and (or (file-exists? file-gz) - (file-exists? file-zst) file) - file))))) + (or (and (file-exists? file-gz) file-gz) + (and (file-exists? file-zst) file-zst)))))) (man-files directory))) diff --git a/guix/read-print.scm b/guix/read-print.scm index 6421b79737..1f7902c546 100644 --- a/guix/read-print.scm +++ b/guix/read-print.scm @@ -350,7 +350,7 @@ expressions and blanks that were read." ('swap-space 1) ('user-account 1) ('user-group 1) - ('setuid-program 1) + ('privileged-program 1) ('modify-services 2) ;; (gnu home). diff --git a/guix/scripts/import/crate.scm b/guix/scripts/import/crate.scm index 082a973aee..a4adabfeff 100644 --- a/guix/scripts/import/crate.scm +++ b/guix/scripts/import/crate.scm @@ -1,4 +1,3 @@ - ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 David Thompson <davet@gnu.org> ;;; Copyright © 2016 David Craven <david@craven.ch> diff --git a/guix/substitutes.scm b/guix/substitutes.scm index e732096933..e31b394020 100644 --- a/guix/substitutes.scm +++ b/guix/substitutes.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013-2021, 2023 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2013-2021, 2023-2024 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014 Nikita Karetnikov <nikita@karetnikov.org> ;;; Copyright © 2018 Kyle Meyer <kyle@kyleam.com> ;;; Copyright © 2020 Christopher Baines <mail@cbaines.net> @@ -65,11 +65,11 @@ (define %narinfo-negative-ttl ;; Likewise, but for negative lookups---i.e., cached lookup failures (404). - (* 10 60)) + (* 2 60)) (define %narinfo-transient-error-ttl ;; Likewise, but for transient errors such as 504 ("Gateway timeout"). - (* 5 60)) + (* 1 60)) (define %narinfo-cache-directory ;; A local cache of narinfos, to avoid going to the network. Most of the diff --git a/guix/utils.scm b/guix/utils.scm index d8ce6ed886..f161cb4ef3 100644 --- a/guix/utils.scm +++ b/guix/utils.scm @@ -973,7 +973,8 @@ VERSIONS. For example: (define (compressed-file? file) "Return true if FILE denotes a compressed file." (->bool (member (file-extension file) - '("gz" "bz2" "xz" "lz" "lzma" "tgz" "tbz2" "zip")))) + '("gz" "bz2" "xz" "lz" "lzma" "tgz" "tbz2" "tzst" + "zip" "zst")))) (define* (string-replace-substring str substr replacement #:optional |