summaryrefslogtreecommitdiff
path: root/gnu/packages/package-management.scm
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2020-01-06 12:15:04 +0200
committerEfraim Flashner <efraim@flashner.co.il>2020-01-06 12:20:20 +0200
commit6def31e8fd5b5ba1ef06394257bfde610c2cfd18 (patch)
tree002821970406b0fe3c36896d67395030458efb8d /gnu/packages/package-management.scm
parentf711b71bd5ac7c8dca26852f9eec8461d31b73bd (diff)
downloadpatches-6def31e8fd5b5ba1ef06394257bfde610c2cfd18.tar
patches-6def31e8fd5b5ba1ef06394257bfde610c2cfd18.tar.gz
gnu: python-conda: Don't use unstable tarball.
* gnu/packages/package-management.scm (python-conda)[source]: Download using git-fetch. [arguments]: Adjust custom 'remove-failing-tests to make a file writable.
Diffstat (limited to 'gnu/packages/package-management.scm')
-rw-r--r--gnu/packages/package-management.scm15
1 files changed, 9 insertions, 6 deletions
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index 638e773309..b82e2d8b3d 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -9,7 +9,7 @@
;;; Copyright © 2018, 2019 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2018 Sou Bunnbu <iyzsong@member.fsf.org>
;;; Copyright © 2018, 2019 Eric Bavier <bavier@member.fsf.org>
-;;; Copyright © 2019 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2019 Jonathan Brielmaier <jonathan.brielmaier@web.de>
;;;
;;; This file is part of GNU Guix.
@@ -621,13 +621,14 @@ environments.")
(version "4.3.16")
(source
(origin
- (method url-fetch)
- (uri (string-append "https://github.com/conda/conda/archive/"
- version ".tar.gz"))
- (file-name (string-append name "-" version ".tar.gz"))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/conda/conda")
+ (commit version)))
+ (file-name (git-file-name name version))
(sha256
(base32
- "1jq8hyrc5npb5sf4vw6s6by4602yj8f79vzpbwdfgpkn02nfk1dv"))))
+ "1qwy0awx4qf2pbk8z2b7q6wdcq7mvwpxxjhg27mbirdvs5hw7hb2"))))
(build-system python-build-system)
(arguments
`(#:phases
@@ -663,6 +664,8 @@ environments.")
;; directory left when you build with the --keep-failed
;; option
(delete-file "gateways/disk/test_delete.py")
+ ;; This file is no longer writable after downloading with 'git-fetch'
+ (make-file-writable "conda_env/support/saved-env/environment.yml")
#t))))
(replace 'check
(lambda _