;; Note: the 'update-guix-package.scm' script expects this definition to
;; start precisely like this.
(let ((version "1.1.0")
- (commit "2f458ad713143f31365b9c80ed1b98999db8de32")
- (revision 23))
+ (commit "846403ef62066b23c87b6f8a99fd8a551001fc52")
+ (revision 26))
(package
(name "guix")
(commit commit)))
(sha256
(base32
- "1csf8s37babnq5xcp54wgiwcgn9968ha5p52w10mjb24dr7i1m7w"))
+ "1899mfy4hwnz8m9zzjpdvp6fr69j0mn7n9l51l1avrmpdmwnk4sz"))
(file-name (string-append "guix-" version "-checkout"))))
(build-system gnu-build-system)
(arguments
(define-public nix
(package
(name "nix")
- (version "2.3.6")
+ (version "2.3.7")
(source (origin
(method url-fetch)
(uri (string-append "http://nixos.org/releases/nix/nix-"
version "/nix-" version ".tar.xz"))
(sha256
(base32
- "128xf2as0y7hr28x575pbf9lkjpxr9hsxknbavv4p7ywr4lhbs85"))))
+ "15p50jkss6szinisb7axhxybgfi29sm9grz7mxwair8ljj2553yx"))))
(build-system gnu-build-system)
(arguments
- `(#:configure-flags
- (list "--sysconfdir=/etc")
+ `(#:configure-flags '("--sysconfdir=/etc" "--enable-gc")
#:phases
(modify-phases %standard-phases
(replace 'install
(substitute* "configure.ac"
(("^GUILE_PKG.*")
"GUILE_PKG([3.0 2.2])\n"))
+
+ ;; Avoid name clash and build failure now that
+ ;; 'define-json-mapping' is also provided by Guile-JSON, as
+ ;; of version 4.3.
+ (substitute* (find-files "." "\\.scm$")
+ (("define-json-mapping")
+ "define-json-mapping*")
+ (("<=>")
+ "<->"))
#t))
(file-name (string-append "guix-jupyter-" version "-checkout"))))
(build-system gnu-build-system)
(define-public libostree
(package
(name "libostree")
- (version "2020.5")
- (source (origin
- (method url-fetch)
- (uri (string-append
- "https://github.com/ostreedev/ostree/releases/download/v"
- (version-major+minor version) "/libostree-" version ".tar.xz"))
- (sha256
- (base32
- "1k92177hjalbdpmg45ymwwrni68vh9rs5x9zvy5fzl9lng12fgpb"))))
+ (version "2020.6")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://github.com/ostreedev/ostree/releases/download/v"
+ (version-major+minor version) "/libostree-" version ".tar.xz"))
+ (sha256
+ (base32 "0wk9fgj9jl25ns2hcgcb6j24k5mvfn13b02ka0p8l4hdh8c4hpc6"))))
(build-system gnu-build-system)
(arguments
'(#:phases