1
0
forked from tribes/guix

Compare commits

...

18 Commits

Author SHA1 Message Date
Patrick Norton a15d5a0bf4 gnu: Use built-in delete-all-but.
* gnu/packages/astronomy.scm (phd2): Use built-in delete-all-but.
* gnu/packages/debug.scm (fandango): Likewise.
* gnu/packages/electronics.scm (librepcb, nextpnr): Likewise.
* gnu/packages/emacs-xyz.scm (emacs-smartparens): Likewise.
* gnu/packages/emulators.scm (dolphin-emu, libretro-dolphin-emu)
  (libretro-slang-shaders, mgba, pcsx2, retroarch-minimal): Likewise.
* gnu/packages/game-development.scm (sfml): Likewise.
* gnu/packages/golang-apps.scm (godoc): Likewise.
* gnu/packages/golang-build.scm (go-golang-org-x-tools-go-expect)
  (go-golang-org-x-tools-go-packages-packagestest)
  (go-golang-org-x-tools-godoc): Likewise.
* gnu/packages/golang-web.scm (go-cloud-google-com-go-auth)
  (go-cloud-google-com-go-auth-oauth2adapt)
  (go-cloud-google-com-go-iam, go-cloud-google-com-go-kms)
  (go-cloud-google-com-go-longrunning)
  (go-cloud-google-com-go-monitoring, go-cloud-google-com-go-security)
  (go-cloud-google-com-go-storage)
  (go-github-com-aws-aws-sdk-go-v2-config)
  (go-github-com-aws-aws-sdk-go-v2-credentials)
  (go-github-com-aws-aws-sdk-go-v2-feature-ec2-imds)
  (go-github-com-aws-aws-sdk-go-v2-internal-configsources)
  (go-github-com-aws-aws-sdk-go-v2-internal-endpoints-v2)
  (go-github-com-aws-aws-sdk-go-v2-service-kms)
  (go-github-com-aws-aws-sdk-go-v2-service-sqs)
  (go-github-com-azure-azure-sdk-for-go-sdk-azcore)
  (go-github-com-azure-azure-sdk-for-go-sdk-azidentity)
  (go-github-com-azure-azure-sdk-for-go-sdk-internal)
  (go-github-com-azure-azure-sdk-for-go-sdk-security-keyvault-azkeys)
  (go-github-com-azure-azure-sdk-for-go-sdk-security-keyvault-intern)
  (go-github-com-azure-azure-sdk-for-go-sdk-storage-azblob)
  (go-github-com-azure-azure-sdk-for-go-sdk-storage-azfile)
  (go-github-com-envoyproxy-go-control-plane-envoy)
  (go-github-com-googlecloudplatform-opentelemetry-operations-go-exp)
  (go-github-com-googlecloudplatform-opentelemetry-operations-go-int)
  (go-github-com-grpc-ecosystem-go-grpc-middleware-providers-prometh)
  (go-github-com-hashicorp-go-secure-stdlib-parseutil)
  (go-github-com-jtolio-crawlspace-tools)
  (go-github-com-moby-moby-client)
  (go-github-com-sigstore-sigstore-pkg-signature-kms-aws)
  (go-github-com-sigstore-sigstore-pkg-signature-kms-azure)
  (go-github-com-sigstore-sigstore-pkg-signature-kms-gcp)
  (go-github-com-sigstore-sigstore-pkg-signature-kms-hashivault)
  (go-go-etcd-io-etcd-api-v3, go-go-etcd-io-etcd-client-pkg-v3)
  (go-go-opentelemetry-io-auto-sdk)
  (go-go-opentelemetry-io-contrib-detectors-gcp)
  (go-go-opentelemetry-io-contrib-propagators-autoprop)
  (go-go-opentelemetry-io-otel-exporters-otlp-otlpmetric-otlpmetricg)
  (go-go-opentelemetry-io-otel-exporters-otlp-otlpmetric-otlpmetrich)
  (go-go-opentelemetry-io-otel-exporters-otlp-otlptrace)
  (go-go-opentelemetry-io-otel-exporters-otlp-otlptrace-otlptracegrp)
  (go-go-opentelemetry-io-otel-exporters-otlp-otlptrace-otlptracehttp)
  (go-go-opentelemetry-io-otel-exporters-prometheus)
  (go-go-opentelemetry-io-otel-exporters-stdout-stdoutmetric)
  (go-go-opentelemetry-io-otel-exporters-zipkin)
  (go-go-opentelemetry-io-otel-log, go-go-opentelemetry-io-otel-sdk)
  (go-go-opentelemetry-io-otel-sdk-log)
  (go-go-opentelemetry-io-otel-sdk-metric)
  (go-google-golang-org-genproto-googleapis-api)
  (go-google-golang-org-genproto-googleapis-bytestream)
  (go-google-golang-org-grpc-cmd-protoc-gen-go-grpc)
  (go-google-golang-org-grpc-examples)
  (go-k8s-io-kube-openapi-test-integration): Likewise.
* gnu/packages/golang-xyz.scm (go-github-com-ajstarks-deck-generate)
  (go-github-com-charmbracelet-x-ansi)
  (go-github-com-charmbracelet-x-cellbuf)
  (go-github-com-charmbracelet-x-errors)
  (go-github-com-charmbracelet-x-term)
  (go-github-com-charmbracelet-x-xpty)
  (go-github-com-containerd-errdefs-pkg)
  (go-github-com-moby-sys-atomicwriter)
  (go-github-com-moby-sys-mount, go-go-uber-org-zap-exp)
  (go-modernc-org-ccgo-v4, go-sigs-k8s-io-kustomize-cmd-config):
  Likewise.
* gnu/packages/image-processing.scm (opencv): Likewise.
* gnu/packages/ipfs.scm (go-github-com-ipfs-shipyard-nopfs-ipfs):
  Likewise.
* gnu/packages/mail.scm (neomutt): Likewise.
* gnu/packages/mpi.scm (openmpi-5): Likewise.
* gnu/packages/protobuf.scm (protobuf-6): Likewise.
* gnu/packages/specifications.scm (specification-astropy-data): Likewise.
* gnu/packages/vnc.scm (turbovnc): Likewise.

Change-Id: I6575463a072a6ee05751e23ebcee9a393529c8b1
Merges: https://codeberg.org/guix/guix/pulls/5312
Reviewed-by: Maxim Cournoyer <maxim@guixotic.coop>
Reviewed-by: Cayetano Santos <csantosb@inventati.org>
Reviewed-by: Gabriel Wicki <gabriel@erlikon.ch>
Co-authored-by: Nguyễn Gia Phong <cnx@loang.net>
Signed-off-by: Nguyễn Gia Phong <cnx@loang.net>
2026-04-15 14:13:58 +09:00
Patrick Norton bd9291ee8e guix: build: utils: Add delete-all-but.
* guix/build/utils.scm (delete-all-but): New variable.

Change-Id: I15e1d632a97236b8d18cec3be993c81e138dff04
Reviewed-by: Maxim Cournoyer <maxim@guixotic.coop>
Reviewed-by: Cayetano Santos <csantosb@inventati.org>
Reviewed-by: Gabriel Wicki <gabriel@erlikon.ch>
Signed-off-by: Nguyễn Gia Phong <cnx@loang.net>
2026-04-15 14:13:58 +09:00
Nicolas Graves 9798583386 gnu: libass: Drop input labels.
* gnu/packages/video.scm (libass)[propagated-inputs]:
  Drop input labels.

Change-Id: Id10ec581c1b91512fe809c47561a8e9155ca5812
Signed-off-by: Nguyễn Gia Phong <cnx@loang.net>
2026-04-15 14:13:58 +09:00
Nicolas Graves ab0ca88517 gnu: avahi: Drop input labels.
* gnu/packages/avahi.scm (avahi)[inputs, native-inputs]:
  Drop input labels.

Change-Id: I73110124f2d60ede7b2279ab878c68ca05dbb9c1
Signed-off-by: Nguyễn Gia Phong <cnx@loang.net>
2026-04-15 14:13:58 +09:00
Nicolas Graves 964574452f gnu: libxpm: Drop input labels.
* gnu/packages/xorg.scm (libxpm)[inputs]: Drop input labels.

Change-Id: I1c0d9f35b699fe355c5e6234928153c2e8a75696
Signed-off-by: Nguyễn Gia Phong <cnx@loang.net>
2026-04-15 14:13:58 +09:00
Nicolas Graves bc7babdca4 gnu: libnsl: Drop input labels.
* gnu/packages/onc-rpc.scm (libnsl)[inputs]: Drop input labels.

Change-Id: Ia7eb8b801d1e1c276a73d24837a3251657a9ac68
Signed-off-by: Nguyễn Gia Phong <cnx@loang.net>
2026-04-15 14:13:58 +09:00
Dariqq 7db4de8f48 gnu: linux-pam: Update to 1.7.2.
nis/yp is disabled since support got removed in glibc.
includedir and libdir are set to the correct value automatically.

* gnu/packages/linux.scm (linux-pam): Update to 1.7.2.
  [source]: Switch to git-fetch.  [build-system]: Switch to meson.
  [arguments]<#:phases>: Remove 'skip-pam-limits phases.
  <#:configure-flags>: Remove includedir, libdir and disable-nis.
  Enable pam_lastlog, set docbook-rng, htmldir and vendordir.
  [native-inputs]: Add gettext-minimal, bison, libxslt, libxml2,
  docbook-xml, docbook-xsl.  [outputs]: Add doc.
* gnu/packages/patches/linux-pam-unix_chkpwd.patch: Adjust for meson.

Change-Id: Ib75277a77f9042a0a9c07fa7e28f7f68ecfa9c04
Merges: https://codeberg.org/guix/guix/pulls/1652
Signed-off-by: Nguyễn Gia Phong <cnx@loang.net>
2026-04-15 14:13:58 +09:00
Andy Tai 1089c208c0 gnu: aspell: Update to 0.60.8.2.
* gnu/packages/aspell.scm (aspell): Update to 0.60.8.2.
  [source]<patches>: Remove aspell-CVE-2019-25051.patch.
* gnu/packages/patches/aspell-CVE-2019-25051.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): De-register it.

Change-Id: I19b7bfc98cbfee9eafde382d812e033a0f3c8e7e
Merges: https://codeberg.org/guix/guix/pulls/6092
Signed-off-by: Nguyễn Gia Phong <cnx@loang.net>
2026-04-15 14:13:57 +09:00
Andy Tai e99e394628 gnu: groff: Update to 1.24.0.
* gnu/packages/groff.scm (groff): Update to 1.24.0

Change-Id: If42e96a1b51d6da042158824289f39b80e5c7807
Merges: https://codeberg.org/guix/guix/pulls/6784
Signed-off-by: Nguyễn Gia Phong <cnx@loang.net>
2026-04-15 14:13:57 +09:00
Gabriel Santos 820fdf9549 gnu: vidstab: Indent.
* gnu/packages/video.scm (vidstab): Indent.

Change-Id: I5130200ba34007732139c20280b4bf607223a6a8
Merges: https://codeberg.org/guix/guix/pulls/5245
Reviewed-by: Sharlatan Hellseher <sharlatanus@gmail.com>
Signed-off-by: Nguyễn Gia Phong <cnx@loang.net>
2026-04-15 14:13:57 +09:00
Gabriel Santos d45d75301c gnu: vidstab: Update to 1.1.0.
* gnu/packages/video.scm (vidstab): Update to 1.1.0.

Change-Id: I8d67f71be92d6026eeda4cb7de8b95950f73b3dd
Reviewed-by: Sharlatan Hellseher <sharlatanus@gmail.com>
Signed-off-by: Nguyễn Gia Phong <cnx@loang.net>
2026-04-15 14:13:57 +09:00
Ashish SHUKLA e030447ebd gnu: jansson: Update to 2.15.0.
* gnu/packages/web.scm (jansson): Update to 2.15.0.

Change-Id: I9721fe4f16b1a622ddb49c3a53b3a94b1cb49500
Merges: https://codeberg.org/guix/guix/pulls/1935
Signed-off-by: Nguyễn Gia Phong <cnx@loang.net>
2026-04-15 14:13:57 +09:00
Ashish SHUKLA 621afc1dc7 gnu: nghttp2: Update to 1.68.1.
* gnu/packages/web.scm (nghttp2): Update to 1.68.1.

Change-Id: I12b74c0cfbdbdabf8c58479d60b3bdd3b965305e
Merges: https://codeberg.org/guix/guix/pulls/1934
Signed-off-by: Nguyễn Gia Phong <cnx@loang.net>
2026-04-15 14:13:57 +09:00
Anderson Torres 92363d6ab0 gnu: utf8proc: Update to 2.11.3.
* gnu/packages/textutils.scm (utf8proc, utf8proc-bootstrap):
  Update to 2.11.3.
  [native-inputs]<NormalizationTest.txt, GraphemeBreakTest.txt>
  <DerivedCoreProperties.txt>: Update to Unicode 17.0.0.

Change-Id: I7fb8df6d759dcfd48b1efc85768f75cedf170a3a
Merges: https://codeberg.org/guix/guix/pulls/5270
Signed-off-by: Nguyễn Gia Phong <cnx@loang.net>
2026-04-15 14:13:57 +09:00
Ashish SHUKLA dd7f6b1c92 gnu: elogind: Update to 255.22
* gnu/packages/freedesktop.scm (elogind): Update to 255.22.
[source]<commit>: Update tag prefix.

Change-Id: I2b2e2f8fb8adbd3d9a3ae419e1087d3abdc2baad
Merges: https://codeberg.org/guix/guix/pulls/4680
Signed-off-by: Nguyễn Gia Phong <cnx@loang.net>
2026-04-15 14:13:57 +09:00
Ashish SHUKLA 896898342d gnu: oksh: Update to 7.8.
* gnu/packages/shells.scm (oksh): Update to 7.8.

Change-Id: I54642941193a9695ee56e539953a9d119fc7f97e
Merges: https://codeberg.org/guix/guix/pulls/4055
Signed-off-by: Nguyễn Gia Phong <cnx@loang.net>
2026-04-15 14:13:57 +09:00
Antoine Côté 39f1fb3ad1 gnu: libaacs: Update to 0.11.1.
* gnu/packages/video.scm (libaacs): Update to 0.11.1.

Change-Id: Ib6b1122e54689f318ed8c28a94b2a0dab9c935dc
Merges: https://codeberg.org/guix/guix/pulls/1132
Signed-off-by: Nguyễn Gia Phong <cnx@loang.net>
2026-04-15 14:13:57 +09:00
Ashish SHUKLA 7964bbdf12 gnu: jemalloc: Update to 5.3.1
* gnu/packages/jemalloc.scm (jemalloc): Update to 5.3.1.

