;; 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 "1.0.1")
- (commit "50299ade040e934fa5533768aacb081eb340af3f")
- (revision 13))
+ (let ((version "1.1.0")
+ (commit "619f9181a363576894a433206008b139255062dd")
+ (revision 2))
(package
(name "guix")
(commit commit)))
(sha256
(base32
- "0rbnyy0vqmsl7z350cdazm5xzx74cdia3nxp0msk8xalyb76hff4"))
+ "1lk0h9zgry7m78nv70gxwb57pw1d5yzay477gxsc43v1aa7zg8sp"))
(file-name (string-append "guix-" version "-checkout"))))
(build-system gnu-build-system)
(arguments
(lambda (port)
(display ,version port)))
+ ;; Install SysV init files to $(prefix)/etc rather
+ ;; than to /etc.
+ (substitute* "nix/local.mk"
+ (("^sysvinitservicedir = .*$")
+ (string-append "sysvinitservicedir = \
+$(prefix)/etc/init.d\n")))
+
(invoke "sh" "bootstrap")))
(add-before 'check 'copy-bootstrap-guile
(lambda* (#:key system inputs #:allow-other-keys)
(invoke "make" "install-binPROGRAMS")))
(delete 'wrap-program)))))))
-(define-public guile2.0-guix
- (deprecated-package "guile2.0-guix" guix))
-
(define-public guile3.0-guix
(package
(inherit guix)
(define-public gwl
(package
(name "gwl")
- (version "0.2.0")
+ (version "0.2.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/gwl/gwl-" version ".tar.gz"))
(sha256
(base32
- "0db1nvy6qzhj9kv834vrlxw7gqv3lih1n4hv5zac1zjmb61ll915"))))
+ "1ji5jvzni8aml9fmimlr11g3k8isrnlvnbzhmwgdjh72hils0alc"))))
(build-system gnu-build-system)
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-before 'build 'fix-tests
+ (lambda _
+ ;; Avoid cross-device link.
+ (substitute* "tests/cache.scm"
+ (("/tmp/gwl-test-input-XXXXXX")
+ (string-append (getcwd) "/gwl-test-input-XXXXXX")))
+ #t)))))
(native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)
(define-public libostree
(package
(name "libostree")
- (version "2019.3")
+ (version "2020.3")
(source (origin
(method url-fetch)
(uri (string-append
(version-major+minor version) "/libostree-" version ".tar.xz"))
(sha256
(base32
- "1r07yqbc9iiq0lzv1pryppd35fv695ym8r040msbfc93pmiy77y0"))))
+ "01cch4as23xspq6pck59al7x5jj60wl21g8p3iqbdxcjl1p3jxsq"))))
(build-system gnu-build-system)
(arguments
'(#:phases
(assoc-ref %build-inputs "bubblewrap")
"/bin/bwrap"))))
(native-inputs `(("bison" ,bison)
- ("gettext" ,gnu-gettext)
+ ("gettext" ,gettext-minimal)
("glib:bin" ,glib "bin") ; for glib-mkenums + gdbus-codegen
("gobject-introspection" ,gobject-introspection)
("libcap" ,libcap)