From 5aafccebbed7c9474a021623e6d8823cffde95b5 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Mon, 29 Apr 2019 14:49:42 -0400 Subject: gnu: gdm: Avoid selecting the placeholder session. This fixes . * gnu/packages/gnome.scm (gdm)[arguments]: Modify the pre-configure phase to patch GDM to only select the placeholder session if there are no others. --- gnu/packages/gnome.scm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 17dc2fd102..f19b1836d3 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5597,7 +5597,7 @@ libxml2.") (modify-phases %standard-phases (add-before 'configure 'pre-configure - (lambda* (#:key inputs #:allow-other-keys) + (lambda* (#:key inputs outputs #:allow-other-keys) ;; We don't have . (substitute* '("common/gdm-log.c" "daemon/gdm-server.c" @@ -5665,6 +5665,16 @@ libxml2.") (("\"gnome-session\"") (string-append "\"" (assoc-ref inputs "gnome-session") "/bin/gnome-session\""))) + ;; Do not automatically select the placeholder session. + (substitute* "daemon/gdm-session.c" + (("!g_str_has_suffix [(]base_name, \"\\.desktop\"[)]") + (string-append "!g_str_has_suffix (base_name, \".desktop\") || " + "(g_strcmp0(search_dirs[i], \"" + (assoc-ref outputs "out") "/share/gdm/BuiltInSessions/" + "\") == 0 && " + "g_strcmp0(base_name, \"fail.desktop\") == 0)")) + (("g_error [(]\"GdmSession: no session desktop files installed, aborting\\.\\.\\.\"[)];") + "{ self->priv->fallback_session_name = g_strdup(\"fail\"); goto out; }")) #t)) ;; GDM requires that there be at least one desktop entry ;; file. This phase installs a hidden one that simply -- cgit v1.2.3 From 9aa470e912bff3af0f5803797c8c88a6cd6bdb8b Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Mon, 29 Apr 2019 20:51:37 -0400 Subject: gnu: awesome: Use absolute paths in session file. * gnu/packages/wm.scm (awesome)[arguments]: Add a phase to patch the session '.desktop' file to use the absolute path of the 'awesome' binary. --- gnu/packages/wm.scm | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index c7dea8ba9b..b878df2895 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -19,6 +19,7 @@ ;;; Copyright © 2018 Pierre-Antoine Rouby ;;; Copyright © 2018 Meiyo Peng ;;; Copyright © 2019 Rutger Helling +;;; Copyright © 2019 Timothy Sample ;;; ;;; This file is part of GNU Guix. ;;; @@ -793,6 +794,13 @@ experience.") ;; There aren't any tests, so just make sure the binary ;; gets built and can be run successfully. (invoke "../build/awesome" "-v"))) + (add-after 'install 'patch-session-file + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (awesome (string-append out "/bin/awesome"))) + (substitute* (string-append out "/share/xsessions/awesome.desktop") + (("Exec=awesome") (string-append "Exec=" awesome))) + #t))) (add-after 'install 'wrap (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((awesome (assoc-ref outputs "out")) -- cgit v1.2.3 From f420d639df54bd8d47e84e1391e1a0e4584762a7 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Mon, 29 Apr 2019 22:36:27 -0400 Subject: gnu: i3-wm: Use absolute paths in session files. * gnu/packages/wm.scm (i3-wm)[arguments]: Add a phase to patch the session '.desktop' files to use the absolute paths of the 'i3' and 'i3-with-shmlog' binaries. --- gnu/packages/wm.scm | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index b878df2895..687cf9c2ee 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -182,7 +182,19 @@ commands would.") (list "--disable-builddir") ;; The test suite requires the unpackaged Xephyr X server. - #:tests? #f)) + #:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'install 'patch-session-file + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (i3 (string-append out "/bin/i3")) + (i3-with-shmlog (string-append out "/bin/i3-with-shmlog"))) + (substitute* (string-append out "/share/xsessions/i3.desktop") + (("Exec=i3") (string-append "Exec=" i3))) + (substitute* (string-append out "/share/xsessions/i3-with-shmlog.desktop") + (("Exec=i3-with-shmlog") (string-append "Exec=" i3-with-shmlog))) + #t)))))) (inputs `(("libxcb" ,libxcb) ("xcb-util" ,xcb-util) -- cgit v1.2.3 From 45fb7b404dd5c2112f491ec38a37cda4d525da11 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 30 Apr 2019 02:02:39 +0200 Subject: gnu: Rename some games to match upstream project name. * gnu/packages/games.scm (armagetronad): (cataclysm-dda): (abbaye): (wesnoth): (wesnoth-server): (starfighter): (kiki): (fillets-ng): (crawl): (crawl-tiles): (tome4): (btanks): (battle-tanks): (edgar): Use these as the package definition. (armagetron-advanced): (cataclysm-dark-days-ahead): (l-abbaye-des-morts): (the-battle-for-wesnoth): (the-battle-for-wesnoth-server): (project-starfighter): (kiki-the-nano-bot): (fish-fillets-ng): (dungeon-crawl-stone-soup): (dungeon-crawl-stone-soup-tiles): (tales-of-maj-eyal): (the-legend-of-edgar): Turn these into obsolete aliases. This reverts renames made by the following commits: f95e33a7ad9afe3f5087b4d8c80731d731b08839 b1aee9fce2d4177dc0eb41c8509d50a131a19655 f6a21d61deecc37f8c900f2d2acf01475b917d10 24a67aef2ae0f40f1b4af235f5fc054881dc4db1 36a0b5b48c8f14e2ac5707dd6dfea99ee2304873 8b6e2bc15f0cbbe325f45fff9a7b5d3df143ca53 6639295f2f24ca8334d6b4d9d9cb63bd13388537 184f5c8db199adbc91b4b108c1bf89e3727f0bce ecdb1348ad9992f7d98ea5b1b5b6bc0bafc9b79c 375cb94130b222535ad7c7e0fa0d212483407351 c91ed484d0b66d5639ba01f9ba301ff762d9170d 973bd8a62c13bc5b2ca08585c367589d8c7197fe df42e0f9c9e6a85803d2709d195a8eb29ec7ee5f --- gnu/packages/games.scm | 106 ++++++++++++++++++++++++------------------------- 1 file changed, 53 insertions(+), 53 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index da917e2870..8400849be2 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -288,9 +288,9 @@ Plenty of classic platforming in four nice colors guaranteed! The game includes a built-in editor so you can design and share your own maps.") (license license:gpl2+))) -(define-public armagetron-advanced +(define-public armagetronad (package - (name "armagetron-advanced") + (name "armagetronad") (version "0.2.8.3.4") (source (origin (method url-fetch) @@ -317,8 +317,8 @@ the more advanced player there are new game modes and a wide variety of physics settings to tweak as well.") (license license:gpl2+))) -(define-public armagetronad - (deprecated-package "armagetronad" armagetron-advanced)) +(define-public armagetron-advanced + (deprecated-package "armagetron-advanced" armagetronad)) (define-public bastet (package @@ -384,7 +384,7 @@ Playing bastet can be a painful experience, especially if you usually make canyons and wait for the long I-shaped block to clear four rows at a time.") (license license:gpl3+))) -(define-public cataclysm-dark-days-ahead +(define-public cataclysm-dda (let ((commit "9c732a5de48928691ab863d3ab275ca7b0e522fc")) (package (name "cataclysm-dda") @@ -449,8 +449,8 @@ things far stranger and deadlier, and against the others like yourself, that want what you have.") (license license:cc-by-sa3.0)))) -(define-public cataclysm-dda - (deprecated-package "cataclysm-dda" cataclysm-dark-days-ahead)) +(define-public cataclysm-dark-days-ahead + (deprecated-package "cataclysm-dark-days-ahead" cataclysm-dda)) (define-public cowsay (package @@ -1312,9 +1312,9 @@ can be explored and changed freely.") ;; state "GNU General Public Licence" without specifying a version. (license license:gpl1+))) -(define-public l-abbaye-des-morts +(define-public abbaye (package - (name "l-abbaye-des-morts") + (name "abbaye") (version "2.0.1") (source (origin @@ -1366,8 +1366,8 @@ them, called Jean Raymond, found an old church in which to hide, not knowing that beneath its ruins lay buried an ancient evil.") (license license:gpl3))) -(define-public abbaye - (deprecated-package "abbaye" l-abbaye-des-morts)) +(define-public l-abbaye-des-morts + (deprecated-package "l-abbaye-des-morts" abbaye)) (define-public angband (package @@ -2215,9 +2215,9 @@ the higher you go. The game features multiplayer, unlimited FPS, smooth floor falling, themeable graphics and sounds, and replays.") (license license:gpl3+))) -(define-public the-battle-for-wesnoth +(define-public wesnoth (package - (name "the-battle-for-wesnoth") + (name "wesnoth") (version "1.14.6") (source (origin (method url-fetch) @@ -2255,13 +2255,13 @@ experience and advance levels, and are carried over from one scenario to the next campaign.") (license license:gpl2+))) -(define-public wesnoth - (deprecated-package "wesnoth" the-battle-for-wesnoth)) +(define-public the-battle-for-wesnoth + (deprecated-package "the-battle-for-wesnoth" wesnoth)) -(define-public the-battle-for-wesnoth-server +(define-public wesnoth-server (package - (inherit the-battle-for-wesnoth) - (name "the-battle-for-wesnoth-server") + (inherit wesnoth) + (name "wesnoth-server") (inputs `(("boost" ,boost) ("icu4c" ,icu4c) @@ -2274,8 +2274,8 @@ next campaign.") (description "This package contains a dedicated server for @emph{The Battle for Wesnoth}."))) -(define-public wesnoth-server - (deprecated-package "wesnoth-server" the-battle-for-wesnoth-server)) +(define-public the-battle-for-wesnoth-server + (deprecated-package "the-battle-for-wesnoth-server" wesnoth-server)) (define-public gamine (package @@ -3250,9 +3250,9 @@ tactics.") license:gpl2+ license:lgpl2.1+)))) -(define-public project-starfighter +(define-public starfighter (package - (name "project-starfighter") + (name "starfighter") (version "1.7") (source (origin (method url-fetch) @@ -3285,8 +3285,8 @@ in strikes against the evil corporation.") license:cc0 license:public-domain)))) -(define-public starfighter - (deprecated-package "starfighter" project-starfighter)) +(define-public project-starfighter + (deprecated-package "project-starfighter" starfighter)) (define-public chromium-bsu (package @@ -4116,9 +4116,9 @@ over 100 user-created campaigns.") license:cc-by3.0 license:cc-by-sa3.0)))) -(define-public kiki-the-nano-bot +(define-public kiki (package - (name "kiki-the-nano-bot") + (name "kiki") (version "1.0.2") (source (origin (method url-fetch) @@ -4212,8 +4212,8 @@ small robot living in the nano world, repair its maker.") ;; for a statement from the author. (license license:public-domain))) -(define-public kiki - (deprecated-package "kiki" kiki-the-nano-bot)) +(define-public kiki-the-nano-bot + (deprecated-package "kiki-the-nano-bot" kiki)) (define-public teeworlds (package @@ -4435,9 +4435,9 @@ shapes are arranged in a series of increasingly complex patterns, forming becoming difficult enough to tax even the brightest of minds.") (license license:gpl2+))) -(define-public fish-fillets-ng +(define-public fillets-ng (package - (name "fish-fillets-ng") + (name "fillets-ng") (version "1.0.1") (source (origin (method url-fetch) @@ -4504,12 +4504,12 @@ underwater realm quarrel among themselves or comment on the efforts of your fish. The whole game is accompanied by quiet, comforting music.") (license license:gpl2+))) -(define-public fillets-ng - (deprecated-package "fillets-ng" fish-fillets-ng)) +(define-public fish-fillets-ng + (deprecated-package "fish-fillets-ng" fillets-ng)) -(define-public dungeon-crawl-stone-soup +(define-public crawl (package - (name "dungeon-crawl-stone-soup") + (name "crawl") (version "0.23.2") (source (origin @@ -4586,16 +4586,16 @@ monsters in a quest to find the mystifyingly fabulous Orb of Zot.") license:zlib license:asl2.0)))) -(define-public crawl - (deprecated-package "crawl" dungeon-crawl-stone-soup)) +(define-public dungeon-crawl-stone-soup + (deprecated-package "dungeon-crawl-stone-soup" crawl)) ;; The linter here claims that patch file names should start with the package ;; name. But, in this case, the patches are inherited from crawl with the ;; "crawl-" prefix instead of "crawl-tiles-". -(define-public dungeon-crawl-stone-soup-tiles +(define-public crawl-tiles (package - (inherit dungeon-crawl-stone-soup) - (name "dungeon-crawl-stone-soup-tiles") + (inherit crawl) + (name "crawl-tiles") (arguments (substitute-keyword-arguments (package-arguments crawl) @@ -4625,8 +4625,8 @@ monsters in a quest to find the mystifyingly fabulous Orb of Zot.") ("which" ,which))) (synopsis "Graphical roguelike dungeon crawler game"))) -(define-public crawl-tiles - (deprecated-package "crawl-tiles" dungeon-crawl-stone-soup-tiles)) +(define-public dungeon-crawl-stone-soup-tiles + (deprecated-package "dungeon-crawl-stone-soup-tiles" crawl-tiles)) (define-public lugaru (package @@ -4910,9 +4910,9 @@ Crowther & Woods, its original authors, in 1995. It has been known as \"adventure 2.5\" and \"430-point adventure\".") (license license:bsd-2)))) -(define-public tales-of-maj-eyal +(define-public tome4 (package - (name "tales-of-maj-eyal") + (name "tome4") (version "1.5.10") (synopsis "Single-player, RPG roguelike game set in the world of Eyal") (source @@ -5033,8 +5033,8 @@ intuitive mouse control, streamlined mechanics and deep, challenging combat, Tales of Maj’Eyal offers engaging roguelike gameplay for the 21st century.") (license license:gpl3+))) -(define-public tome4 - (deprecated-package "tome4" tales-of-maj-eyal)) +(define-public tales-of-maj-eyal + (deprecated-package "tales-of-maj-eyal" tome4)) (define-public quakespasm (package @@ -6273,9 +6273,9 @@ to download and install them in @file{$HOME/.stepmania-X.Y/Songs} directory.") (home-page "https://www.stepmania.com") (license license:expat))) -(define-public battle-tanks +(define-public btanks (package - (name "battle-tanks") + (name "btanks") (version "0.9.8083") (source (origin @@ -6359,8 +6359,8 @@ and cooperative.") ;; developers. (license (list license:gpl2+ license:lgpl2.1+)))) -(define-public btanks - (deprecated-package "btanks" battle-tanks)) +(define-public battle-tanks + (deprecated-package "battle-tanks" btanks)) (define-public slingshot (package @@ -6516,9 +6516,9 @@ as a unique casting system where the player draws runes in real time to effect the desired spell.") (license license:gpl3+))) -(define-public the-legend-of-edgar +(define-public edgar (package - (name "the-legend-of-edgar") + (name "edgar") (version "1.31") (source (origin @@ -6561,8 +6561,8 @@ a fortress beyond the forbidden swamp.") (home-page "https://www.parallelrealities.co.uk/games/edgar/") (license license:gpl2+))) -(define-public edgar - (deprecated-package "edgar" the-legend-of-edgar)) +(define-public the-legend-of-edgar + (deprecated-package "the-legend-of-edgar" edgar)) (define-public openclonk (package -- cgit v1.2.3 From 5a3d3d6a3b77ad58dd361b1dfb670e569ea23418 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 27 Apr 2019 13:37:00 +0200 Subject: gnu: Add i3lock. * gnu/packages/wm.scm (i3lock): New public variable. (cherry picked from commit b6afc350514ae5016adc6ca70f7be72aa3ecb2d2) --- gnu/packages/wm.scm | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 687cf9c2ee..ddc6905c82 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -13,7 +13,7 @@ ;;; Copyright © 2016 doncatnip ;;; Copyright © 2016 Ivan Vilata i Balaguer ;;; Copyright © 2017 Mekeor Melire -;;; Copyright © 2017 Marius Bakke +;;; Copyright © 2017, 2019 Marius Bakke ;;; Copyright © 2017 Oleg Pykhalov ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Pierre-Antoine Rouby @@ -233,6 +233,36 @@ i3 uses a plain-text configuration file, and can be extended and controlled from many programming languages.") (license license:bsd-3))) +(define-public i3lock + (package + (name "i3lock") + (version "2.11.1") + (source (origin + (method url-fetch) + (uri (string-append "https://i3wm.org/i3lock/i3lock-" + version ".tar.bz2")) + (sha256 + (base32 + "015dn534m7cxjvqdncpvaq9p8b2r4w5hp1yanbdy2abmhbcc7a7j")))) + (build-system gnu-build-system) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("cairo" ,cairo) + ("libev" ,libev) + ("linux-pam" ,linux-pam) + ("libxcb" ,libxcb) + ("libxkbcommon" ,libxkbcommon) + ("xcb-util" ,xcb-util) + ("xcb-util-image" ,xcb-util-image) + ("xcb-util-xrm" ,xcb-util-xrm))) + (home-page "https://i3wm.org/i3lock/") + (synopsis "Lightweight screen locker") + (description + "i3lock is a simple X11 screen locker developed alongside the i3 project. +Despite the name it should work with any X11 window manager.") + (license license:bsd-3))) + (define-public i3blocks (let ((commit "37f23805ff886639163fbef8aedba71c8071eff8") (revision "1")) -- cgit v1.2.3 From e4b2866cd015a52973063c0b389cf328ef0b9d18 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 30 Apr 2019 16:44:12 +0200 Subject: gnu: libplist: Run tests sequentially. Fixes . Reported by Brendan Tildesley . * gnu/packages/libusb.scm (libplist)[arguments]: New field. --- gnu/packages/libusb.scm | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/libusb.scm b/gnu/packages/libusb.scm index 61329d27a1..5ef62e47fb 100644 --- a/gnu/packages/libusb.scm +++ b/gnu/packages/libusb.scm @@ -314,6 +314,11 @@ wrapper for accessing libusb-1.0.") (base32 "00pnh9zf3iwdji2faccns7vagbmbrwbj9a8zp9s53a6rqaa9czis")))) (build-system gnu-build-system) + (arguments + ;; Tests fail randomly when run in parallel because several of them write + ;; and read to/from the same file--e.g., "4.plist" is accessed by + ;; 'large.test' and 'largecmp.test'. + '(#:parallel-tests? #f)) (inputs `(("python" ,python))) (native-inputs -- cgit v1.2.3 From 094aaa1a1e81b6c5461c1a2aa8ccd9019faa97ec Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 30 Apr 2019 18:29:10 +0200 Subject: gnu: gexiv2: Skip failing test on 32-bit platforms. * gnu/packages/gnome.scm (gexiv2)[arguments]: New field. --- gnu/packages/gnome.scm | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index f19b1836d3..a9e7c20105 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4629,6 +4629,14 @@ classes for commonly used data structures.") (base32 "1qbcwq89g4r67k1dj4laqj441pj4195c8hzhxn8vc6mmg8adg6kx")))) (build-system meson-build-system) + (arguments + ;; On 32-bit platforms, the test fails with a rounding error: + ;; . Just skip it for + ;; now. + (if (and (not (%current-target-system)) + (member (%current-system) '("i686-linux" "armhf-linux"))) + '(#:tests? #f) + '())) (native-inputs `(("glib" ,glib "bin") ("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 4ee55938de315ac965c12a99f5dc98f48ac2cc83 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 28 Apr 2019 20:55:39 -0700 Subject: gnu: u-boot-tools: Only run full test suite on x86_64. * gnu/packages/bootloaders (u-boot-tools)[arguments]<#:phases>[check]: Modify phase. [check-x86]: New phase. [patch]: New phase. --- gnu/packages/bootloaders.scm | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index e1d91b136c..6e6e69ff3b 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -445,6 +445,10 @@ also initializes the boards (RAM etc).") (("def test_ctrl_c") "@pytest.mark.skip(reason='Guix has problems with SIGINT') def test_ctrl_c")) + ;; Test against the tools being installed rather than tools built + ;; for "sandbox" target. + (substitute* "test/image/test-imagetools.sh" + (("BASEDIR=sandbox") "BASEDIR=.")) (for-each (lambda (file) (substitute* file ;; Disable signatures, due to GPL/Openssl @@ -487,12 +491,19 @@ def test_ctrl_c")) (delete 'check) (add-after 'install 'check (lambda* (#:key make-flags test-target #:allow-other-keys) - (apply invoke "make" "mrproper" make-flags) - (setenv "SDL_VIDEODRIVER" "dummy") - (setenv "PAGER" "cat") - (apply invoke "make" test-target make-flags) - (symlink "build-sandbox_spl" "sandbox") - (invoke "test/image/test-imagetools.sh")))))) + (invoke "test/image/test-imagetools.sh"))) + ;; Only run full test suite on x86_64 systems, as many tests + ;; assume x86_64. + ,@(if (string-match "^x86_64-linux" + (or (%current-target-system) + (%current-system))) + '((add-after 'check 'check-x86 + (lambda* (#:key make-flags test-target #:allow-other-keys) + (apply invoke "make" "mrproper" make-flags) + (setenv "SDL_VIDEODRIVER" "dummy") + (setenv "PAGER" "cat") + (apply invoke "make" test-target make-flags)))) + '())))) (description "U-Boot is a bootloader used mostly for ARM boards. It also initializes the boards (RAM etc). This package provides its board-independent tools."))) -- cgit v1.2.3 From 326dcbf1b3c30aa525185fda435c34cb9495dd04 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 1 May 2019 14:11:34 +0200 Subject: gnu: guix: Update to 1.0.0. --- gnu/packages/package-management.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 697a04e098..7afb5dcea8 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -109,9 +109,9 @@ ;; Latest version of Guix, which may or may not correspond to a release. ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. - (let ((version "0.16.0") - (commit "0c329bf4b0c00abdc9a7d9c818d36d4d60b3005d") - (revision 14)) + (let ((version "1.0.0") + (commit "6298c3ffd9654d3231a6f25390b056483e8f407c") + (revision 0)) (package (name "guix") @@ -127,7 +127,7 @@ (commit commit))) (sha256 (base32 - "1403vrazx46w9hcvqjyxa4ipwvqv0432f6rsn4981w1n3p1j4mf6")) + "0qjngigdxxws8lbswmxcp31kzb6wvq8q20yjczj1jj9nbfw0i2z0")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 17acc215bfee2d5ee487add8fc8917fbf9d61132 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 1 May 2019 17:29:02 +0200 Subject: gnu: guix: Update to 326dcbf. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 7afb5dcea8..d80451ce4d 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -110,8 +110,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.0.0") - (commit "6298c3ffd9654d3231a6f25390b056483e8f407c") - (revision 0)) + (commit "326dcbf1b3c30aa525185fda435c34cb9495dd04") + (revision 1)) (package (name "guix") @@ -127,7 +127,7 @@ (commit commit))) (sha256 (base32 - "0qjngigdxxws8lbswmxcp31kzb6wvq8q20yjczj1jj9nbfw0i2z0")) + "0k9v9lh69q353x055id1sq1gx4p8idg8ifrgidv5s73wdil2cflm")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3