summaryrefslogtreecommitdiff
path: root/gnu/packages/package-management.scm
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2021-11-17 23:24:42 +0100
committerLudovic Courtès <ludo@gnu.org>2021-11-17 23:43:14 +0100
commit3a317f7476f8c6012e166ff9f340f861938721c9 (patch)
tree946e398c37912cfc03be7306951ae87bfeb130fa /gnu/packages/package-management.scm
parente55547bf70384691712047912c793c517debd2ec (diff)
parent62e707d67caf1dab2af411a69ff8cec4b2dc686e (diff)
downloadguix-patches-3a317f7476f8c6012e166ff9f340f861938721c9.tar
guix-patches-3a317f7476f8c6012e166ff9f340f861938721c9.tar.gz
Merge branch 'master' into core-updates-frozen
Diffstat (limited to 'gnu/packages/package-management.scm')
-rw-r--r--gnu/packages/package-management.scm18
1 files changed, 6 insertions, 12 deletions
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index c7547264e9..ead43c21ce 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -146,8 +146,8 @@
;; 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")
@@ -163,7 +163,7 @@
(commit commit)))
(sha256
(base32
- "0mmq0ypkxj6dc1r9j1mdgih87h6fc0mk05hp481cjp8shdc1w6gw"))
+ "1p0my0gfshdhm1dpqf6j68iipnigmpb23l8p81kwpw5w50x0hfda"))
(file-name (string-append "guix-" version "-checkout"))))
(build-system gnu-build-system)
(arguments
@@ -532,9 +532,6 @@ the Nix package manager.")
(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
@@ -1042,9 +1039,6 @@ it easy to create independent environments even for C libraries. Conda is
written entirely in Python.")
(license license:bsd-3)))
-(define-public python-conda
- (deprecated-package "python-conda" conda))
-
(define-public conan
(package
(name "conan")
@@ -1251,8 +1245,8 @@ environments.")
(license (list license:gpl3+ license:agpl3+ license:silofl1.1))))
(define-public guix-build-coordinator
- (let ((commit "a4d0ec6bc564bbe98d3e6c03be41de16edbda928")
- (revision "35"))
+ (let ((commit "200ffe795bd36052b64f7868c71a92925ee7beca")
+ (revision "37"))
(package
(name "guix-build-coordinator")
(version (git-version "0" revision commit))
@@ -1263,7 +1257,7 @@ environments.")
(commit commit)))
(sha256
(base32
- "0qa7qkskp9xzhyl0fgbm98f8apy8cn2yc9gpxhw0dfc9bkbs1pb9"))
+ "09j67zdx5h6ic2yvzn1vvhmwlsj7kb06s765yjnvpnsb228ja96s"))
(file-name (string-append name "-" version "-checkout"))))
(build-system gnu-build-system)
(arguments