Change-Id: I86b8dc2e4f00d8aecd8f41a577e043549568af49
Merges: https://codeberg.org/guix/guix/pulls/7909
Signed-off-by: Nguyễn Gia Phong <cnx@loang.net>
2026-04-15 14:13:12 +09:00
31 changed files with 260 additions and 1132 deletions
+2 -2
View File
@@ -52,7 +52,7 @@
(define-public aspell
(package
(name "aspell")
(version "0.60.8.1")
(version "0.60.8.2")
(source
(origin
(method url-fetch)
@@ -60,7 +60,7 @@
version ".tar.gz"))
(sha256
(base32
"06yjhwlgpcvbrl5g83qjrpzjwjx7hka5lhsfc3x5gm229nri5nnn"))
"06b9szgm9cj1zh58r7sbl5fbi3vi9fs7b1as4ir8y176x9ilizjp"))
(patches (search-patches "aspell-default-dict-dir.patch"))))
(build-system gnu-build-system)
(arguments
+1 -10
View File
@@ -1877,18 +1877,9 @@ R. Seaman's protocol}
(file-name (git-file-name name version))
(sha256
(base32 "0n2jzlpwvjgj8ydg7hsqxnvy8s9pdi5z96id0231kgi87pyfkh7s"))
(modules '((guix build utils)
(ice-9 ftw)
(srfi srfi-26)))
(modules '((guix build utils)))
(snippet
#~(begin
;; XXX: 'delete-all-but' is copied from the turbovnc package.
(define (delete-all-but directory . preserve)
(with-directory-excursion directory
(let* ((pred (negate (cut member <>
(cons* "." ".." preserve))))
(items (scandir "." pred)))
(for-each (cut delete-file-recursively <>) items))))
(delete-all-but "thirdparty" "thirdparty.cmake")))))
(build-system cmake-build-system)
(arguments
+17 -17
View File
@@ -98,24 +98,24 @@
(cut patch-shebang <> path)
(find-files (string-append #$output "/etc/avahi"))))))))
(inputs
`(("bash-minimal" ,bash-minimal)
("dbus" ,dbus)
("expat" ,expat)
("gdbm" ,gdbm)
("glib" ,glib)
;; Do not use libcap when cross-compiling since it's not quite
;; cross-compilable; and use it only for supported systems.
,@(if (and (not (%current-target-system))
(member (%current-system)
(package-supported-systems libcap)))
`(("libcap" ,libcap)) ;to enable chroot support in avahi-daemon
'())
("libdaemon" ,libdaemon)
("libevent" ,libevent)))
(cons* bash-minimal
dbus
expat
gdbm
glib
libdaemon
libevent
;; Do not use libcap when cross-compiling since it's not quite
;; cross-compilable; and use it only for supported systems.
(if (and (not (%current-target-system))
(member (%current-system)
(package-supported-systems libcap)))
(list libcap) ;to enable chroot support in avahi-daemon
(list))))
(native-inputs
`(("gettext" ,gettext-minimal)
("glib" ,glib "bin")
("pkg-config" ,pkg-config)))
(list gettext-minimal
(list glib "bin")
pkg-config))
(synopsis "Implementation of mDNS/DNS-SD protocols")
(description
"Avahi is a system which facilitates service discovery on a local
+1 -9
View File
@@ -1096,17 +1096,9 @@ to aid in debugging.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256 (base32 "0ppx8r9isc772y0ahpgl8g5b3yxka7ffqzlcsa920aib5nj39lrg"))
(modules '((guix build utils)
(ice-9 ftw)
(srfi srfi-26)))
(modules '((guix build utils)))
(snippet
#~(begin
(define (delete-all-but directory . preserve)
(with-directory-excursion directory
(let* ((pred (negate (cut member <>
(cons* "." ".." preserve))))
(items (scandir "." pred)))
(for-each (cut delete-file-recursively <>) items))))
(substitute* "pyproject.toml"
;; Python is linked with GNU readline on all Guix targets.
((".*gnureadline.*") "")
+15 -34
View File
@@ -1586,31 +1586,21 @@ exploration and optimization.")
(commit version)
(recursive? #t)))
(file-name (git-file-name name version))
(modules '((guix build utils)
(ice-9 ftw)
(srfi srfi-26)))
(modules '((guix build utils)))
(snippet
#~(begin
;; XXX: 'delete-all-but' is copied from the turbovnc package.
(define (delete-all-but directory . preserve)
(with-directory-excursion directory
(let* ((pred (negate (cut member <>
(cons* "." ".." preserve))))
(items (scandir "." pred)))
(for-each (cut delete-file-recursively <>) items))))
(delete-all-but "libs"
"delaunay-triangulation"
"dxflib"
;; "fontobene-qt"
;; "googletest"
;; "hoedown"
"librepcb"
;; "muparser"
"optional"
"parseagle"
;; "polyclipping"
;; "quazip"
"type_safe")))
#~(delete-all-but "libs"
"delaunay-triangulation"
"dxflib"
;; "fontobene-qt"
;; "googletest"
;; "hoedown"
"librepcb"
;; "muparser"
"optional"
"parseagle"
;; "polyclipping"
;; "quazip"
"type_safe"))
(sha256
(base32 "1g3k2g2p5yy7zk971bg7qh4k38p30aydp27c5bfb02gn7djknz7w"))))
(build-system cmake-build-system)
@@ -2166,18 +2156,9 @@ layout of a circuit corresponds to the desired netlists.")
;; no longer have their original upstream.
(recursive? #t)))
(file-name (git-file-name name version))
(modules '((guix build utils)))
(snippet
#~(begin
(use-modules (guix build utils)
(ice-9 ftw)
(srfi srfi-26))
;; XXX: 'delete-all-but' is copied from the turbovnc package.
(define (delete-all-but directory . preserve)
(with-directory-excursion directory
(let* ((pred (negate (cut member <>
(cons* "." ".." preserve))))
(items (scandir "." pred)))
(for-each (cut delete-file-recursively <>) items))))
(delete-all-but "3rdparty"
;; The following sources have all been patched, so
;; cannot easily be unbundled.
+1 -10
View File
@@ -15925,18 +15925,9 @@ placed at the margin of the minibuffer for your completion candidates.")
(url "https://github.com/Fuco1/smartparens")
(commit commit)))
(file-name (git-file-name name version))
(modules '((guix build utils)
(ice-9 ftw)
(srfi srfi-26)))
(modules '((guix build utils)))
(snippet
'(begin
;; Taken from nextpnr package.
(define (delete-all-but directory . preserve)
(with-directory-excursion directory
(let* ((pred
(negate (cut member <> (append '("." "..") preserve))))
(items (scandir "." pred)))
(for-each delete-file items))))
;; Only activate basic tests.
(delete-all-but "test"
"test-helper.el"
+5 -80
View File
@@ -460,13 +460,6 @@ It aims to support Nintendo DSi and 3DS as well.")
(srfi srfi-26)))
(snippet
#~(begin
(define (delete-all-but directory . preserve)
(with-directory-excursion directory
(let* ((pred (negate (cut member <>
(cons* "." ".." preserve))))
(items (scandir "." pred)))
(for-each (cut delete-file-recursively <>) items))))
;; Clean up the source from bundled libraries we don't need.
(delete-all-but "Externals"
;; XXX: The build system is currently hard-coded
@@ -656,14 +649,6 @@ turbo speed, networked multiplayer, and graphical enhancements.")
(srfi srfi-26)))
(snippet
#~(begin
;; XXX: 'delete-all-but' is copied from the turbovnc package.
(define (delete-all-but directory . preserve)
(with-directory-excursion directory
(let* ((pred (negate (cut member <>
(cons* "." ".." preserve))))
(items (scandir "." pred)))
(for-each (cut delete-file-recursively <>) items))))
;; Clean up the source from bundled libraries we don't need.
(delete-all-but "Externals"
;; XXX: The build system is currently hard-coded
@@ -1079,17 +1064,9 @@ The following systems are supported:
(sha256
(base32
"0dfsz4dsh49dc9xx9rjhfzfkg4h91i2ksgp2inlr9yhgldw9q8h3"))
(modules '((guix build utils)
(ice-9 ftw)
(srfi srfi-26)))
(modules '((guix build utils)))
(snippet
#~(begin
(define (delete-all-but directory . preserve)
(with-directory-excursion directory
(let* ((pred (negate (cut member <> (cons* "." ".." preserve))))
(items (scandir "." pred)))
(for-each (cut delete-file-recursively <>) items))))
(delete-all-but "src/third-party"
"blip_buf"
"inih")))))
@@ -2319,42 +2296,9 @@ physical device and the RetroPad virtual controller.")
(modules '((guix build utils)))
(snippet
'(begin
(use-modules (guix build utils)
(ice-9 ftw)
(srfi srfi-1)
(srfi srfi-26))
(define (delete-all-but . preserve)
;; Walk the file tree and delete everything except the paths
;; listed in PRESERVE. Directories listed PRESERVE will cause
;; their whole contents to be preserved.
(let ((preserve (map (compose (cut string-trim-right <> #\/)
(cut string-append "./" <>))
preserve)))
(file-system-fold
(lambda (path stat result) ;enter
(or (any (lambda (x)
(or (string-prefix? path x)
(string-prefix? x path)))
preserve)
(begin
(delete-file-recursively path)
#f)))
(lambda (path stat result) ;leaf (file)
(unless (any (cut string-prefix? <> path) preserve)
(delete-file path)))
(const #t) ;down (directory)
(const #t) ;up (directory)
(lambda (path stat result) ;skip
(when (file-exists? path)
(error "could not enter unreadable directory" path)))
(lambda (path stat errno result) ;error
(error "error processing" path (strerror errno)))
0
".")))
;; This is an allow-list of the shaders explicitly licensed as
;; free software.
(delete-all-but
(delete-all-but "."
"anamorphic/shaders/anamorphic.slang" ;expat
"anamorphic/anamorphic.slangp"
"annotated_passthru.slang" ;public license
@@ -3011,16 +2955,7 @@ GLSL (@file{.slang}) shaders for use with RetroArch.")
(commit (string-append "v" version))))
(snippet
#~(begin
(use-modules (guix build utils)
(ice-9 ftw)
(srfi srfi-26))
;; XXX: 'delete-all-but' is copied from the turbovnc package.
(define (delete-all-but directory . preserve)
(with-directory-excursion directory
(let* ((pred (negate (cut member <>
(cons* "." ".." preserve))))
(items (scandir "." pred)))
(for-each (cut delete-file-recursively <>) items))))
(use-modules (guix build utils))
;; Remove as much bundled sources as possible, shaving off about
;; 65 MiB.
(delete-all-but "deps"
@@ -3827,24 +3762,14 @@ de-interlacing patches for use with PCSX2.")
(file-name (git-file-name name version))
(sha256
(base32 "0nr53cjifqwnz3icxsj01yd3aw1vfsfxga4zz5zi8aqr175mvq27"))
(modules '((guix build utils)
(ice-9 ftw)
(srfi srfi-26)))
(modules '((guix build utils)))
(snippet
#~(begin
(substitute* "cmake/Pcsx2Utils.cmake"
(("(PCSX2_GIT_REV \")Unknown" _ prefix)
(string-append prefix #$version "-guix")))
(delete-file "3rdparty/include/Packet32.h") ;"not open source"
;; XXX: 'delete-all-but' is copied from the turbovnc package.
(define (delete-all-but directory . preserve)
(with-directory-excursion directory
(let* ((pred (negate (cut member <>
(cons* "." ".." preserve))))
(items (scandir "." pred)))
(for-each (cut delete-file-recursively <>) items))))
(delete-all-but
"3rdparty"
(delete-all-but "3rdparty"
;; asl2.0 and cc0
"glad" ;Is tailored.
;; bsd-3
+3 -3
View File
@@ -792,16 +792,16 @@ the freedesktop.org XDG Base Directory specification.")
(define-public elogind
(package
(name "elogind")
(version "255.17")
(version "255.22")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/elogind/elogind")
(commit (string-append "v" version))))
(commit (string-append "V" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0cb6p559281dzh24is91v6d4v4kz45yhyizibi4sfql9nign865h"))))
"0hnzks8f0jl2hkf954pqky5490zacqaipz20k38qvzl5g8i1if5l"))))
(build-system meson-build-system)
(arguments
`(#:configure-flags
+1 -9
View File
@@ -1182,17 +1182,9 @@ It is capable of creating games for SCUMM version 6 and partially version 7.")
(sha256
(base32
"12f1d45995qf5sazjmmfdydllcd6alhqs1s4xwv3jiq1fw66hcy9"))
(modules '((guix build utils)
(ice-9 ftw)
(srfi srfi-26)))
(modules '((guix build utils)))
(snippet
'(begin
;; XXX: 'delete-all-but' is copied from the turbovnc package.
(define (delete-all-but directory . preserve)
(with-directory-excursion directory
(let* ((pred (negate (cut member <> (cons* "." ".." preserve))))
(items (scandir "." pred)))
(for-each (cut delete-file-recursively <>) items))))
(delete-all-but "extlibs/headers"
"glad"))))) ;pre-generated headers
(build-system cmake-build-system)
+1 -9
View File
@@ -192,17 +192,9 @@ definitions in Go programs.")
(file-name (git-file-name name version))
(sha256
(base32 "0c1rxbj3v3m0fqb8q96xlbawxm9scyx6vvr8pddkiwp7zkx4ajym"))
(modules '((guix build utils)
(ice-9 ftw)
(srfi srfi-26)))
(modules '((guix build utils)))
(snippet
#~(begin
(define (delete-all-but directory . preserve)
(with-directory-excursion directory
(let* ((pred (negate (cut member <>
(cons* "." ".." preserve))))
(items (scandir "." pred)))
(for-each (cut delete-file-recursively <>) items))))
(delete-all-but "cmd" "godoc")
(delete-all-but "." "cmd")))))
(build-system go-build-system)
+4 -29
View File
@@ -1535,17 +1535,9 @@ Go programming language.")
(file-name (git-file-name name version))
(sha256
(base32 "0sjvngpahkb5x573i855fjlb1fdmr6n269nmb5xxnbabjb27mnvg"))
(modules '((guix build utils)
(ice-9 ftw)
(srfi srfi-26)))
(modules '((guix build utils)))
(snippet
#~(begin
(define (delete-all-but directory . preserve)
(with-directory-excursion directory
(let* ((pred (negate (cut member <>
(cons* "." ".." preserve))))
(items (scandir "." pred)))
(for-each (cut delete-file-recursively <>) items))))
(delete-all-but "go" "expect")
(delete-all-but "." "go")))))
(build-system go-build-system)
@@ -1575,17 +1567,9 @@ Go source code (including go.mod and go.work files) as test expectations.")
(file-name (git-file-name name version))
(sha256
(base32 "0sjvngpahkb5x573i855fjlb1fdmr6n269nmb5xxnbabjb27mnvg"))
(modules '((guix build utils)
(ice-9 ftw)
(srfi srfi-26)))
(modules '((guix build utils)))
(snippet
#~(begin
(define (delete-all-but directory . preserve)
(with-directory-excursion directory
(let* ((pred (negate (cut member <>
(cons* "." ".." preserve))))
(items (scandir "." pred)))
(for-each (cut delete-file-recursively <>) items))))
(delete-all-but "go" "packages")
(delete-all-but "go/packages" "packagestest")
(delete-all-but "." "go")))))
@@ -1618,18 +1602,9 @@ tools on.")
(file-name (git-file-name name version))
(sha256
(base32 "1blk22apy424j9v58lfy4pxnrgh93yqchqhxsnf78dmx4vx5yi9r"))
(modules '((guix build utils)
(ice-9 ftw)
(srfi srfi-26)))
(modules '((guix build utils)))
(snippet
#~(begin
(define (delete-all-but directory . preserve)
(with-directory-excursion directory
(let* ((pred (negate (cut member <>
(cons* "." ".." preserve))))
(items (scandir "." pred)))
(for-each (cut delete-file-recursively <>) items))))
(delete-all-but "." "godoc")))))
#~(begin (delete-all-but "." "godoc")))))
(build-system go-build-system)
(arguments
(list
File diff suppressed because it is too large Load Diff
+24 -163
View File
@@ -1237,26 +1237,8 @@ may be interactive or produce standard formats such as SVG or PDF.")
(file-name (git-file-name name version))
(sha256
(base32 "1np11if704xzyhsx9mqhz7djx23g6wnz62r1v9ra6xaz91yfic0n"))
(modules '((guix build utils)
(ice-9 ftw)
(srfi srfi-26)))
(snippet
#~(begin
;; XXX: 'delete-all-but' is copied from the turbovnc package.
(define (delete-all-but directory . preserve)
(define (directory? x)
(and=> (stat x #f)
(compose (cut eq? 'directory <>) stat:type)))
(with-directory-excursion directory
(let* ((pred
(negate (cut member <> (append '("." "..") preserve))))
(items (scandir "." pred)))
(for-each (lambda (item)
(if (directory? item)
(delete-file-recursively item)
(delete-file item)))
items))))
(delete-all-but "." "generate")))))
(modules '((guix build utils)))
(snippet #~(delete-all-but "." "generate"))))
(build-system go-build-system)
(arguments
(list
@@ -4817,18 +4799,9 @@ and multi-selects with a focus on user experience and aesthetics.")
(file-name (git-file-name name version))
(sha256
(base32 "083zj3yqb48li8w389iabi1b1zklbw7cwam2grvvglcqrrsj3bsf"))
(modules '((guix build utils)
(ice-9 ftw)
(srfi srfi-26)))
(modules '((guix build utils)))
(snippet
#~(begin
(define (delete-all-but directory . preserve)
(with-directory-excursion directory
(let* ((pred (negate (cut member <>
(cons* "." ".." preserve))))
(items (scandir "." pred)))
(for-each (cut delete-file-recursively <>) items))))
(delete-all-but "." "ansi")))))
#~(begin (delete-all-but "." "ansi")))))
(build-system go-build-system)
(arguments
(list
@@ -4865,14 +4838,7 @@ ECMA-48} specs.")
(ice-9 ftw)
(srfi srfi-26)))
(snippet
#~(begin
(define (delete-all-but directory . preserve)
(with-directory-excursion directory
(let* ((pred (negate (cut member <>
(cons* "." ".." preserve))))
(items (scandir "." pred)))
(for-each (cut delete-file-recursively <>) items))))
(delete-all-but "." "cellbuf")))))
#~(begin (delete-all-but "." "cellbuf")))))
(build-system go-build-system)
(arguments
(list
@@ -4930,18 +4896,8 @@ ECMA-48} specs.")
(file-name (git-file-name name version))
(sha256
(base32 "088786ak8jsgvssbb5y16z066vfq9f6078sjc7iv766knfr2i0x2"))
(modules '((guix build utils)
(ice-9 ftw)
(srfi srfi-26)))
(snippet
#~(begin
(define (delete-all-but directory . preserve)
(with-directory-excursion directory
(let* ((pred (negate (cut member <>
(cons* "." ".." preserve))))
(items (scandir "." pred)))
(for-each (cut delete-file-recursively <>) items))))
(delete-all-but "." "errors")))))
(modules '((guix build utils)))
(snippet #~(delete-all-but "." "errors"))))
(build-system go-build-system)
(arguments
(list
@@ -5093,18 +5049,9 @@ package provides an API for comparing Golden files.")
(file-name (git-file-name name version))
(sha256
(base32 "1shw55110fnn4xz80wmgr18czmiil6z1j064m90iw8c7j9llfzn5"))
(modules '((guix build utils)
(ice-9 ftw)
(srfi srfi-26)))
(modules '((guix build utils)))
(snippet
#~(begin
(define (delete-all-but directory . preserve)
(with-directory-excursion directory
(let* ((pred (negate (cut member <>
(cons* "." ".." preserve))))
(items (scandir "." pred)))
(for-each (cut delete-file-recursively <>) items))))
(delete-all-but "." "term")))))
#~(begin (delete-all-but "." "term")))))
(build-system go-build-system)
(arguments
(list
@@ -5192,21 +5139,8 @@ package provides an API for comparing Golden files.")
(file-name (git-file-name name version))
(sha256
(base32 "0blpb8vpl7sc6pb43h0730wdcwrkvnhly6qhik6wljrzn2nqz5g2"))
(modules '((guix build utils)
(ice-9 ftw)
(srfi srfi-26)))
(snippet
#~(begin
;; XXX: 'delete-all-but' is copied from the turbovnc package.
;; Consider implementing it as a reusable procedure in
;; guix/build/utils or guix/build-system/go.
(define (delete-all-but directory . preserve)
(with-directory-excursion directory
(let* ((pred (negate (cut member <>
(cons* "." ".." preserve))))
(items (scandir "." pred)))
(for-each (cut delete-file-recursively <>) items))))
(delete-all-but "." "xpty")))))
(modules '((guix build utils)))
(snippet #~(delete-all-but "." "xpty"))))
(build-system go-build-system)
(arguments
(list
@@ -6244,21 +6178,8 @@ packages.")
(file-name (git-file-name name version))
(sha256
(base32 "0afaljkkd388f6igr3f2vjnd14yr8h20fcfzglw8j5q1q7a1cvik"))
(modules '((guix build utils)
(ice-9 ftw)
(srfi srfi-26)))
(snippet
#~(begin
;; XXX: 'delete-all-but' is copied from the turbovnc package.
;; Consider implementing it as a reusable procedure in
;; guix/build/utils or guix/build-system/go.
(define (delete-all-but directory . preserve)
(with-directory-excursion directory
(let* ((pred (negate (cut member <>
(cons* "." ".." preserve))))
(items (scandir "." pred)))
(for-each (cut delete-file-recursively <>) items))))
(delete-all-but "." "pkg")))))
(modules '((guix build utils)))
(snippet #~(delete-all-but "." "pkg"))))
(build-system go-build-system)
(arguments
(list
@@ -15180,18 +15101,9 @@ Twisted's manhole library} .")
(file-name (git-file-name name version))
(sha256
(base32 "0xj782ghf0iv8r2xxmg2vrh72b02h216y4yfyi60y9z0691lrsip"))
(modules '((guix build utils)
(ice-9 ftw)
(srfi srfi-26)))
(modules '((guix build utils)))
(snippet
#~(begin
(define (delete-all-but directory . preserve)
(with-directory-excursion directory
(let* ((pred (negate (cut member <>
(cons* "." ".." preserve))))
(items (scandir "." pred)))
(for-each (cut delete-file-recursively <>) items))))
(delete-all-but "." "tools")))))
#~(begin (delete-all-but "." "tools")))))
(build-system go-build-system)
(arguments
(list
@@ -18795,18 +18707,9 @@ publishsubscribe pattern}.")
(file-name (git-file-name name version))
(sha256
(base32 "0an8ypp8v9gfxbbb71mpimb1g9labl4v7lgazcphysn6c5smgmiw"))
(modules '((guix build utils)
(ice-9 ftw)
(srfi srfi-26)))
(modules '((guix build utils)))
(snippet
#~(begin
(define (delete-all-but directory . preserve)
(with-directory-excursion directory
(let* ((pred (negate (cut member <>
(cons* "." ".." preserve))))
(items (scandir "." pred)))
(for-each (cut delete-file-recursively <>) items))))
(delete-all-but "." "atomicwriter")))))
#~(begin (delete-all-but "." "atomicwriter")))))
(build-system go-build-system)
(arguments
(list
@@ -18861,18 +18764,9 @@ https://github.com/syndtr/gocapability.")
(file-name (git-file-name name version))
(sha256
(base32 "1nh1disclgydvq7k10awzks6k8kw9cjj3q19f83ksi4b76p5l475"))
(modules '((guix build utils)
(ice-9 ftw)
(srfi srfi-26)))
(modules '((guix build utils)))
(snippet
#~(begin
(define (delete-all-but directory . preserve)
(with-directory-excursion directory
(let* ((pred (negate (cut member <>
(cons* "." ".." preserve))))
(items (scandir "." pred)))
(for-each (cut delete-file-recursively <>) items))))
(delete-all-but "." "mount")))))
#~(begin (delete-all-but "." "mount")))))
(build-system go-build-system)
(arguments
(list
@@ -29615,21 +29509,8 @@ when they'd prefer a more familiar, loosely typed API.")
(file-name (git-file-name name version))
(sha256
(base32 "05i15278swdmpif3p6g18sy0sn7rnfdl3m2rj5p30cnyb0j29vig"))
(modules '((guix build utils)
(ice-9 ftw)
(srfi srfi-26)))
(snippet
#~(begin
;; XXX: 'delete-all-but' is copied from the turbovnc package.
;; Consider implementing it as a reusable procedure in
;; guix/build/utils or guix/build-system/go.
(define (delete-all-but directory . preserve)
(with-directory-excursion directory
(let* ((pred (negate (cut member <>
(cons* "." ".." preserve))))
(items (scandir "." pred)))
(for-each (cut delete-file-recursively <>) items))))
(delete-all-but "." "exp")))))
(modules '((guix build utils)))
(snippet #~(delete-all-but "." "exp"))))
(build-system go-build-system)
(arguments
(list
@@ -31028,18 +30909,9 @@ code.")
(name "go-modernc-org-ccgo-v4")
(source (origin
(inherit (package-source go-modernc-org-ccgo-v3))
(modules '((guix build utils)
(ice-9 ftw)
(srfi srfi-26)))
(modules '((guix build utils)))
(snippet
#~(begin
(define (delete-all-but directory . preserve)
(with-directory-excursion directory
(let* ((pred (negate (cut member <>
(cons* "." ".." preserve))))
(items (scandir "." pred)))
(for-each (cut delete-file-recursively <>) items))))
(delete-all-but "." "v4")))))
#~(begin (delete-all-but "." "v4")))))
(arguments
(substitute-keyword-arguments
(package-arguments go-modernc-org-ccgo-v3)
@@ -31995,20 +31867,9 @@ unmarshaling functions based on @code{encoding/json} @code{Unmarshal()}.")
(file-name (git-file-name name version))
(sha256
(base32 "12n8ij4gisah5mvxcgq263iic61gjpxdj3ml03826zckzn7wlv46"))
(modules '((guix build utils)
(ice-9 ftw)
(srfi srfi-26)))
(modules '((guix build utils)))
(snippet
#~(begin
;; XXX: 'delete-all-but' is copied from the turbovnc package.
;; Consider implementing it as a reusable procedure in
;; guix/build/utils or guix/build-system/go.
(define (delete-all-but directory . preserve)
(with-directory-excursion directory
(let* ((pred (negate (cut member <>
(cons* "." ".." preserve))))
(items (scandir "." pred)))
(for-each (cut delete-file-recursively <>) items))))
(delete-all-but "." "cmd")
(delete-all-but "cmd" "config")))))
(build-system go-build-system)
+2 -2
View File
@@ -47,13 +47,13 @@
(define-public groff
(package
(name "groff")
(version "1.22.4")
(version "1.24.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/groff/groff-" version
".tar.gz"))
(sha256 (base32
"14q2mldnr1vx0l9lqp9v2f6iww24gj28iyh4j2211hyynx67p3p7"))))
"0w3mf9jb5j1gbw1160lr5498q4ayl5i3jpf5g8721l1yzzcbr6z7"))))
(build-system gnu-build-system)
(outputs '("out"
"doc")) ;12MiB of PS, PDF, HTML, and examples
+7 -15
View File
@@ -601,24 +601,16 @@ different data arrays similar to those available in the numdiff software.")
(file-name (git-file-name name version))
(snippet
#~(begin
(use-modules (guix build utils)
(ice-9 ftw)
(srfi srfi-26))
(use-modules (guix build utils))
;; Delete any bundled .jar files.
(for-each delete-file (find-files "." "\\.jar$"))
(define (delete-all-but directory . preserve)
(with-directory-excursion directory
(let* ((pred (negate (cut member <>
(cons* "." ".." preserve))))
(items (scandir "." pred)))
(for-each (cut delete-file-recursively <>) items))))
(delete-all-but "3rdparty"
"fastcv" ;TODO: Unbundle these
"libspng"
"libtim-vx"
"orbbecsdk"
"quirc"
"zlib-ng")))
"fastcv" ;TODO: Unbundle these
"libspng"
"libtim-vx"
"orbbecsdk"
"quirc"
"zlib-ng")))
(sha256
(base32
"15w4fqjqv5k1yw70jbjsnlgiky39mqpy05rvmm2fbyjrif4kbgkl"))))
+2 -14
View File
@@ -1362,21 +1362,9 @@ code prior to it getting merged into @code{go-cid}.")
(file-name (git-file-name name version))
(sha256
(base32 "00lwizzdfdx6kynxddal3all6q9dhwqanpkw0d0vxlwik4nkvxa5"))
(modules '((guix build utils)
(ice-9 ftw)
(srfi srfi-26)))
(modules '((guix build utils)))
(snippet
#~(begin
;; XXX: 'delete-all-but' is copied from the turbovnc package.
;; Consider to implement it as re-usable procedure in
;; guix/build/utils or guix/build-system/go.
(define (delete-all-but directory . preserve)
(with-directory-excursion directory
(let* ((pred (negate (cut member <>
(cons* "." ".." preserve))))
(items (scandir "." pred)))
(for-each (cut delete-file-recursively <>) items))))
(delete-all-but "." "ipfs")))))
#~(begin (delete-all-but "." "ipfs")))))
(build-system go-build-system)
(arguments
(list
+2 -2
View File
@@ -36,7 +36,7 @@
(define-public jemalloc
(package
(name "jemalloc")
(version "5.3.0")
(version "5.3.1")
(source (origin
(method url-fetch)
(uri (string-append
@@ -44,7 +44,7 @@
version "/jemalloc-" version ".tar.bz2"))
(sha256
(base32
"1apyxjd1ixy4g8xkr61p0ny8jiz8vyv1j0k4nxqkxpqrf4g2vf1d"))))
"14kgf0hs864hp5xxqfqh37l1d8wwg57h7wv28rffs8ig4f0bq9iq"))))
(build-system gnu-build-system)
(arguments
(list
+30 -41
View File
@@ -87,6 +87,7 @@
;;; Copyright © 2025 John Kehayias <john.kehayias@protonmail.com>
;;; Copyright © 2025 Arjan Adriaanse <arjan@adriaan.se>
;;; Copyright © 2026 Justin Veilleux <terramorpha@cock.li>
;;; Copyright © 2025 Dariqq <dariqq@posteo.net>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -3202,57 +3203,45 @@ accepted as a quirk (ie AMD Vega 10).")
(define-public linux-pam
(package
(name "linux-pam")
(version "1.5.2")
(version "1.7.2")
(source
(origin
(method url-fetch)
(uri (string-append
"https://github.com/linux-pam/linux-pam/releases/download/v"
version "/Linux-PAM-" version ".tar.xz"))
(method git-fetch)
(uri (git-reference
(url "https://github.com/linux-pam/linux-pam")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0kgrsj2scv5mx6w925h9hxf11jnqqs9z8s22aw94b90xm4qp3v74"))
"1z5apric696zsci28c7651spvdll0zrpfm9z574gcjf45mp22gmi"))
(patches (search-patches "linux-pam-unix_chkpwd.patch"
"linux-pam-no-setfsuid.patch"))))
(build-system gnu-build-system)
(build-system meson-build-system)
(outputs '("out" "doc")) ;; 0.8 MiB of html
(inputs (list libxcrypt))
(native-inputs
(list flex
;; TODO: optional dependencies
;; ("cracklib" ,cracklib)
))
(list gettext-minimal
flex bison
;; manpages
libxslt
libxml2
docbook-xml
docbook-xsl))
(arguments
(list
;; Most users, such as `shadow', expect the headers to be under
;; `security'.
#:configure-flags #~(list (string-append "--includedir="
(assoc-ref %outputs "out")
"/include/security")
;; explicit libdir for pkgconfig files
;; drop with 1.5.3, which fixes
;; https://github.com/linux-pam/linux-pam/issues/466
(string-append "--libdir="
(assoc-ref %outputs "out")
"/lib")
;; XXX: <rpc/rpc.h> is missing from glibc when
;; cross-compiling, so we have to disable NIS
;; support altogether.
#$@(if (%current-target-system)
#~("--disable-nis")
#~()))
#:phases (if (target-hurd?)
#~(modify-phases %standard-phases
(add-after 'unpack 'skip-pam-limits
(lambda _
;; 'pam_limits.c' uses <sys/prctl.h>, which is
;; Linux-specific. Skip it on GNU/Hurd.
(substitute* "modules/Makefile.in"
(("pam_limits") "")))))
#~%standard-phases)
#:configure-flags
#~(list
;; lastlog is deprecated since 1.5.3
"-Dpam_lastlog=enabled"
(string-append "-Dvendordir=" #$output "/share/pam")
(string-append "-Ddocbook-rng="
#$(let ((docbook-xml (this-package-native-input
"docbook-xml")))
(file-append docbook-xml
"/xml/docbook/"
(package-version docbook-xml)
"/rng/docbookxi.rng")))
(string-append "-Dhtmldir=" #$output:doc "/share/doc/" #$name "/html"))
;; XXX: Tests won't run in chroot, presumably because /etc/pam.d
;; isn't available.
#:tests? #f))
+4 -14
View File
@@ -780,20 +780,10 @@ operating systems.")
(file-name (git-file-name name version))
(sha256
(base32 "1sg6ifabci7xyp3zds1w906vx6jsmyjlfr6bqld7m7hj07by9ndd"))
(modules '((guix build utils)
(ice-9 ftw)
(srfi srfi-26)))
(snippet
#~(begin
(define (delete-all-but directory . preserve)
(with-directory-excursion directory
(let* ((pred (negate (cut member <>
(cons* "." ".." preserve))))
(items (scandir "." pred)))
(for-each (cut delete-file-recursively <>) items))))
(delete-all-but "autosetup"
"mutt-gettext.tcl"
"mutt-iconv.tcl")))))
(modules '((guix build utils)))
(snippet #~(delete-all-but "autosetup"
"mutt-gettext.tcl"
"mutt-iconv.tcl"))))
(build-system gnu-build-system)
(inputs
(list cyrus-sasl
+1 -10
View File
@@ -428,18 +428,9 @@ software vendors, application developers and computer science researchers.")
(uri (string-append "https://www.open-mpi.org/software/ompi/v"
(version-major+minor version)
"/downloads/openmpi-" version ".tar.bz2"))
(modules '((guix build utils)
(ice-9 ftw)
(srfi srfi-26)))
(modules '((guix build utils)))
(snippet
'(begin
;; XXX: 'delete-all-but' is copied from the turbovnc package.
(define (delete-all-but directory . preserve)
(with-directory-excursion directory
(let* ((pred (negate (cut member <>
(cons* "." ".." preserve))))
(items (scandir "." pred)))
(for-each (cut delete-file-recursively <>) items))))
;; Delete as many bundled libraries as permitted by the build
;; system.
(delete-all-but "3rd-party" "treematch" "Makefile.in" "Makefile.am")
+1 -5
View File
@@ -165,11 +165,7 @@ from the protocol files.")
(arguments
`(#:configure-flags '("--disable-static")))
(native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)
("gettext" ,gettext-minimal)
("libtool" ,libtool)
("pkg-config" ,pkg-config)))
(list autoconf automake gettext-minimal libtool pkg-config))
(inputs
(list libtirpc))
(synopsis "Public client interface for NIS(YP) and NIS+")
@@ -2,8 +2,14 @@ unix_chkpwd is designed to have a suid bit, but it's not possible to set it
for files in the store. This patch tells unix_pam.so to look for
unix_chkpwd in setuid program directory on Guix System.
--- a/modules/pam_unix/Makefile.in
+++ b/modules/pam_unix/Makefile.in
@@ -651,1 +651,1 @@
- -DCHKPWD_HELPER=\"$(sbindir)/unix_chkpwd\" \
+ -DCHKPWD_HELPER=\"/run/setuid-programs/unix_chkpwd\" \
--- a/modules/module-meson.build
+++ b/modules/module-meson.build
@@ -114,7 +114,7 @@ if module == 'pam_unix'
if enable_nis
pam_module_src += ['yppasswd_xdr.c']
endif
- pam_module_c_args += ['-DCHKPWD_HELPER="@0@"'.format(sbindir / 'unix_chkpwd'),
+ pam_module_c_args += ['-DCHKPWD_HELPER="@0@"'.format('/run/privileged/bin' / 'unix_chkpwd'),
'-DUPDATE_HELPER="@0@"'.format(sbindir / 'unix_update')]
pam_module_deps += [libcrypt, libselinux, libtirpc, libnsl]
endif
+3 -18
View File
@@ -108,24 +108,9 @@ data in motion, or as a file format for data at rest.")
(uri (git-reference
(url "https://github.com/protocolbuffers/protobuf/")
(commit (string-append "v" version))))
(modules '((guix build utils)
(ice-9 ftw)
(srfi srfi-26)))
(snippet
#~(begin
;; XXX: 'delete-all-but' is copied from the turbovnc package.
(define (delete-all-but directory . preserve)
(define (directory? x)
(and=> (stat x #f)
(compose (cut eq? 'directory <>) stat:type)))
(with-directory-excursion directory
(let* ((pred
(negate (cut member <> (append '("." "..") preserve))))
(items (scandir "." pred)))
(for-each delete-file-recursively items))))
;; "utf8_range" development now takes place in main protobuf
;; repository.
(delete-all-but "third_party" "utf8_range")))
(modules '((guix build utils)))
;; "utf8_range" development now takes place in main protobuf repository.
(snippet #~(delete-all-but "third_party" "utf8_range"))
(file-name (git-file-name name version))
(sha256
(base32 "1rdxm75bqwjj4qd3hz4vlydra6bw5dq391kwln2q0pjfx9gbrjhk"))))
+2 -2
View File
@@ -893,7 +893,7 @@ A @code{andglob} program is also provided along with s.")
(define-public oksh
(package
(name "oksh")
(version "7.5")
(version "7.8")
(source
(origin
(method url-fetch)
@@ -902,7 +902,7 @@ A @code{andglob} program is also provided along with s.")
version "/oksh-" version ".tar.gz"))
(sha256
(base32
"0pgdxvy8jgydsyzk7vcc93pm09bihqvrn3i35gz1ncg9z31rbf20"))))
"0l59x9mm6nbixcpz3zf3iplqili2gyw8l382rj89b0iv32hxac1v"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; there are no tests available
+1 -9
View File
@@ -46,19 +46,11 @@
(file-name (git-file-name name version))
(sha256
(base32 "17iqvqs7w3z5c4acnjc6mixqkqz4rff2c7flfpnlwgfjgqy1a2zw"))
(modules '((guix build utils)
(ice-9 ftw)
(srfi srfi-26)))
(modules '((guix build utils)))
(snippet
;; XXX: Keep just some portion with valulable data and no license
;; issues.
#~(begin
(define (delete-all-but directory . preserve)
(with-directory-excursion directory
(let* ((pred (negate (cut member <>
(cons* "." ".." preserve))))
(items (scandir "." pred)))
(for-each (cut delete-file-recursively <>) items))))
(delete-all-but "."
"allsky"
"coordinates"
+6 -6
View File
@@ -191,7 +191,7 @@ libenca and several charset conversion libraries and tools.")
(hidden-package
(package
(name "utf8proc-bootstrap")
(version "2.10.0")
(version "2.11.3")
(source
(origin
(method git-fetch)
@@ -200,7 +200,7 @@ libenca and several charset conversion libraries and tools.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1n1k67x39sk8xnza4w1xkbgbvgb1g7w2a7j2qrqzqaw1lyilqsy2"))))
(base32 "1ssix4zf3lac1afzlw2gbfg3n52gmggip8lv224gywqf3zyvyp8c"))))
(build-system gnu-build-system)
(arguments
(list #:tests? #f ;To break dependency cycle.
@@ -223,7 +223,7 @@ case-folding, and other operations for data in the UTF-8 encoding.")
(inherit utf8proc-bootstrap)
(name "utf8proc")
(native-inputs
(let ((UNICODE_VERSION "16.0.0")) ; defined in data/Makefile
(let ((UNICODE_VERSION "17.0.0")) ; defined in data/Makefile
;; Only if the tests will be run should these be added.
(if (and (%current-system)
(supported-package? julia))
@@ -235,7 +235,7 @@ case-folding, and other operations for data in the UTF-8 encoding.")
UNICODE_VERSION "/ucd/NormalizationTest.txt"))
(sha256
(base32
"1cffwlxgn6sawxb627xqaw3shnnfxq0v7cbgsld5w1z7aca9f4fq")))
"1nw7i89q42r0plwlc8qj6qm18brk23hc0jf800cp86km63azy6ah")))
(origin
(method url-fetch)
(uri (string-append
@@ -243,7 +243,7 @@ case-folding, and other operations for data in the UTF-8 encoding.")
UNICODE_VERSION "/ucd/auxiliary/GraphemeBreakTest.txt"))
(sha256
(base32
"1d9w6vdfxakjpp38qjvhgvbl2qx0zv5655ph54dhdb3hs9a96azf")))
"1v4k2x52bzwgqxw89hdf3wdgwm8q3ianmfrya37bl699qp939lg2")))
(origin
(method url-fetch)
(uri (string-append
@@ -251,7 +251,7 @@ case-folding, and other operations for data in the UTF-8 encoding.")
UNICODE_VERSION "/ucd/DerivedCoreProperties.txt"))
(sha256
(base32
"1gfsq4vdmzi803i2s8ih7mm4fgs907kvkg88kvv9fi4my9hm3lrr")))
"021clafsjmjblsxcszp0dpxy2phwhbmyghfmxym2yj2w378zxir4")))
;; For tests.
julia
perl
+25 -27
View File
@@ -1469,10 +1469,10 @@ designed to encode video or images into an H.265 / HEVC encoded bitstream.")
(native-inputs
(list pkg-config nasm))
(propagated-inputs
`(("freetype" ,freetype)
("fribidi" ,fribidi)
("fontconfig" ,fontconfig)
("harfbuzz" ,harfbuzz)))
(list freetype
fribidi
fontconfig
harfbuzz))
(home-page "https://github.com/libass/libass")
(synopsis "Subtitle rendering library for the ASS/SSA format")
(description "libass is a subtitle rendering library for the
@@ -5194,14 +5194,14 @@ specifications.")
(define-public libaacs
(package
(name "libaacs")
(version "0.11.0")
(version "0.11.1")
(source
(origin
(method url-fetch)
(uri (string-append "https://ftp.videolan.org/pub/videolan/libaacs/"
version "/libaacs-" version ".tar.bz2"))
(sha256
(base32 "11skjqjlldmbjkyxdcz4fmcn6y4p95r1xagbcnjy4ndnzf0l723d"))))
(base32 "0f8ax9dp49mrm1484bl2df659b34xyrjmngzmvvpg2n9wkms12m8"))))
(inputs
(list libgcrypt))
(native-inputs
@@ -6250,32 +6250,30 @@ spec for MP4), which can be obtained from the ISO or found online.")
(license license:expat)))
(define-public vidstab
(let ((commit "aeabc8daa7904f9edf7441a11f293965a5ef53b8")
(revision "0"))
(package
(name "vidstab")
(version (git-version "1.1.0" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/georgmartius/vid.stab")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"042iy0f3khwzr68djzvqgn301sy21ljvkf52rnc2c73q7ircnzzn"))))
(build-system cmake-build-system)
(arguments
'(#:tests? #f)) ; tests are not run as part of standard build process
(home-page "http://public.hronopik.de/vid.stab/")
(synopsis "Video stabilization library")
(description "Vidstab is a video stabilization library which can be used
(package
(name "vidstab")
(version "1.1.1")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/georgmartius/vid.stab")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"19k822bwsnw58ikbfh4fhh97zpn89ji9k1gdvh9r2ljy82g52md7"))))
(build-system cmake-build-system)
(arguments
'(#:tests? #f)) ; tests are not run as part of standard build process
(home-page "http://public.hronopik.de/vid.stab/")
(synopsis "Video stabilization library")
(description "Vidstab is a video stabilization library which can be used
with FFmpeg. A video acquired using a hand-held camera or a camera mounted on a
vehicle typically suffers from undesirable shakes and jitters. Activities such
as surfing, skiing, riding and walking while shooting videos are especially
prone to erratic camera shakes. Vidstab targets these video contents to help
create smoother and stable videos.")
(license license:gpl2+))))
(license license:gpl2+)))
(define-public libopenshot
(package
+1 -9
View File
@@ -183,9 +183,7 @@ RDP, VNC, SPICE, NX, XDMCP, SSH and EXEC network protocols are supported.")
(uri (git-reference
(url "https://github.com/TurboVNC/turbovnc")
(commit version)))
(modules '((guix build utils)
(ice-9 ftw)
(srfi srfi-26)))
(modules '((guix build utils)))
(snippet
#~(begin
;; There are a few bundled Java libraries, such as jsch and jzlib,
@@ -193,12 +191,6 @@ RDP, VNC, SPICE, NX, XDMCP, SSH and EXEC network protocols are supported.")
;; bundled under java/org. These are used by the 'vncviewer'
;; program. The jsch copy is modified and integrates changes from
;; https://github.com/mwiede/jsch, so cannot easily be un-bundled.
(define (delete-all-but directory . preserve)
(with-directory-excursion directory
(let* ((pred (negate (cut member <>
(cons* "." ".." preserve))))
(items (scandir "." pred)))
(for-each (cut delete-file-recursively <>) items))))
;; d3des, rfb (headers) and turbojpeg-jni are small and not
;; packaged in Guix, so preserve them.
+5 -5
View File
@@ -75,7 +75,7 @@
;;; Copyright © 2025 Remco van 't Veer <remco@remworks.net>"
;;; Copyright © 2025 Daniel Khodabakhsh <d@niel.khodabakh.sh>
;;; Copyright © 2025 Josep Bigorra <jjbigorra@gmail.com>
;;; Copyright © 2025 Ashish SHUKLA <ashish.is@lostca.se>
;;; Copyright © 2025, 2026 Ashish SHUKLA <ashish.is@lostca.se>
;;; Copyright © 2025 Philippe Swartvagher <phil.swart@gmx.fr>
;;; Copyright © 2025 pinoaffe <pinoaffe@gmail.com>
;;; Copyright © 2025, 2026 gemmaro <gemmaro.dev@gmail.com>
@@ -1472,7 +1472,7 @@ used to train large language models, and poisoning the collected data.")
(define-public jansson
(package
(name "jansson")
(version "2.14")
(version "2.15.0")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/akheron/jansson"
@@ -1480,7 +1480,7 @@ used to train large language models, and poisoning the collected data.")
"/jansson-" version ".tar.bz2"))
(sha256
(base32
"1fdgji964mrrz19glx0zh91asji542fvybymvzk6rrbagkr5dagv"))))
"0m49glsr5v376jpyj2y0xyr11703pr4bfgipz5jk2dq0a1vcgsm7"))))
(build-system gnu-build-system)
(arguments
(list
@@ -9041,7 +9041,7 @@ derivation by David Revoy from the original MonsterID by Andreas Gohr.")
(define-public nghttp2
(package
(name "nghttp2")
(version "1.58.0")
(version "1.68.1")
(source
(origin
(method url-fetch)
@@ -9050,7 +9050,7 @@ derivation by David Revoy from the original MonsterID by Andreas Gohr.")
"nghttp2-" version ".tar.xz"))
(sha256
(base32
"1q4ps8acr7nyia7mf2z11m0yh3fn1imhyv855j3xjbx91l2a6s2a"))))
"1cph2j688zxxxl3944g5grjma15qbv4b6z252ichsn7ilyq7mgba"))))
(build-system gnu-build-system)
(outputs (list "out"
"lib")) ; only libnghttp2
+1 -2
View File
@@ -1480,8 +1480,7 @@ treat it as part of their software base when porting.")
(inputs
(list libxt xorgproto libxext))
(native-inputs
`(("gettext" ,gettext-minimal)
("pkg-config" ,pkg-config)))
(list gettext-minimal pkg-config))
(home-page "https://www.x.org/wiki/")
(synopsis "Xorg XPM library")
(description "XPM (X Pixmap) image file format library.")
+9
View File
@@ -77,6 +77,7 @@
make-file-writable
copy-recursively
delete-file-recursively
delete-all-but
file-name-predicate
find-files
false-if-file-not-found
@@ -522,6 +523,14 @@ errors."
;; Don't follow symlinks.
lstat)))
(define (delete-all-but directory . preserve)
"Delete DIRECTORY recursively except for the files in PRESERVE immediately
found under it."
(with-directory-excursion directory
(let* ((pred (negate (cut member <> (cons* "." ".." preserve))))
(items (scandir "." pred)))
(for-each (cut delete-file-recursively <>) items))))
(define (file-name-predicate regexp)
"Return a predicate that returns true when passed a file name whose base
name matches REGEXP."