aboutsummaryrefslogtreecommitdiff
path: root/gnu
ModeNameSize
-rw-r--r--artwork.scm1605logplain
-rw-r--r--bootloader.scm15975logplain
d---------bootloader157logplain
d---------build805logplain
-rw-r--r--ci.scm24121logplain
-rw-r--r--home.scm4402logplain
d---------home75logplain
-rw-r--r--image.scm4048logplain
-rw-r--r--installer.scm19358logplain
d---------installer678logplain
-rw-r--r--local.mk94957logplain
-rw-r--r--machine.scm4858logplain
d---------machine80logplain
-rw-r--r--packages.scm22590logplain
d---------packages20855logplain
-rw-r--r--platform.scm1403logplain
d---------platforms71logplain
-rw-r--r--services.scm47628logplain
d---------services2033logplain
-rw-r--r--system.scm63762logplain
d---------system695logplain
-rw-r--r--tests.scm12073logplain
d---------tests1185logplain
generated by cgit
"-Duse_mt32emu=false"))) ; mt32emu diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 2d24e9f047..7e8678e027 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -35,7 +35,6 @@ (define-module (gnu packages fontutils) #:use-module (gnu packages) #:use-module (gnu packages autotools) #:use-module (gnu packages bison) - #:use-module (gnu packages build-tools) ;for meson-0.55 #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages datastructures) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index eea625130a..f768d7b103 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1173,7 +1173,7 @@ (define system ,(or (%current-target-system) ("automake" ,automake) ("cmake" ,cmake) ;requires cmake >= 3.17 ("git" ,git-minimal) - ("meson" ,meson-0.55) + ("meson" ,meson) ("ninja",ninja) ("pkg-config" ,pkg-config) ("python-bottle" ,python-bottle) diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 785f05a8c4..01b8f7a1e2 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -59,7 +59,6 @@ (define-module (gnu packages terminals) #:use-module (guix utils) #:use-module (gnu packages) #:use-module (gnu packages autotools) - #:use-module (gnu packages build-tools) ;for meson-0.55 #:use-module (gnu packages check) #:use-module (gnu packages cmake) #:use-module (gnu packages compression) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index acdee6f689..5e173484de 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -81,7 +81,7 @@ (define-module (gnu packages wm) #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (gnu packages bison) - #:use-module (gnu packages build-tools) ;for meson-0.55 + #:use-module (gnu packages build-tools) #:use-module (gnu packages calendar) #:use-module (gnu packages datastructures) #:use-module (gnu packages docbook) -- cgit v1.2.3 From 6214743aa83dafacf4ce9377a79c7bae4cbc0b05 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Tue, 12 Oct 2021 20:27:55 +0100 Subject: gnu: guix-build-coordinator: Update to 0-35.a4d0ec6. * gnu/packages/package-management.scm (guix-build-coordinator): Update to 0-35.a4d0ec6. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/package-management.scm') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index bedbe06b51..149b05a425 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1187,8 +1187,8 @@ (define-public gwl (license (list license:gpl3+ license:agpl3+ license:silofl1.1)))) (define-public guix-build-coordinator - (let ((commit "76d129dc19cc0e14441ae3a74bbc44e3be570b21") - (revision "34")) + (let ((commit "a4d0ec6bc564bbe98d3e6c03be41de16edbda928") + (revision "35")) (package (name "guix-build-coordinator") (version (git-version "0" revision commit)) @@ -1199,7 +1199,7 @@ (define-public guix-build-coordinator (commit commit))) (sha256 (base32 - "1f624vlk58cznx4383vkhkw61lplv25nqy3qhclsawbm5bih7wcj")) + "0qa7qkskp9xzhyl0fgbm98f8apy8cn2yc9gpxhw0dfc9bkbs1pb9")) (file-name (string-append name "-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From b93c10259c10c780744180b616eca1852f1b73c5 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 14 Oct 2021 18:44:42 +0200 Subject: gnu: guix: Update to c3c5028. * gnu/packages/package-management.scm (guix): Update to c3c5028. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/package-management.scm') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 149b05a425..994fe6210c 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -142,8 +142,8 @@ (define-public guix ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.3.0") - (commit "f743f2046be2c5a338ab871ae8666d8f6de7440b") - (revision 9)) + (commit "c3c502896b1454b345ee9f17d20063853652a35a") + (revision 10)) (package (name "guix") @@ -159,7 +159,7 @@ (define-public guix (commit commit))) (sha256 (base32 - "0sk8vhvivh3r4jws2gyq02wdvwz2qds53b0vc4k04dx8vwidmid9")) + "037nlr5z8qmq2zp0slcg5lyhcdp7v6vxl1f36wkqrw9xzgq8k6kf")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 64e58296530df8cf7a106fa5797789bc8daf1243 Mon Sep 17 00:00:00 2001 From: jgart via Guix-patches via Date: Sun, 17 Oct 2021 08:28:42 -0400 Subject: gnu: nix: Update to 2.3.16. * gnu/packages/package-management.scm (nix): Update to 2.3.16. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/package-management.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/package-management.scm') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 994fe6210c..b33e08baf2 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -596,14 +596,14 @@ (define-public current-guix (define-public nix (package (name "nix") - (version "2.3.13") + (version "2.3.16") (source (origin (method url-fetch) (uri (string-append "https://releases.nixos.org/nix/nix-" version "/nix-" version ".tar.xz")) (sha256 (base32 - "0631qk2lgd76y6g2z45wy6lcpv647r2a08jd2dagzzpwniy68d3h")))) + "1g5aqavr6i3c1xln53w1pdh1kvlxrpnknb105m4jbd85kyv83rky")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--sysconfdir=/etc" "--enable-gc") -- cgit v1.2.3 From 73a795e77cc422e569c7e96057be43cdf1b909bf Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Fri, 8 Oct 2021 14:17:38 -0400 Subject: gnu: flatpak: Update to 1.12.1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/package-management.scm (flatpak): Update to 1.12.1. Signed-off-by: Ludovic Courtès --- gnu/packages/package-management.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/package-management.scm') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index b33e08baf2..6530978c34 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1523,14 +1523,14 @@ (define-public libostree (define-public flatpak (package (name "flatpak") - (version "1.10.2") + (version "1.12.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/flatpak/flatpak/releases/download/" version "/flatpak-" version ".tar.xz")) (sha256 - (base32 "1r6xw7r3ir2vaa30n3mily6m7d51cf4qv22fkqlzzy3js0wjf5fv")))) + (base32 "0my82ijg1ipa4lwrvh88jlrxbabfqfz2ssfb8cn6k0pfgz53p293")))) ;; Wrap 'flatpak' so that GIO_EXTRA_MODULES is set, thereby allowing GIO to ;; find the TLS backend in glib-networking. -- cgit v1.2.3 From d407c107f363c36feecbf1d55735479add59d799 Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Fri, 8 Oct 2021 14:54:46 -0400 Subject: gnu: flatpak: Fix certificate error from p11-kit. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/package-management.scm (flatpak)[inputs]: Add p11-kit-next. [arguments]: Add new 'p11-kit-fix phase to patch source to use p11-kit-next input instead of an implicit p11-kit from dependencies. Signed-off-by: Ludovic Courtès --- gnu/packages/package-management.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'gnu/packages/package-management.scm') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 6530978c34..e8f8ee1ce7 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1565,6 +1565,16 @@ (define-public flatpak (("/bin/kill") (which "kill")) (("/usr/bin/python3") (which "python3"))) #t)) + (add-after 'unpack 'p11-kit-fix + (lambda* (#:key inputs #:allow-other-keys) + (let ((p11-path (string-append (assoc-ref inputs "p11-kit-next") + "/bin/p11-kit"))) + (substitute* "session-helper/flatpak-session-helper.c" + (("\"p11-kit\",") + (string-append "\"" p11-path "\",")) + (("if \\(g_find_program_in_path \\(\"p11-kit\"\\)\\)") + (string-append "if (g_find_program_in_path (\"" + p11-path "\"))")))))) ;; Many tests fail for unknown reasons, so we just run a few basic ;; tests. (replace 'check @@ -1603,6 +1613,7 @@ (define-public flatpak ("libsoup" ,libsoup) ("libxau" ,libxau) ("libxml2" ,libxml2) + ("p11-kit-next" ,p11-kit-next) ("util-linux" ,util-linux) ("xdg-dbus-proxy" ,xdg-dbus-proxy))) (home-page "https://flatpak.org") -- cgit v1.2.3 From 9c4244cc73db4d5c3adf6f8342f6b08b39dd3628 Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Fri, 8 Oct 2021 15:07:57 -0400 Subject: gnu: flatpak: Add patch to fix paths. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/package-management.scm (flatpak)[source]: Add patch. * gnu/packages/patches/flatpak-fix-path.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. Signed-off-by: Ludovic Courtès --- gnu/local.mk | 1 + gnu/packages/package-management.scm | 3 ++- gnu/packages/patches/flatpak-fix-path.patch | 29 +++++++++++++++++++++++++++++ 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/flatpak-fix-path.patch (limited to 'gnu/packages/package-management.scm') diff --git a/gnu/local.mk b/gnu/local.mk index cfd608fa01..28e8c1966a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1063,6 +1063,7 @@ dist_patch_DATA = \ %D%/packages/patches/findutils-localstatedir.patch \ %D%/packages/patches/findutils-test-rwlock-threads.patch \ %D%/packages/patches/flann-cmake-3.11.patch \ + %D%/packages/patches/flatpak-fix-path.patch \ %D%/packages/patches/foobillard++-pkg-config.patch \ %D%/packages/patches/foomatic-filters-CVE-2015-8327.patch \ %D%/packages/patches/foomatic-filters-CVE-2015-8560.patch \ diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index e8f8ee1ce7..7d04fd7d3e 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1530,7 +1530,8 @@ (define-public flatpak (uri (string-append "https://github.com/flatpak/flatpak/releases/download/" version "/flatpak-" version ".tar.xz")) (sha256 - (base32 "0my82ijg1ipa4lwrvh88jlrxbabfqfz2ssfb8cn6k0pfgz53p293")))) + (base32 "0my82ijg1ipa4lwrvh88jlrxbabfqfz2ssfb8cn6k0pfgz53p293")) + (patches (search-patches "flatpak-fix-path.patch")))) ;; Wrap 'flatpak' so that GIO_EXTRA_MODULES is set, thereby allowing GIO to ;; find the TLS backend in glib-networking. diff --git a/gnu/packages/patches/flatpak-fix-path.patch b/gnu/packages/patches/flatpak-fix-path.patch new file mode 100644 index 0000000000..e87a08a7fe --- /dev/null +++ b/gnu/packages/patches/flatpak-fix-path.patch @@ -0,0 +1,29 @@ +Flatpak writes files for installed applications with the full Flatpak (store) path. This patch makes it write just "flatpak", using Flatpak from PATH. This is similar to the NixOS [0] patch, updated for Flatpak 1.12.1 + +[0] https://github.com/NixOS/nixpkgs/blob/bf4167861d0f864b0fc457778d54feb4a2675ea2/pkgs/development/libraries/flatpak/use-flatpak-from-path.patch + +diff --git a/common/flatpak-dir.c b/common/flatpak-dir.c +index 80ff5e5f..0c111c31 100644 +--- a/common/flatpak-dir.c ++++ b/common/flatpak-dir.c +@@ -7134,8 +7134,7 @@ export_desktop_file (const char *app, + flatpak = FLATPAK_BINDIR "/flatpak"; + + g_string_append_printf (new_exec, +- "%s run --branch=%s --arch=%s", +- flatpak, ++ "flatpak run --branch=%s --arch=%s", + escaped_branch, + escaped_arch); + +@@ -8467,8 +8466,8 @@ flatpak_dir_deploy (FlatpakDir *self, + if ((flatpak = g_getenv ("FLATPAK_BINARY")) == NULL) + flatpak = FLATPAK_BINDIR "/flatpak"; + +- bin_data = g_strdup_printf ("#!/bin/sh\nexec %s run --branch=%s --arch=%s %s \"$@\"\n", +- flatpak, escaped_branch, escaped_arch, escaped_app); ++ bin_data = g_strdup_printf ("#!/bin/sh\nexec flatpak run --branch=%s --arch=%s %s \"$@\"\n", ++ escaped_branch, escaped_arch, escaped_app); + if (!g_file_replace_contents (wrapper, bin_data, strlen (bin_data), NULL, FALSE, + G_FILE_CREATE_REPLACE_DESTINATION, NULL, cancellable, error)) + return FALSE; -- cgit v1.2.3 From 97d8d2ad02dda331fa9dbef4ac2b01ebfd3815b2 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 28 Oct 2021 00:14:29 +0200 Subject: gnu: guix: Update to 014f1b6. * gnu/packages/package-management.scm (guix): Update to 014f1b6. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/package-management.scm') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 7d04fd7d3e..3c9d4da941 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -142,8 +142,8 @@ (define-public guix ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.3.0") - (commit "c3c502896b1454b345ee9f17d20063853652a35a") - (revision 10)) + (commit "014f1b607f1d88a8e733017afaca006545b7d99b") + (revision 11)) (package (name "guix") @@ -159,7 +159,7 @@ (define-public guix (commit commit))) (sha256 (base32 - "037nlr5z8qmq2zp0slcg5lyhcdp7v6vxl1f36wkqrw9xzgq8k6kf")) + "0mmq0ypkxj6dc1r9j1mdgih87h6fc0mk05hp481cjp8shdc1w6gw")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 9b14b26f0a04175ff33950a2ae4410149e52c470 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 8 Nov 2021 20:56:21 +0100 Subject: gnu: packages: Remove last year's deprecations. * gnu/packages/admin.scm (guile3.0-shepherd): Remove variable. * gnu/packages/benchmark.scm (imb-openmpi): Likewise. * gnu/packages/boost.scm (boost-with-python3): Likewise. * gnu/packages/pep.scm (python-pep-adapter)[inputs]: Adjust accordingly. * gnu/packages/cpp.scm (nlohmann-json-cpp): Likewise. * gnu/packages/games.scm (openrct2)[inputs]: Adjust accordingly. * gnu/packages/cups.scm (escpr): Likewise. * gnu/packages/django.scm (python-django-jsonfield): Likewise. * gnu/packages/emacs-xyz.scm (emacs-modus-operandi-theme) (emacs-modus-vivendi-theme): Likewise. * gnu/packages/engineering.scm (kicad-i18l): Likewise. * gnu/packages/enlightenment.scm (enlightenment-wayland): Likewise. * gnu/packages/firmware.scm (opensbi-qemu-virt, opensbi-qemu-sifive-u): Likewise. * gnu/packages/fonts.scm (font-gnu-freefont-ttf, font-open-dyslexic): Likewise. * gnu/packages/game-development.scm (guile3.0-chickadee) (python-sge-pygame): Likewise. * gnu/packages/games.scm (retux)[inputs]: Adjust accordingly. * gnu/packages/gnome-xyz.scm (numix-theme): Likewise. * gnu/packages/gnupg.scm (guile3.0-gcrypt): Likewise. * gnu/packages/gstreamer.scm (gst-transcoder): Likewise. * gnu/packages/gtk.scm (guile3.0-cairo, guile3.0-present, guile3.0-rsvg): Likewise. * gnu/packages/guile-xyz.scm (guile3.0-colorized, guile3.0-commonmark) (guile3.0-config, guile3.0-email, guile3.0-fibers, guile3.0-gi) (guile3.0-hall, guile3.0-hashing, guile3.0-haunt, guile3.0-ics) (guile3.0-irregex, guile3.0-lib, guile3.0-mcron, guile3.0-minikanren) (guile3.0-ncurses, guile3.0-ncurses/gpm, guile3.0-newt, guile3.0-parted) (guile3.0-pfds, guile3.0-picture-language, guile3.0-semver) (guile3.0-simple-zmq, guile3.0-squee, guile3.0-syntax-highlight) (guile3.0-websocket, guile3.0-wisp, guile3.0-xapian): Likewise. * gnu/packages/guile.scm (define-deprecated-guile3.0-package) (guile3.0-json, guile3.0-gdbm-ffi, guile3.0-sqlite3) (guile3.0-bytestructures, guile3.0-git): Likewise. * gnu/packages/haskell-apps.scm (ghc-stylish-haskell): Likewise. * gnu/packages/linux.scm (linux-libre-arm-veyron): Likewise. * gnu/packages/mail.scm (guile3.0-mailutils): Likewise. * gnu/packages/monitoring.scm (python2-graphite-web): Likewise. * gnu/packages/package-management.scm (guile3.0-guix): Likewise. * gnu/packages/package-management.scm (python-conda): Likewise. * gnu/packages/phabricator.scm (libphutil): Likewise. * gnu/packages/plotutils.scm (guile3.0-charting): Likewise. * gnu/packages/python-xyz.scm (python2-smmap2, python-glances) (python-smmap2): Likewise. * gnu/packages/shells.scm (oil-shell): Likewise. * gnu/packages/sqlite.scm (sqlite-with-column-metadata): Likewise. * gnu/packages/ssh.scm (guile3.0-ssh): Likewise. * gnu/packages/terminals.scm (et): Likewise. * gnu/packages/tls.scm (guile3.0-gnutls): Likewise. * gnu/packages/vlang.scm (v): Likewise. * gnu/packages/vpn.scm (wireguard): Likewise. * gnu/packages/web-browsers.scm (next, sbcl-next): Likewise. * gnu/packages/xorg.scm (transset-df): Likewise. --- gnu/packages/admin.scm | 3 -- gnu/packages/benchmark.scm | 3 -- gnu/packages/boost.scm | 3 -- gnu/packages/cpp.scm | 3 -- gnu/packages/cups.scm | 3 -- gnu/packages/django.scm | 4 -- gnu/packages/emacs-xyz.scm | 6 --- gnu/packages/engineering.scm | 3 -- gnu/packages/enlightenment.scm | 3 -- gnu/packages/firmware.scm | 8 ---- gnu/packages/fonts.scm | 6 --- gnu/packages/game-development.scm | 6 --- gnu/packages/games.scm | 4 +- gnu/packages/gnome-xyz.scm | 3 -- gnu/packages/gnupg.scm | 3 -- gnu/packages/gstreamer.scm | 7 --- gnu/packages/gtk.scm | 9 ---- gnu/packages/guile-xyz.scm | 86 ------------------------------------- gnu/packages/guile.scm | 44 ------------------- gnu/packages/haskell-apps.scm | 3 -- gnu/packages/linux.scm | 3 -- gnu/packages/mail.scm | 3 -- gnu/packages/monitoring.scm | 3 -- gnu/packages/package-management.scm | 6 --- gnu/packages/pep.scm | 2 +- gnu/packages/phabricator.scm | 3 -- gnu/packages/plotutils.scm | 3 -- gnu/packages/python-xyz.scm | 9 ---- gnu/packages/shells.scm | 3 -- gnu/packages/sqlite.scm | 5 --- gnu/packages/ssh.scm | 3 -- gnu/packages/terminals.scm | 3 -- gnu/packages/tls.scm | 3 -- gnu/packages/vlang.scm | 4 -- gnu/packages/vpn.scm | 3 -- gnu/packages/web-browsers.scm | 6 --- gnu/packages/xorg.scm | 3 -- 37 files changed, 3 insertions(+), 272 deletions(-) (limited to 'gnu/packages/package-management.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 7e560834b4..d24b068bd7 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -313,9 +313,6 @@ (define-public guile2.2-shepherd `(("guile" ,guile-2.2) ("guile2.2-readline" ,guile2.2-readline))))) -(define-public guile3.0-shepherd - (deprecated-package "guile3.0-shepherd" shepherd)) - (define-public guile2.0-shepherd (package (inherit shepherd) diff --git a/gnu/packages/benchmark.scm b/gnu/packages/benchmark.scm index 9741814c82..fdb00ca538 100644 --- a/gnu/packages/benchmark.scm +++ b/gnu/packages/benchmark.scm @@ -172,9 +172,6 @@ (define (benchmark? file stat) @end itemize") (license license:cpl1.0))) -(define-public imb-openmpi - (deprecated-package "imb-openmpi" intel-mpi-benchmarks/openmpi)) - (define-public multitime (package (name "multitime") diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index e05a3c32fe..19556dfdf9 100644 --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@ -295,9 +295,6 @@ (define-public boost-with-python2 `(("python" ,python-2) ,@(alist-delete "python" (package-native-inputs boost)))))) -(define-public boost-with-python3 - (deprecated-package "boost-with-python3" boost)) - (define-public boost-static (package (inherit boost) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 643b85a8db..d7a83ae727 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -448,9 +448,6 @@ (define-public json-modern-cxx intuitive syntax and trivial integration.") (license license:expat))) -(define-public nlohmann-json-cpp - (deprecated-package "nlohmann-json-cpp" json-modern-cxx)) - (define-public xtl (package (name "xtl") diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 1c86ef561c..76958efe8a 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -926,9 +926,6 @@ (define-public epson-inkjet-printer-escpr (home-page "http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX") (license license:gpl2+))) -(define-public escpr - (deprecated-package "escpr" epson-inkjet-printer-escpr)) - (define-public splix ;; Last released in 2009 . ;; Last SVN commit was 2013 . diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index 544f0114ac..9fe0e8d3d1 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -663,10 +663,6 @@ (define-public python-django-jinja example, explicit calls to callables from templates and better performance.") (license license:bsd-3))) -;; JSONField is now built-in to Django, obsoleting this package. -(define-public python-django-jsonfield - (deprecated-package "python-django-jsonfield" python-django)) - (define-public python-dj-database-url (package (name "python-dj-database-url") diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 17638cc801..1c2ab1e92e 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -26653,12 +26653,6 @@ (define-public emacs-modus-themes computing environment.") (license license:gpl3+))) -(define-public emacs-modus-operandi-theme - (deprecated-package "emacs-modus-operandi-theme" emacs-modus-themes)) - -(define-public emacs-modus-vivendi-theme - (deprecated-package "emacs-modus-vivendi-theme" emacs-modus-themes)) - (define-public emacs-punpun-theme (let ((commit "2f78125609277b2478abdebd8f9d5ee10a823b65") (revision "0")) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 6abc4cd410..50f265f085 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -1018,9 +1018,6 @@ (define kicad-i18n translations for KiCad.") (license license:gpl3+))) -(define-public kicad-i18l - (deprecated-package "kicad-i18l" kicad-i18n)) - (define-public kicad-doc (package (name "kicad-doc") diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index 2fe6437ba1..5cbda66de1 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -384,9 +384,6 @@ (define-public enlightenment embedded systems.") (license license:bsd-2))) -(define-public enlightenment-wayland - (deprecated-package "enlightenment-wayland" enlightenment)) - (define-public python-efl (package (name "python-efl") diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index e9083bc1c4..aefc0a8b69 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -245,17 +245,9 @@ (define* (make-opensbi-package platform name #:optional (arch "riscv64")) (define-public opensbi-qemu-generic (make-opensbi-package "generic" "opensbi-qemu-generic")) -(define-public opensbi-qemu-virt - (deprecated-package "opensbi-qemu-virt" opensbi-qemu-generic)) - (define-public opensbi-sifive-fu540 (make-opensbi-package "sifive/fu540" "opensbi-sifive-fu540")) -(define-public opensbi-qemu-sifive-u - ;; Dropped upstream, as all functionality is present in the sifive-fu540 - ;; target for recent versions of qemu, u-boot and linux. - (deprecated-package "opensbi-qemu-sifive-u" opensbi-sifive-fu540)) - (define-public seabios (package (name "seabios") diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 793b86ced8..3f36a71bdd 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -331,9 +331,6 @@ (define-public font-gnu-freefont (properties '((upstream-name . "freefont") (ftp-directory . "/gnu/freefont"))))) -(define-public font-gnu-freefont-ttf - (deprecated-package "font-gnu-freefont-ttf" font-gnu-freefont)) - (define-public font-liberation (package (name "font-liberation") @@ -1593,9 +1590,6 @@ (define-public font-opendyslexic emphasis while still being readable.") (license license:silofl1.1))) -(define-public font-open-dyslexic - (deprecated-package "font-open-dyslexic" font-opendyslexic)) - (define-public font-openmoji (package (name "font-openmoji") diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index c92d505ddb..51ec4a5fc2 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -375,9 +375,6 @@ (define-public python-sge possible, and it also makes the SGE easy to learn.") (license license:lgpl3+))) -(define-public python-sge-pygame - (deprecated-package "python-sge-pygame" python-sge)) - (define-public python-tmx (package (name "python-tmx") @@ -2075,9 +2072,6 @@ (define-public guile-chickadee @end enumerate\n") (license license:gpl3+))) -(define-public guile3.0-chickadee - (deprecated-package "guile3.0-chickadee" guile-chickadee)) - (define-public bennu-game-development (package (name "bennu-game-development") diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index a474933c93..78e9f17146 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2258,7 +2258,7 @@ (define-public retux (native-inputs `(("unzip" ,unzip))) (inputs - `(("python-sge-pygame" ,python-sge-pygame) + `(("python-sge" ,python-sge) ("python-six" ,python-six) ("python-xsge" ,python-xsge))) (home-page "https://retux-game.github.io/") @@ -4631,10 +4631,10 @@ (define-public openrct2 ("freetype" ,freetype) ("icu4c" ,icu4c) ("jansson" ,jansson) + ("json-modern-cxx" ,json-modern-cxx) ("libpng" ,libpng) ("libzip" ,libzip) ("mesa" ,mesa) - ("nlohmann-json-cpp" ,nlohmann-json-cpp) ("openrct2-objects" ,openrct2-objects) ("openrct2-title-sequences" ,openrct2-title-sequences) ("openssl" ,openssl) diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index 208b560317..6d8d02fb9c 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -779,9 +779,6 @@ (define-public numix-gtk-theme (home-page "https://numixproject.github.io") (license license:gpl3+))) -(define-public numix-theme - (deprecated-package "numix-theme" numix-gtk-theme)) - (define-public orchis-theme (package (name "orchis-theme") diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 8c8f491a18..451b61a28e 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -492,9 +492,6 @@ (define-public guile2.2-gcrypt `(("guile" ,guile-2.2) ,@(alist-delete "guile" (package-inputs guile-gcrypt)))))) -(define-public guile3.0-gcrypt - (deprecated-package "guile3.0-gcrypt" guile-gcrypt)) - (define-public python-gpg (package (name "python-gpg") diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index bb991789da..2927055240 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -939,13 +939,6 @@ (define-public gst-plugins/selection (("'auto'") "'disabled'")) #t))))))))) -(define-public gst-transcoder - (deprecated-package - "gst-transcoder" - (gst-plugins/selection gst-plugins-bad - #:plugins '("transcoder") - #:configure-flags '("-Dintrospection=enabled")))) - (define-public python-gst (package (name "python-gst") diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 243a7de08c..4e427deaef 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1035,9 +1035,6 @@ (define-public guile2.2-cairo ,@(fold alist-delete (package-inputs guile-cairo) '("guile" "guile-lib")))))) -(define-public guile3.0-cairo - (deprecated-package "guile3.0-cairo" guile-cairo)) - (define-public guile-rsvg ;; Use a recent snapshot that supports Guile 2.2 and beyond. (let ((commit "05c6a2fd67e4fea1a7c3ff776729dc931bae6678") @@ -1122,9 +1119,6 @@ (define-public guile2.2-rsvg '("guile" "guile-lib")))) (propagated-inputs `(("guile-cairo" ,guile2.2-cairo))))) -(define-public guile3.0-rsvg - (deprecated-package "guile3.0-rsvg" guile-rsvg)) - (define-public guile-present (package (name "guile-present") @@ -1195,9 +1189,6 @@ (define-public guile2.2-present ("guile-cairo" ,guile2.2-cairo) ("guile-rsvg" ,guile2.2-rsvg))))) -(define-public guile3.0-present - (deprecated-package "guile3.0-present" guile-present)) - (define-public guile-gnome (package (name "guile-gnome") diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index e3c36ff60e..56d6d2565d 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -706,9 +706,6 @@ (define-public guile2.0-fibers (name "guile2.2-fibers") (inputs `(("guile" ,guile-2.2))))) -(define-public guile3.0-fibers - (deprecated-package "guile3.0-fibers" guile-fibers)) - (define-public guile-filesystem (package (name "guile-filesystem") @@ -811,9 +808,6 @@ (define-public guile2.2-syntax-highlight (name "guile2.2-syntax-highlight") (inputs `(("guile" ,guile-2.2))))) -(define-public guile3.0-syntax-highlight - (deprecated-package "guile3.0-syntax-highlight" guile-syntax-highlight)) - (define-public guile-sjson (package (name "guile-sjson") @@ -899,9 +893,6 @@ (define-public guile2.2-squee ,@(alist-delete "guile" (package-native-inputs guile-squee)))))) -(define-public guile3.0-squee - (deprecated-package "guile3.0-squee" guile-squee)) - (define-public guile-colorized (package (name "guile-colorized") @@ -930,9 +921,6 @@ (define-public guile2.2-colorized (name "guile2.2-colorized") (native-inputs `(("guile" ,guile-2.2))))) -(define-public guile3.0-colorized - (deprecated-package "guile3.0-colorized" guile-colorized)) - (define-public guile-pfds (package (name "guile-pfds") @@ -1094,9 +1082,6 @@ (define-public guile2.2-pfds (find-files "." "\\.sls$")) #t)))))))) -(define-public guile3.0-pfds - (deprecated-package "guile3.0-pfds" guile-pfds)) - (define-public guile-aa-tree (package (name "guile-aa-tree") @@ -1162,9 +1147,6 @@ (define-public guile2.2-simple-zmq (name "guile2.2-simple-zmq") (native-inputs `(("guile" ,guile-2.2))))) -(define-public guile3.0-simple-zmq - (deprecated-package "guile3.0-simple-zmq" guile-simple-zmq)) - (define-public jupyter-guile-kernel (let ((commit "f25fb90b95529b17a006a807bd04e6aee12ea304") (revision "2")) @@ -1361,9 +1343,6 @@ (define-public guile2.2-email (inputs `(("guile" ,guile-2.2) ,@(alist-delete "guile" (package-inputs guile-email)))))) -(define-public guile3.0-email - (deprecated-package "guile3.0-email" guile-email)) - (define-public guile-newt (package (name "guile-newt") @@ -1403,9 +1382,6 @@ (define-public guile2.2-newt (inputs `(("guile" ,guile-2.2) ,@(alist-delete "guile" (package-inputs guile-newt)))))) -(define-public guile3.0-newt - (deprecated-package "guile3.0-newt" guile-newt)) - (define-public guile-mastodon (let ((commit "74b75bcf547df92acee1e0466ecd7ec07f775392") (revision "1")) @@ -1483,9 +1459,6 @@ (define-public guile2.2-parted (propagated-inputs `(("guile-bytestructures" ,guile2.2-bytestructures))))) -(define-public guile3.0-parted - (deprecated-package "guile3.0-parted" guile-parted)) - (define-public guile-xosd (package (name "guile-xosd") @@ -1706,9 +1679,6 @@ (define-public guile2.2-config (inputs `(("guile" ,guile-2.2) ,@(alist-delete "guile" (package-inputs guile-config)))))) -(define-public guile3.0-config - (deprecated-package "guile3.0-config" guile-config)) - (define-public guile-hall (package (name "guile-hall") @@ -1798,9 +1768,6 @@ (define-public guile2.2-hall ,@(alist-delete "guile-config" (package-propagated-inputs guile-hall)))))) -(define-public guile3.0-hall - (deprecated-package "guile3.0-hall" guile-hall)) - (define-public guile-ics (package (name "guile-ics") @@ -1849,9 +1816,6 @@ (define-public guile2.2-ics ,@(alist-delete "guile" (package-inputs guile-ics)))) (propagated-inputs `(("guile-lib" ,guile2.2-lib))))) -(define-public guile3.0-ics - (deprecated-package "guile3.0-ics" guile-ics)) - (define-public guile-imanifest (let ((commit "ccd5a2111b008d778106f5595a3a585954d95d0") (revision "0")) @@ -1969,9 +1933,6 @@ (define-public guile2.2-wisp (name "guile2.2-wisp") (inputs `(("guile" ,guile-2.2))))) -(define-public guile3.0-wisp - (deprecated-package "guile3.0-wisp" guile-wisp)) - (define-public guile-udev (package (name "guile-udev") @@ -2335,9 +2296,6 @@ (define-public guile2.2-ncurses (inputs `(("ncurses" ,ncurses) ("guile" ,guile-2.2))))) -(define-public guile3.0-ncurses - (deprecated-package "guile3.0-ncurses" guile-ncurses)) - (define-public guile-ncurses/gpm (package (inherit guile-ncurses) @@ -2345,13 +2303,6 @@ (define-public guile-ncurses/gpm (inputs `(("ncurses" ,ncurses/gpm) ("guile" ,guile-3.0))))) -(define-public guile3.0-ncurses/gpm - (package - (inherit guile3.0-ncurses) - (name "guile3.0-ncurses-with-gpm") - (inputs `(("ncurses" ,ncurses/gpm) - ("guile" ,guile-3.0))))) - (define-public guile-lib (package (name "guile-lib") @@ -2447,9 +2398,6 @@ (define-public guile2.2-lib (alist-replace "guile" (list guile-2.2) (package-inputs guile-lib))))) -(define-public guile3.0-lib - (deprecated-package "guile3.0-lib" guile-lib)) - (define-public guile-minikanren (package (name "guile-minikanren") @@ -2492,9 +2440,6 @@ (define-public guile2.2-minikanren (name "guile2.2-minikanren") (native-inputs `(("guile" ,guile-2.2))))) -(define-public guile3.0-minikanren - (deprecated-package "guile3.0-minikanren" guile-minikanren)) - (define-public guile-irregex (package (name "guile-irregex") @@ -2547,9 +2492,6 @@ (define-public guile2.2-irregex (name "guile2.2-irregex") (native-inputs `(("guile" ,guile-2.2))))) -(define-public guile3.0-irregex - (deprecated-package "guile3.0-irregex" guile-irregex)) - (define-public haunt (package (name "haunt") @@ -2634,9 +2576,6 @@ (define-public guile2.0-haunt (name "guile2.0-haunt") (inputs `(("guile" ,guile-2.0))))) -(define-public guile3.0-haunt - (deprecated-package "guile3.0-haunt" haunt)) - (define-public guile-redis (package (name "guile-redis") @@ -2752,9 +2691,6 @@ (define-public guile2.0-commonmark (name "guile2.0-commonmark") (inputs `(("guile" ,guile-2.0))))) -(define-public guile3.0-commonmark - (deprecated-package "guile3.0-commonmark" guile-commonmark)) - (define-public mcron (package (name "mcron") @@ -2805,9 +2741,6 @@ (define-public guile2.2-mcron (name "guile2.2-mcron") (inputs `(("guile" ,guile-2.2))))) -(define-public guile3.0-mcron - (deprecated-package "guile3.0-mcron" mcron)) - (define-public guile-picture-language (let ((commit "a1322bf11945465241ca5b742a70893f24156d12") (revision "5")) @@ -2853,10 +2786,6 @@ (define-public guile2.2-picture-language `(("guile-cairo" ,guile2.2-cairo) ("guile-rsvg" ,guile2.2-rsvg))))) -(define-public guile3.0-picture-language - (deprecated-package "guile3.0-picture-language" - guile-picture-language)) - (define-public guile-studio (let ((commit "dd0ad42e51feafebda7cc29afe7c8bc7a182a842") (revision "1")) @@ -3208,9 +3137,6 @@ (define-public guile2.2-gi `(("guile" ,guile-2.2) ,@(alist-delete "guile" (package-inputs guile-gi)))))) -(define-public guile3.0-gi - (deprecated-package "guile3.0-gi" guile-gi)) - (define-public guile-srfi-89 (package (name "guile-srfi-89") @@ -3794,9 +3720,6 @@ (define-public guile-semver the style of the Node Package Manager (NPM).") (license license:gpl3+))) -(define-public guile3.0-semver - (deprecated-package "guile3.0-semver" guile-semver)) - (define-public guile2.2-semver (package (inherit guile-semver) @@ -3862,9 +3785,6 @@ (define-public guile2.2-hashing (native-inputs `(("guile" ,guile-2.2))))) -(define-public guile3.0-hashing - (deprecated-package "guile3.0-hashing" guile-hashing)) - (define-public guile-packrat (package (name "guile-packrat") @@ -4107,9 +4027,6 @@ (define-public guile2.2-xapian `(("guile" ,guile-2.2) ,@(alist-delete "guile" (package-inputs guile-xapian)))))) -(define-public guile3.0-xapian - (deprecated-package "guile3.0-xapian" guile-xapian)) - (define-public guile-torrent (package (name "guile-torrent") @@ -4204,9 +4121,6 @@ (define-public guile-websocket (home-page "https://git.dthompson.us/guile-websocket.git") (license license:lgpl3+)))) -(define-public guile3.0-websocket - (deprecated-package "guile3.0-websocket" guile-websocket)) - (define-public guile-rdf (package (name "guile-rdf") diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 99372c4668..2108b9f9d3 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -479,39 +479,6 @@ (define package-for-guile-2.2 (guile-variant-package-name "guile2.2") #:deep? #f)) -(define-syntax define-deprecated-guile3.0-package - (lambda (s) - "Define a deprecated package alias for \"guile3.0-something\"." - (syntax-case s () - ((_ name) - (and (identifier? #'name) - (string-prefix? "guile3.0-" (symbol->string (syntax->datum - #'name)))) - (let ((->guile (lambda (str) - (let ((base (string-drop str - (string-length "guile3.0-")))) - (string-append "guile-" base))))) - (with-syntax ((package-name (symbol->string (syntax->datum #'name))) - (package - (datum->syntax - #'name - (string->symbol - (->guile (symbol->string (syntax->datum - #'name)))))) - (old-name - ;; XXX: This is the name generated by - ;; 'define-deprecated'. - (datum->syntax - #'name - (symbol-append '% (syntax->datum #'name) - '/deprecated)))) - #'(begin - (define-deprecated name package - (deprecated-package package-name package)) - (export old-name)))))))) - -(define-deprecated-guile3.0-package guile3.0-readline) - (define-public guile-for-guile-emacs (let ((commit "15ca78482ac0dd2e3eb36dcb31765d8652d7106d") (revision "1")) @@ -622,9 +589,6 @@ (define-public guile-json-3 ("guile" ,guile-3.0))) (inputs `(("guile" ,guile-3.0))))) -(define-public guile3.0-json - (deprecated-package "guile3.0-json" guile-json-3)) - (define-public guile-json-4 (package (inherit guile-json-3) @@ -696,8 +660,6 @@ (define-public guile2.0-gdbm-ffi (define-public guile2.2-gdbm-ffi (package-for-guile-2.2 guile-gdbm-ffi)) -(define-deprecated-guile3.0-package guile3.0-gdbm-ffi) - (define-public guile-sqlite3 (package (name "guile-sqlite3") @@ -732,8 +694,6 @@ (define-public guile2.0-sqlite3 (define-public guile2.2-sqlite3 (package-for-guile-2.2 guile-sqlite3)) -(define-deprecated-guile3.0-package guile3.0-sqlite3) - (define-public guile-bytestructures (package (name "guile-bytestructures") @@ -783,8 +743,6 @@ (define-public guile2.0-bytestructures (define-public guile2.2-bytestructures (package-for-guile-2.2 guile-bytestructures)) -(define-deprecated-guile3.0-package guile3.0-bytestructures) - (define-public guile-git (package (name "guile-git") @@ -826,8 +784,6 @@ (define-public guile2.2-git (define-public guile2.0-git (package-for-guile-2.0 guile-git)) -(define-deprecated-guile3.0-package guile3.0-git) - (define-public guile-zlib (package (name "guile-zlib") diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm index faa3b52c5c..fe7dd853b2 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -982,6 +982,3 @@ (define-public stylish-haskell default) @end itemize") (license license:bsd-3))) - -(define-public ghc-stylish-haskell - (deprecated-package "ghc-stylish-haskell" stylish-haskell)) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index f61092037d..e02a383355 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -993,9 +993,6 @@ (define-public linux-libre-arm-generic ("CONFIG_RTC_DRV_RK808" . #t)) %default-extra-linux-options))) -(define-public linux-libre-arm-veyron - (deprecated-package "linux-libre-arm-veyron" linux-libre-arm-generic)) - (define-public linux-libre-arm-generic-5.10 (make-linux-libre* linux-libre-5.10-version linux-libre-5.10-gnu-revision diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 6a9a69c410..b2d69e2064 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -434,9 +434,6 @@ (define-public guile2.2-mailutils `(("guile" ,guile-2.2) ,@(alist-delete "guile" (package-inputs mailutils)))))) -(define-public guile3.0-mailutils - (deprecated-package "guile3.0-mailutils" mailutils)) - (define-public nullmailer (package (name "nullmailer") diff --git a/gnu/packages/monitoring.scm b/gnu/packages/monitoring.scm index 999cfcb8b0..f71daaee8a 100644 --- a/gnu/packages/monitoring.scm +++ b/gnu/packages/monitoring.scm @@ -451,9 +451,6 @@ (define-public graphite-web demand.") (license license:asl2.0))) -(define-public python2-graphite-web - (deprecated-package "python2-graphite-web" graphite-web)) - (define-public python-prometheus-client (package (name "python-prometheus-client") diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 3c9d4da941..12c689e9e2 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -528,9 +528,6 @@ (define-public guix-daemon (invoke "make" "install-binPROGRAMS"))) (delete 'wrap-program))))))) -(define-public guile3.0-guix - (deprecated-package "guile3.0-guix" guix)) - (define-public guix-minimal ;; A version of Guix which is built with the minimal set of dependencies, as ;; outlined in the README "Requirements" section. Intended as a CI job, so @@ -980,9 +977,6 @@ (define-public conda written entirely in Python.") (license license:bsd-3))) -(define-public python-conda - (deprecated-package "python-conda" conda)) - (define-public conan (package (name "conan") diff --git a/gnu/packages/pep.scm b/gnu/packages/pep.scm index aa0d786d87..6685691285 100644 --- a/gnu/packages/pep.scm +++ b/gnu/packages/pep.scm @@ -241,7 +241,7 @@ (define-public python-pep-adapter `(("python-pytest" ,python-pytest) ("python-pytest-forked" ,python-pytest-forked))) (inputs - `(("boost-python" ,boost-with-python3) + `(("boost" ,boost) ("libpepadapter" ,libpepadapter) ("pep-engine" ,pep-engine) ("python-setuptools-scm" ,python-setuptools-scm/next) diff --git a/gnu/packages/phabricator.scm b/gnu/packages/phabricator.scm index af95cd93d2..ef8a1a7475 100644 --- a/gnu/packages/phabricator.scm +++ b/gnu/packages/phabricator.scm @@ -83,6 +83,3 @@ (define-public arcanist calls, and various other things.") ;; Bundled libraries are expat-licensed. (license (list license:asl2.0 license:expat))))) - -(define-public libphutil - (deprecated-package "libphutil" arcanist)) diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm index 4b89ddafd1..7a26c632f7 100644 --- a/gnu/packages/plotutils.scm +++ b/gnu/packages/plotutils.scm @@ -137,9 +137,6 @@ (define-public guile2.2-charting (inputs `(("guile" ,guile-2.2))) (propagated-inputs `(("guile-cairo" ,guile2.2-cairo))))) -(define-public guile3.0-charting - (deprecated-package "guile3.0-charting" guile-charting)) - (define-public ploticus (package (name "ploticus") diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index dfa2bb090c..495d7faa87 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -16828,9 +16828,6 @@ (define-public glances monitors CPU, load, memory, network bandwidth, disk I/O, disk use, and more.") (license license:lgpl3+))) -(define-public python-glances - (deprecated-package "python-glances" glances)) - (define-public python-graphql-core (package (name "python-graphql-core") @@ -19498,15 +19495,9 @@ (define-public python-smmap window memory map manager.") (license license:bsd-3))) -(define-public python-smmap2 - (deprecated-package "python-smmap2" python-smmap)) - (define-public python2-smmap (package-with-python2 python-smmap)) -(define-public python2-smmap2 - (deprecated-package "python2-smmap2" python2-smmap)) - (define-public python-regex (package (name "python-regex") diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 642682ec8e..0d93a1b5cc 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -869,9 +869,6 @@ (define-public oil (license (list license:psfl ; tarball includes python2.7 license:asl2.0)))) -(define-public oil-shell - (deprecated-package "oil-shell" oil)) - (define-public gash (package (name "gash") diff --git a/gnu/packages/sqlite.scm b/gnu/packages/sqlite.scm index a48d724488..007b8f94f1 100644 --- a/gnu/packages/sqlite.scm +++ b/gnu/packages/sqlite.scm @@ -143,8 +143,3 @@ (define-public sqlite/fixed (sha256 (base32 "0rlbaq177gcgk5dswd3akbhv2nvvzljrbhgy18hklbhw7h90f5d3")))))) - -;; Column metadata support was added to the regular 'sqlite' package with -;; commit fad5b1a6d8d9c36bea5785ae4fbc1beb37e644d7. -(define-public sqlite-with-column-metadata - (deprecated-package "sqlite-with-column-metadata" sqlite)) diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 4e217888fd..00bcdb63ab 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -397,9 +397,6 @@ (define-public guile2.2-ssh (inputs `(("guile" ,guile-2.2) ,@(alist-delete "guile" (package-inputs guile-ssh)))))) -(define-public guile3.0-ssh - (deprecated-package "guile3.0-ssh" guile-ssh)) - (define-public corkscrew ;; The last 2.0 release hails from 2009. Use a fork (submitted upstream as ;; ) that adds now-essential diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 8d751f6cce..daecc95837 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -1225,9 +1225,6 @@ (define-public eternalterminal (@code{tmux -CC}).") (license license:asl2.0))) -(define-public et - (deprecated-package "et" eternalterminal)) - (define-public wterm (package (name "wterm") diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index f3fce5ffe1..029bce451e 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -368,9 +368,6 @@ (define-public guile2.2-gnutls ,@(alist-delete "guile" (package-inputs gnutls)))))) -(define-public guile3.0-gnutls - (deprecated-package "guile3.0-gnutls" gnutls)) - (define-public openssl (package (name "openssl") diff --git a/gnu/packages/vlang.scm b/gnu/packages/vlang.scm index e0b2e7bcfc..def858da17 100644 --- a/gnu/packages/vlang.scm +++ b/gnu/packages/vlang.scm @@ -134,7 +134,3 @@ (define-public vlang "V is a systems programming language. It provides memory safety and thread safety guarantees with minimal abstraction.") (license license:expat))) - -(define-public v - ;; We used to provide 'vlang' under the name 'v'. - (deprecated-package "v" vlang)) diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index 4624e2be3f..7b30fe3fec 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -1085,9 +1085,6 @@ (define-public wireguard-tools (list license:lgpl2.1+ ; src/netlink.h & contrib/embeddable-wg-library license:gpl2)))) ; everything else -(define-public wireguard - (deprecated-package "wireguard" wireguard-tools)) - (define-public xl2tpd (package (name "xl2tpd") diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index 35e8db7e91..a6d2d9106b 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -690,12 +690,6 @@ (define-public nyxt key-bindings (Emacs, vi, CUA), and is fully configurable in Common Lisp.") (license license:bsd-3))) -(define-public next - (deprecated-package "next" nyxt)) - -(define-public sbcl-next - (deprecated-package "sbcl-next" nyxt)) - (define-public lagrange (package (name "lagrange") diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 2e10f29ba9..c553ae1eae 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -6639,9 +6639,6 @@ (define-public transset (home-page "https://gitlab.freedesktop.org/xorg/app/transset") (license license:x11))) -(define-public transset-df - (deprecated-package "transset-df" transset)) - (define-public bdfresize (package (name "bdfresize") -- cgit v1.2.3 From 05e3638bb9275276fe7999f37ff4c5b000337319 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 1 Oct 2021 15:49:13 -0400 Subject: gnu: Move a few Python packages to (gnu packages python-build). This is in prevision of updating python-pypa-build, which now requires python-packaging and adding python-tomli, which requires python-six. * gnu/packages/python-xyz.scm (python-six) (python-six-bootstrap, python2-six-bootstrap) (python-pyparsing, python2-pyparsing, python-pyparsing-2.4.7) (python-packaging-bootstrap, python2-packaging-bootstrap): Move packages to... * gnu/packages/python-build.scm: ... here. Update python-parsing to latest. * gnu/packages/python-xyz.scm (python-six, python-packaging): Adjust to inherit from their bootstrap versions. --- gnu/packages/graphviz.scm | 1 + gnu/packages/monitoring.scm | 1 + gnu/packages/openstack.scm | 1 + gnu/packages/package-management.scm | 1 + gnu/packages/python-build.scm | 114 +++++++++++++++++++++++++++++ gnu/packages/python-xyz.scm | 139 ++---------------------------------- gnu/packages/rdf.scm | 1 + 7 files changed, 125 insertions(+), 133 deletions(-) (limited to 'gnu/packages/package-management.scm') diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm index 39d956b3cb..42c4c0fe57 100644 --- a/gnu/packages/graphviz.scm +++ b/gnu/packages/graphviz.scm @@ -50,6 +50,7 @@ (define-module (gnu packages graphviz) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages python-build) #:use-module (gnu packages python-check) #:use-module (gnu packages python-xyz) #:use-module (gnu packages sphinx) diff --git a/gnu/packages/monitoring.scm b/gnu/packages/monitoring.scm index 999cfcb8b0..c8316c5212 100644 --- a/gnu/packages/monitoring.scm +++ b/gnu/packages/monitoring.scm @@ -56,6 +56,7 @@ (define-module (gnu packages monitoring) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages python-build) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages rrdtool) diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm index 1c35fe570f..b614bcf0d1 100644 --- a/gnu/packages/openstack.scm +++ b/gnu/packages/openstack.scm @@ -27,6 +27,7 @@ (define-module (gnu packages openstack) #:use-module (gnu packages check) #:use-module (gnu packages gnupg) #:use-module (gnu packages python) + #:use-module (gnu packages python-build) #:use-module (gnu packages python-check) #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-web) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 660c43604d..c15c1c1c6d 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -86,6 +86,7 @@ (define-module (gnu packages package-management) #:use-module (gnu packages pkg-config) #:use-module (gnu packages popt) #:use-module (gnu packages python) + #:use-module (gnu packages python-build) #:use-module (gnu packages python-check) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) diff --git a/gnu/packages/python-build.scm b/gnu/packages/python-build.scm index 59ee91aa9c..0688dcbf04 100644 --- a/gnu/packages/python-build.scm +++ b/gnu/packages/python-build.scm @@ -23,6 +23,7 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages python-build) + #:use-module (gnu packages) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix build-system python) #:use-module (guix download) @@ -107,6 +108,32 @@ (define-public python-pytoml (description "This package provides a Python parser for TOML-0.4.0.") (license license:expat))) +(define-public python-six-bootstrap + (package + (name "python-six-bootstrap") + (version "1.15.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "six" version)) + (sha256 + (base32 + "0n82108wxn5giff50hd9ykjhd3zl7cndabdasi6568yvbh1rqqrh")))) + (build-system python-build-system) + (arguments `(#:tests? #f)) ;to avoid pytest dependency + (home-page "https://pypi.org/project/six/") + (synopsis "Python 2 and 3 compatibility utilities") + (description + "Six is a Python 2 and 3 compatibility library. It provides utility +functions for smoothing over the differences between the Python versions with +the goal of writing Python code that is compatible on both Python versions. +Six supports every Python version since 2.5. It is contained in only one +Python file, so it can be easily copied into your project.") + (license license:x11))) + +(define-public python2-six-bootstrap + (package-with-python2 python-six-bootstrap)) + (define-public python-pep517-bootstrap (hidden-package (package @@ -131,6 +158,93 @@ (define-public python-pep517-bootstrap "Wrappers to build Python packages using PEP 517 hooks.") (license license:expat)))) +(define-public python-pyparsing + (package + (name "python-pyparsing") + (version "2.4.7") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pyparsing" version)) + (sha256 + (base32 "1hgc8qrbq1ymxbwfbjghv01fm3fbpjwpjwi0bcailxxzhf3yq0y2")))) + (build-system python-build-system) + (outputs '("out" "doc")) + (arguments + `(#:tests? #f ;no test target + #:phases + (modify-phases %standard-phases + (add-after 'install 'install-doc + (lambda* (#:key outputs #:allow-other-keys) + (let* ((doc (string-append (assoc-ref outputs "doc") + "/share/doc/" ,name "-" ,version)) + (html-doc (string-append doc "/html")) + (examples (string-append doc "/examples"))) + (mkdir-p html-doc) + (mkdir-p examples) + (for-each + (lambda (dir tgt) + (map (lambda (file) + (install-file file tgt)) + (find-files dir ".*"))) + (list "docs" "htmldoc" "examples") + (list doc html-doc examples)))))))) + (home-page "https://github.com/pyparsing/pyparsing") + (synopsis "Python parsing class library") + (description + "The pyparsing module is an alternative approach to creating and +executing simple grammars, vs. the traditional lex/yacc approach, or the use +of regular expressions. The pyparsing module provides a library of classes +that client code uses to construct the grammar directly in Python code.") + (license license:expat))) + +(define-public python-pyparsing-2.4.7 + (package + (inherit python-pyparsing) + (version "2.4.7") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pyparsing" version)) + (sha256 + (base32 "1hgc8qrbq1ymxbwfbjghv01fm3fbpjwpjwi0bcailxxzhf3yq0y2")))))) + +(define-public python2-pyparsing + (package-with-python2 python-pyparsing)) + +(define-public python-packaging-bootstrap + (package + (name "python-packaging-bootstrap") + (version "20.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "packaging" version)) + ;; XXX: The URL in the patch file is wrong, it should be + ;; . + (patches (search-patches "python-packaging-test-arch.patch")) + (sha256 + (base32 + "1y2ip3a4ykkpgnwgn85j6hkspcl0cg3mzms97f40mk57vwqq67gy")))) + (build-system python-build-system) + (arguments `(#:tests? #f)) ;disabled to avoid extra dependencies + (propagated-inputs + `(("python-pyparsing" ,python-pyparsing) + ("python-six-bootstrap" ,python-six-bootstrap))) + (home-page "https://github.com/pypa/packaging") + (synopsis "Core utilities for Python packages") + (description "Packaging is a Python module for dealing with Python packages. +It offers an interface for working with package versions, names, and dependency +information.") + ;; From 'LICENSE': This software is made available under the terms of + ;; *either* of the licenses found in LICENSE.APACHE or LICENSE.BSD. + ;; Contributions to this software is made under the terms of *both* these + ;; licenses. + (license (list license:asl2.0 license:bsd-2)))) + +(define-public python2-packaging-bootstrap + (package-with-python2 python-packaging-bootstrap)) + ;;; The name 'python-pypa-build' is chosen rather than 'python-build' to avoid ;;; a name clash with python-build from (guix build-system python). (define-public python-pypa-build diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 4a3ccbaab0..140ab99dfc 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2424,48 +2424,20 @@ (define-public python-sinfo (license license:bsd-3))) (define-public python-six - (package + (package/inherit python-six-bootstrap (name "python-six") - (version "1.15.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "six" version)) - (sha256 - (base32 - "0n82108wxn5giff50hd9ykjhd3zl7cndabdasi6568yvbh1rqqrh")))) - (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases (replace 'check (lambda _ - (invoke "py.test" "-v")))))) + (invoke "pytest" "-v")))))) (native-inputs - `(("python-pytest" ,python-pytest-bootstrap))) - (home-page "https://pypi.org/project/six/") - (synopsis "Python 2 and 3 compatibility utilities") - (description - "Six is a Python 2 and 3 compatibility library. It provides utility -functions for smoothing over the differences between the Python versions with -the goal of writing Python code that is compatible on both Python versions. -Six supports every Python version since 2.5. It is contained in only one -Python file, so it can be easily copied into your project.") - (license license:x11))) + `(("python-pytest" ,python-pytest-bootstrap))))) (define-public python2-six (package-with-python2 python-six)) -(define-public python-six-bootstrap - (package - (inherit python-six) - (name "python-six-bootstrap") - (native-inputs `()) - (arguments `(#:tests? #f)))) - -(define-public python2-six-bootstrap - (package-with-python2 python-six-bootstrap)) - (define-public python-schedule (package (name "python-schedule") @@ -5907,61 +5879,6 @@ (define-public python-patch-ng @end itemize") (license license:expat))) -(define-public python-pyparsing - (package - (name "python-pyparsing") - (version "2.4.6") - (source - (origin - (method url-fetch) - (uri (pypi-uri "pyparsing" version)) - (sha256 - (base32 "17wn5zlijc9m9zj26gy3f541y7smpj8rfhl51d025c2gm210b0sc")))) - (build-system python-build-system) - (outputs '("out" "doc")) - (arguments - `(#:tests? #f ; no test target - #:phases - (modify-phases %standard-phases - (add-after 'install 'install-doc - (lambda* (#:key outputs #:allow-other-keys) - (let* ((doc (string-append (assoc-ref outputs "doc") - "/share/doc/" ,name "-" ,version)) - (html-doc (string-append doc "/html")) - (examples (string-append doc "/examples"))) - (mkdir-p html-doc) - (mkdir-p examples) - (for-each - (lambda (dir tgt) - (map (lambda (file) - (install-file file tgt)) - (find-files dir ".*"))) - (list "docs" "htmldoc" "examples") - (list doc html-doc examples)) - #t)))))) - (home-page "https://github.com/pyparsing/pyparsing") - (synopsis "Python parsing class library") - (description - "The pyparsing module is an alternative approach to creating and -executing simple grammars, vs. the traditional lex/yacc approach, or the use -of regular expressions. The pyparsing module provides a library of classes -that client code uses to construct the grammar directly in Python code.") - (license license:expat))) - -(define-public python2-pyparsing - (package-with-python2 python-pyparsing)) - -(define-public python-pyparsing-2.4.7 - (package - (inherit python-pyparsing) - (version "2.4.7") - (source - (origin - (method url-fetch) - (uri (pypi-uri "pyparsing" version)) - (sha256 - (base32 "1hgc8qrbq1ymxbwfbjghv01fm3fbpjwpjwi0bcailxxzhf3yq0y2")))))) - (define-public python-numpydoc (package (name "python-numpydoc") @@ -18550,28 +18467,15 @@ (define-public python2-translate-toolkit (package-with-python2 python-translate-toolkit)) (define-public python-packaging - (package + (package/inherit python-packaging-bootstrap (name "python-packaging") - (version "20.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "packaging" version)) - ;; XXX: The URL in the patch file is wrong, it should be - ;; . - (patches (search-patches "python-packaging-test-arch.patch")) - (sha256 - (base32 - "1y2ip3a4ykkpgnwgn85j6hkspcl0cg3mzms97f40mk57vwqq67gy")))) - (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases (replace 'check (lambda* (#:key tests? #:allow-other-keys) (if tests? - (invoke "py.test" "-vv") - (format #t "test suite not run~%")) - #t))))) + (invoke "pytest" "-vv") + (format #t "test suite not run~%"))))))) (native-inputs `(("python-pretend" ,python-pretend) ("python-pytest" ,python-pytest))) @@ -18592,37 +18496,6 @@ (define-public python-packaging (define-public python2-packaging (package-with-python2 python-packaging)) -;; Variants with minimal dependencies, for bootstrapping Pytest. -(define-public python-packaging-bootstrap - (hidden-package - (package/inherit - python-packaging - (name "python-packaging-bootstrap") - (arguments - (substitute-keyword-arguments (package-arguments python-packaging) - ((#:phases phases) - `(modify-phases ,phases - (add-after 'unpack 'fix-dependencies - (lambda* (#:key tests? #:allow-other-keys) - (substitute* "setup.py" (("\"six\"") "")))))) - ((#:tests? _ #f) #f))) - (native-inputs '()) - (propagated-inputs - `(("python-pyparsing" ,python-pyparsing)))))) - -(define-public python2-packaging-bootstrap - (hidden-package - (package/inherit - python2-packaging - (name "python2-packaging-bootstrap") - (native-inputs '()) - (propagated-inputs - `(("python-pyparsing" ,python2-pyparsing) - ("python-six" ,python2-six-bootstrap))) - (arguments - `(#:tests? #f - ,@(package-arguments python2-packaging)))))) - (define-public python-relatorio (package (name "python-relatorio") diff --git a/gnu/packages/rdf.scm b/gnu/packages/rdf.scm index fb84d8053d..4b7e6ce29e 100644 --- a/gnu/packages/rdf.scm +++ b/gnu/packages/rdf.scm @@ -48,6 +48,7 @@ (define-module (gnu packages rdf) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages python-build) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) -- cgit v1.2.3 From ccebbaa5170dc250ceb8810d1baa331a7f0b9952 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 5 Nov 2021 00:03:36 -0400 Subject: gnu: conan: Update to 1.42.0. * gnu/packages/package-management.scm (conan): Update to 1.42.0. [phases]{relax-requirements}: Relax the Jinja2 requirement. [native-inputs]: Remove obsolete comment about CMake. --- gnu/packages/package-management.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'gnu/packages/package-management.scm') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index c15c1c1c6d..77db63ab45 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1048,7 +1048,7 @@ (define-public python-conda (define-public conan (package (name "conan") - (version "1.40.2") + (version "1.42.0") (source (origin (method git-fetch) ;no tests in PyPI archive @@ -1058,7 +1058,7 @@ (define-public conan (file-name (git-file-name name version)) (sha256 (base32 - "0hp8qs54l4cw043f1kycjwgdr7f388lsyxqcbzfaayr6xg1d3dw0")))) + "153npvj81m1c33gfcv2nry7xhyikxnhjns7lvs525f1x20ck6asg")))) (build-system python-build-system) (arguments `(#:phases @@ -1067,7 +1067,9 @@ (define-public conan (lambda _ (substitute* "conans/requirements.txt" (("node-semver==0.6.1") - "node-semver>=0.6.1")))) + "node-semver>=0.6.1") + (("Jinja2>=2.9, <3") + "Jinja2>=2.9")))) (add-after 'unpack 'patch-paths (lambda* (#:key inputs #:allow-other-keys) (let ((coreutils (assoc-ref inputs "coreutils"))) @@ -1172,7 +1174,7 @@ (define system ,(or (%current-target-system) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) - ("cmake" ,cmake) ;requires cmake >= 3.17 + ("cmake" ,cmake) ("git" ,git-minimal) ("meson" ,meson) ("ninja",ninja) -- cgit v1.2.3 From 83289ca25505274f0ea9438f55bebeddfb0e1423 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 14 Nov 2021 16:27:30 +0000 Subject: gnu: guix-build-coordinator: Update to 0-36.87508af. * gnu/packages/package-management.scm (guix-build-coordinator): Update to 0-36.87508af. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/package-management.scm') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 12c689e9e2..7dd84aff46 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1181,8 +1181,8 @@ (define-public gwl (license (list license:gpl3+ license:agpl3+ license:silofl1.1)))) (define-public guix-build-coordinator - (let ((commit "a4d0ec6bc564bbe98d3e6c03be41de16edbda928") - (revision "35")) + (let ((commit "87508af9566d9f7dbacfd8478a353d612a811e38") + (revision "36")) (package (name "guix-build-coordinator") (version (git-version "0" revision commit)) @@ -1193,7 +1193,7 @@ (define-public guix-build-coordinator (commit commit))) (sha256 (base32 - "0qa7qkskp9xzhyl0fgbm98f8apy8cn2yc9gpxhw0dfc9bkbs1pb9")) + "0lqjqnpgvwhzan2pbq0h1gavf0f17h3zw3qd0kd8xwjcmx4bna82")) (file-name (string-append name "-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From db5907138cbf9139e885fa4b3860d604aff0be9c Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Mon, 15 Nov 2021 21:46:58 +0000 Subject: gnu: guix-build-coordinator: Update to 0-37.200ffe7. * gnu/packages/package-management.scm (guix-build-coordinator): Update to 0-37.200ffe7. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/package-management.scm') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 7dd84aff46..6f2b2fd61c 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1181,8 +1181,8 @@ (define-public gwl (license (list license:gpl3+ license:agpl3+ license:silofl1.1)))) (define-public guix-build-coordinator - (let ((commit "87508af9566d9f7dbacfd8478a353d612a811e38") - (revision "36")) + (let ((commit "200ffe795bd36052b64f7868c71a92925ee7beca") + (revision "37")) (package (name "guix-build-coordinator") (version (git-version "0" revision commit)) @@ -1193,7 +1193,7 @@ (define-public guix-build-coordinator (commit commit))) (sha256 (base32 - "0lqjqnpgvwhzan2pbq0h1gavf0f17h3zw3qd0kd8xwjcmx4bna82")) + "09j67zdx5h6ic2yvzn1vvhmwlsj7kb06s765yjnvpnsb228ja96s")) (file-name (string-append name "-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 7fd93d8e4e431bd5691bd947aeb0e3af8f4848c7 Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Mon, 15 Nov 2021 16:32:55 -0500 Subject: gnu: flatpak: Use libsoup 2. * gnu/packages/package-management.scm (flatpak)[inputs]: Use libsoup 2. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/package-management.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/package-management.scm') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 77db63ab45..c7547264e9 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1675,7 +1675,7 @@ (define-public flatpak ("libarchive" ,libarchive) ("libostree" ,libostree) ("libseccomp" ,libseccomp) - ("libsoup" ,libsoup) + ("libsoup" ,libsoup-minimal-2) ("libxau" ,libxau) ("libxml2" ,libxml2) ("p11-kit-next" ,p11-kit-next) -- cgit v1.2.3 From 206f2693fd219b8b61d268056e37d3961559cbaf Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 16 Nov 2021 16:11:46 +0100 Subject: gnu: guix: Update to 9bbbac6. * gnu/packages/package-management.scm (guix): Update to 9bbbac6. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/package-management.scm') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 6f2b2fd61c..b15298019b 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -142,8 +142,8 @@ (define-public guix ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.3.0") - (commit "014f1b607f1d88a8e733017afaca006545b7d99b") - (revision 11)) + (commit "9bbbac6783bcdace17d967e85c8ae8d14cbf1ef9") + (revision 12)) (package (name "guix") @@ -159,7 +159,7 @@ (define-public guix (commit commit))) (sha256 (base32 - "0mmq0ypkxj6dc1r9j1mdgih87h6fc0mk05hp481cjp8shdc1w6gw")) + "1p0my0gfshdhm1dpqf6j68iipnigmpb23l8p81kwpw5w50x0hfda")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 80efc5d005738b0bb207c31179ee1cce5412fdba Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 21 Nov 2021 18:35:47 +0000 Subject: gnu: guix-build-coordinator: Update to 0-38.d46e9ac. * gnu/packages/package-management.scm (guix-build-coordinator): Update to 0-38.d46e9ac. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/package-management.scm') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index b15298019b..416090ac48 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1181,8 +1181,8 @@ (define-public gwl (license (list license:gpl3+ license:agpl3+ license:silofl1.1)))) (define-public guix-build-coordinator - (let ((commit "200ffe795bd36052b64f7868c71a92925ee7beca") - (revision "37")) + (let ((commit "d46e9ac5936a4d3e6f6b2c00c6f35ba96259128c") + (revision "38")) (package (name "guix-build-coordinator") (version (git-version "0" revision commit)) @@ -1193,7 +1193,7 @@ (define-public guix-build-coordinator (commit commit))) (sha256 (base32 - "09j67zdx5h6ic2yvzn1vvhmwlsj7kb06s765yjnvpnsb228ja96s")) + "004ib2wq2d7gfpy2mbs243gll66iy524sv5n2r6g5lfns726y5hf")) (file-name (string-append name "-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 21d390bf64ed96ad24363ae270408721eeed4f88 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Mon, 22 Nov 2021 23:21:07 +0000 Subject: gnu: guix-build-coordinator: Update to 0-39.c9c55c0. * gnu/packages/package-management.scm (guix-build-coordinator): Update to 0-39.c9c55c0. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/package-management.scm') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 416090ac48..979d76b566 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1181,8 +1181,8 @@ (define-public gwl (license (list license:gpl3+ license:agpl3+ license:silofl1.1)))) (define-public guix-build-coordinator - (let ((commit "d46e9ac5936a4d3e6f6b2c00c6f35ba96259128c") - (revision "38")) + (let ((commit "c9c55c0a16c0d72ad11389baf722ce90644c45d7") + (revision "39")) (package (name "guix-build-coordinator") (version (git-version "0" revision commit)) @@ -1193,7 +1193,7 @@ (define-public guix-build-coordinator (commit commit))) (sha256 (base32 - "004ib2wq2d7gfpy2mbs243gll66iy524sv5n2r6g5lfns726y5hf")) + "1sxbfc3fy9x8vvhkpj68m5gz0rj6h66w8xcsqi26zx85d7jcs3h3")) (file-name (string-append name "-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 93d1f8e5fc78bd82e8920d25b3e52a2d22528c17 Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Tue, 23 Nov 2021 18:04:17 -0500 Subject: gnu: libostree: Build with libsoup 2. * gnu/packages/package-management.scm (libostree)[inputs]: Change LIBSOUP to LIBSOUP-MINIMAL-2. Signed-off-by: Maxim Cournoyer --- gnu/packages/package-management.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/package-management.scm') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 163683ebdd..9d0d8d4670 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -19,6 +19,7 @@ ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2021 Ivan Gankevich ;;; Copyright © 2021 Maxim Cournoyer +;;; Copyright © 2021 John Kehayias ;;; ;;; This file is part of GNU Guix. ;;; @@ -1567,7 +1568,7 @@ (define-public libostree ("glib" ,glib) ("gpgme" ,gpgme) ("libarchive" ,libarchive) - ("libsoup" ,libsoup) + ("libsoup" ,libsoup-minimal-2) ; needs libsoup-2.4 ("util-linux" ,util-linux))) (home-page "https://ostree.readthedocs.io/en/latest/") (synopsis "Operating system and container binary deployment and upgrades") -- cgit v1.2.3 From 4d41c3beefa44d0ec30aa7108bc3979aa95c15e0 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 23 Nov 2021 23:45:36 -0500 Subject: gnu: libostree: Update to 2021.6. * gnu/packages/package-management.scm (libostree): Update to 2021.6. --- gnu/packages/package-management.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/package-management.scm') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 9d0d8d4670..bdffb80dda 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1528,7 +1528,7 @@ (define-public msitools (define-public libostree (package (name "libostree") - (version "2021.3") + (version "2021.6") (source (origin (method url-fetch) @@ -1536,7 +1536,7 @@ (define-public libostree "https://github.com/ostreedev/ostree/releases/download/v" (version-major+minor version) "/libostree-" version ".tar.xz")) (sha256 - (base32 "1cyhr3s7xsgnsais5m4cjwdwcq46naf25r1k042c4n1y1jgs798g")))) + (base32 "0cgmnjf4mr4wn4fliq6ncs0q9qwblrlizjfhx57p7m332g5k21p8")))) (build-system gnu-build-system) (arguments '(#:phases -- cgit v1.2.3 From daa6c67fb445b71f4cac4c7857f6a988f1aba79a Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Mon, 29 Nov 2021 21:01:26 +0000 Subject: gnu: guix-build-coordinator: Update to 0-40.226ec0f. * gnu/packages/package-management.scm (guix-build-coordinator): Update to 0-40.226ec0f. * doc/guix.texi (Guix Build Coordinator): Remove note about the service being considered experimental, it's been stable for a while now. --- doc/guix.texi | 6 ------ gnu/packages/package-management.scm | 6 +++--- 2 files changed, 3 insertions(+), 9 deletions(-) (limited to 'gnu/packages/package-management.scm') diff --git a/doc/guix.texi b/doc/guix.texi index 2a166e3a89..09553ab2f3 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -32456,12 +32456,6 @@ running an @dfn{agent}. The build daemon is still used to build the derivations, but the Guix Build Coordinator manages allocating builds and working with the results. -@quotation Note -This service is considered experimental. Configuration options may be -changed in a backwards-incompatible manner, and not all features have -been thorougly tested. -@end quotation - The Guix Build Coordinator consists of one @dfn{coordinator}, and one or more connected @dfn{agent} processes. The coordinator process handles clients submitting builds, and allocating builds to agents. The agent diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 979d76b566..7fb4fe15bd 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1181,8 +1181,8 @@ (define-public gwl (license (list license:gpl3+ license:agpl3+ license:silofl1.1)))) (define-public guix-build-coordinator - (let ((commit "c9c55c0a16c0d72ad11389baf722ce90644c45d7") - (revision "39")) + (let ((commit "226ec0f0f8a10842ffdd50dd464be33b2db45563") + (revision "40")) (package (name "guix-build-coordinator") (version (git-version "0" revision commit)) @@ -1193,7 +1193,7 @@ (define-public guix-build-coordinator (commit commit))) (sha256 (base32 - "1sxbfc3fy9x8vvhkpj68m5gz0rj6h66w8xcsqi26zx85d7jcs3h3")) + "1sxvp7j5xypk6zlrs5y21lwx12h5r0c35ia9wqf0cyq8wjjaagh8")) (file-name (string-append name "-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 052f56e5a614854636563278ee5a2248b3609d87 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 2 Dec 2021 12:50:59 +0100 Subject: gnu: guix: Update to 8cc099b. * gnu/packages/package-management.scm (guix): Update to 8cc099b. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/package-management.scm') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 7fb4fe15bd..6a51e7eb9b 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -142,8 +142,8 @@ (define-public guix ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.3.0") - (commit "9bbbac6783bcdace17d967e85c8ae8d14cbf1ef9") - (revision 12)) + (commit "8cc099b4250589c0d23fc6762868f6542433f143") + (revision 13)) (package (name "guix") @@ -159,7 +159,7 @@ (define-public guix (commit commit))) (sha256 (base32 - "1p0my0gfshdhm1dpqf6j68iipnigmpb23l8p81kwpw5w50x0hfda")) + "02azjxw9lwq7y0gw6dcmwhgimb0rapab8kh7qjvcr4j5xnaqv7rx")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 8394619baceb118df92e355377fd543bb1aa501a Mon Sep 17 00:00:00