diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-04-30 23:47:49 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-04-30 23:47:49 +0200 |
| commit | 8bf8cd9b85c85be387565f6c8ca9f6c72196fb8e (patch) | |
| tree | 6fa0f8ba32b83a996625bc188903ccebfb7e7c2c /gnu/packages/package-management.scm | |
| parent | 5d9e2187929ed7e8d46ec3cb3174fd78c1846360 (diff) | |
| parent | 229f4fa9522fb56b014ee9c0d8111e8fb6da764d (diff) | |
| download | guix-patches-8bf8cd9b85c85be387565f6c8ca9f6c72196fb8e.tar guix-patches-8bf8cd9b85c85be387565f6c8ca9f6c72196fb8e.tar.gz | |
Merge branch 'master' into core-updates
Conflicts:
gnu/local.mk
gnu/packages/backup.scm
gnu/packages/emacs-xyz.scm
gnu/packages/guile.scm
gnu/packages/lisp.scm
gnu/packages/openldap.scm
gnu/packages/package-management.scm
gnu/packages/web.scm
gnu/packages/xorg.scm
Diffstat (limited to 'gnu/packages/package-management.scm')
| -rw-r--r-- | gnu/packages/package-management.scm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 85cfae25e0..4f3508109f 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -112,7 +112,7 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.1.0") - (commit "569c55bee2a74106b3ab8a07187ea9cd8cce410e") + (commit "619f9181a363576894a433206008b139255062dd") (revision 2)) (package (name "guix") @@ -129,7 +129,7 @@ (commit commit))) (sha256 (base32 - "036lg8qj6hh2093lqwxdmwdir8frck8ap5king8sl4j29yc59jzc")) + "1lk0h9zgry7m78nv70gxwb57pw1d5yzay477gxsc43v1aa7zg8sp")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments |