;; Note: the 'update-guix-package.scm' script expects this definition to
;; start precisely like this.
(let ((version "1.2.0")
- (commit "dffc918af6cf6e1ce942dd329d210271ced1205d")
- (revision 12))
+ (commit "4dff6ecde85eec473ab231cf75f51e98e8aca1e9")
+ (revision 21))
(package
(name "guix")
(commit commit)))
(sha256
(base32
- "0wcwb09iy4svky5kmxwch7fymmkx78h8haam6p8ix110mm88in8k"))
+ "1n16j7rb4n4pjmp8ck5g206rphmzxii2mbyz1nk4qk70zc3mwszq"))
(file-name (string-append "guix-" version "-checkout"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags (list
+
+ ;; Provide channel metadata for 'guix describe'.
+ ;; Don't pass '--with-channel-url' and
+ ;; '--with-channel-introduction' and instead use
+ ;; the defaults.
+ ,(string-append "--with-channel-commit=" commit)
+
"--localstatedir=/var"
"--sysconfdir=/etc"
(string-append "--with-bash-completion-dir="
(substitute* "nix/local.mk"
(("^openrcservicedir = .*$")
(string-append "openrcservicedir = \
-$(prefix)/etc/init.d\n")))
+$(prefix)/etc/openrc\n")))
(invoke "sh" "bootstrap")))
(add-before 'build 'use-host-compressors
'((assoc-ref inputs "guile"))))
(avahi (assoc-ref inputs "guile-avahi"))
(gcrypt (assoc-ref inputs "guile-gcrypt"))
+ (guile-lib (assoc-ref inputs "guile-lib"))
(json (assoc-ref inputs "guile-json"))
(sqlite (assoc-ref inputs "guile-sqlite3"))
(zlib (assoc-ref inputs "guile-zlib"))
`(("guile-avahi" ,guile-avahi)))
("guile-gcrypt" ,guile-gcrypt)
("guile-json" ,guile-json-4)
+ ("guile-lib" ,guile-lib)
("guile-sqlite3" ,guile-sqlite3)
("guile-zlib" ,guile-zlib)
("guile-lzlib" ,guile-lzlib)
;; XXX: Keep the development inputs here even though
;; they're unnecessary, just so that 'guix environment
;; guix' always contains them.
- ("autoconf" ,autoconf-wrapper)
+ ("autoconf" ,autoconf)
("automake" ,automake)
("gettext" ,gettext-minimal)
("texinfo" ,texinfo)
`(("guile-avahi" ,guile-avahi)))
("guile-gcrypt" ,guile-gcrypt)
("guile-json" ,guile-json-4)
+ ("guile-lib" ,guile-lib)
("guile-sqlite3" ,guile-sqlite3)
("guile-ssh" ,guile-ssh)
("guile-git" ,guile-git)
(define-public rpm
(package
(name "rpm")
- (version "4.16.1.2")
+ (version "4.16.1.3")
(source (origin
(method url-fetch)
(uri (string-append "http://ftp.rpm.org/releases/rpm-"
version ".tar.bz2"))
(sha256
(base32
- "1k6ank2aad7r503w12m6m494mxr6iccj52wqhwbc94pwxsf34mw3"))))
+ "07g2g0adgjm29wqy94iqhpp5dk0hacfw1yf7kzycrrxnfbwwfgai"))))
(build-system gnu-build-system)
(arguments
'(#:configure-flags '("--with-external-db" ;use the system's bdb
(define-public gwl
(package
(name "gwl")
- (version "0.2.1")
+ (version "0.3.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/gwl/gwl-" version ".tar.gz"))
(sha256
(base32
- "1ji5jvzni8aml9fmimlr11g3k8isrnlvnbzhmwgdjh72hils0alc"))))
+ "1lqif00mq7fsaknbc2gvvcv1j89k311sm44jp9jklbrv0v2lc83n"))))
(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)))))
+ `(#:parallel-build? #false ; for reproducibility
+ #:make-flags
+ '("GUILE_AUTO_COMPILE=0")))
(native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)
("texinfo" ,texinfo)
("graphviz" ,graphviz)))
(inputs
- `(("guile" ,@(assoc-ref (package-native-inputs guix) "guile"))))
- (propagated-inputs
- `(("guix" ,guix)
- ("guile-commonmark" ,guile-commonmark)
- ("guile-gcrypt" ,guile-gcrypt)
- ("guile-pfds" ,guile-pfds)
- ("guile-syntax-highlight" ,guile-syntax-highlight)
- ("guile-wisp" ,guile-wisp)))
+ (let ((p (package-input-rewriting
+ `((,guile-3.0 . ,guile-3.0-latest))
+ #:deep? #false)))
+ `(("guix" ,guix)
+ ("guile" ,guile-3.0-latest)
+ ("guile-commonmark" ,(p guile-commonmark))
+ ("guile-config" ,(p guile-config))
+ ("guile-gcrypt" ,(p guile-gcrypt))
+ ("guile-pfds" ,(p guile-pfds))
+ ("guile-syntax-highlight" ,(p guile-syntax-highlight))
+ ("guile-wisp" ,(p guile-wisp)))))
(home-page "https://workflows.guix.info")
(synopsis "Workflow management extension for GNU Guix")
(description "The @dfn{Guix Workflow Language} (GWL) provides an
(license (list license:gpl3+ license:agpl3+ license:silofl1.1))))
(define-public guix-build-coordinator
- (let ((commit "b5d998c22f7d4db3e26166ada9489af363f2d47a")
- (revision "15"))
+ (let ((commit "6fb5eafc33efa109b220efe71594cfcdb2efe133")
+ (revision "24"))
(package
(name "guix-build-coordinator")
(version (git-version "0" revision commit))
(commit commit)))
(sha256
(base32
- "1jfmwfx7cvfsvryc3w70nw6mixdamjymkqh40qkv99sspkd86dkr"))
+ "1lf7jry18kwglvyakfkmi8bif8ppsdinl0xjgmkgkp4mvmymh2gj"))
(file-name (string-append name "-" version "-checkout"))))
(build-system gnu-build-system)
(arguments
(setenv "GUILE_AUTO_COMPILE" "0")
#t))
(add-after 'install 'wrap-executable
- (lambda* (#:key inputs outputs #:allow-other-keys)
+ (lambda* (#:key inputs outputs target #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin"))
(guile (assoc-ref inputs "guile"))
(for-each
(lambda (file)
(simple-format (current-error-port) "wrapping: ~A\n" file)
- (wrap-program file
- `("PATH" ":" prefix
- (,bin
- ;; Support building without sqitch as an input, as it
- ;; can't be cross-compiled yet
- ,@(or (and=> (assoc-ref inputs "sqitch")
- list)
- '())))
- `("GUILE_LOAD_PATH" ":" prefix
- (,scm ,(getenv "GUILE_LOAD_PATH")))
- `("GUILE_LOAD_COMPILED_PATH" ":" prefix
- (,go ,(getenv "GUILE_LOAD_COMPILED_PATH")))))
+ (let ((guile-inputs (list
+ "guile-json"
+ "guile-gcrypt"
+ "guix"
+ "guile-prometheus"
+ "guile-lib"
+ "guile-lzlib"
+ "guile-zlib"
+ "gnutls"
+ ,@(if (hurd-target?)
+ '()
+ '("guile-fibers")))))
+ (wrap-program file
+ `("PATH" ":" prefix
+ (,bin
+ ;; Support building without sqitch as an input, as it
+ ;; can't be cross-compiled yet
+ ,@(or (and=> (assoc-ref inputs "sqitch")
+ list)
+ '())))
+ `("GUILE_LOAD_PATH" ":" prefix
+ (,scm ,(string-join
+ (map (lambda (input)
+ (simple-format
+ #f "~A/share/guile/site/~A"
+ (assoc-ref inputs input)
+ version))
+ guile-inputs)
+ ":")))
+ `("GUILE_LOAD_COMPILED_PATH" ":" prefix
+ (,go ,(string-join
+ (map (lambda (input)
+ (simple-format
+ #f "~A/lib/guile/~A/site-ccache"
+ (assoc-ref inputs input)
+ version))
+ guile-inputs)
+ ":"))))
+ (when target
+ ;; XXX work around wrap-program picking bash for the
+ ;; host rather than target
+ (let ((bash (assoc-ref inputs "bash")))
+ (substitute* file
+ (("^#!.*/bash")
+ (string-append "#! " bash "/bin/bash")))))))
(find-files bin)))
#t))
(delete 'strip)))) ; As the .go files aren't compatible
("guile" ,@(assoc-ref (package-native-inputs guix) "guile"))))
(inputs
`(("guile" ,@(assoc-ref (package-native-inputs guix) "guile"))
+ ,@(if (%current-target-system)
+ `(("bash" ,bash-minimal))
+ '())
("sqlite" ,sqlite)
,@(if (hurd-target?)
'()
(define-public flatpak
(package
(name "flatpak")
- (version "1.10.1")
+ (version "1.10.2")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/flatpak/flatpak/releases/download/"
version "/flatpak-" version ".tar.xz"))
(sha256
- (base32 "1dywvfpmszvp2wy5hvpzy8z6gz2gzmi9p302njp52p9vpx14ydf1"))))
+ (base32 "1r6xw7r3ir2vaa30n3mily6m7d51cf4qv22fkqlzzy3js0wjf5fv"))))
;; Wrap 'flatpak' so that GIO_EXTRA_MODULES is set, thereby allowing GIO to
;; find the TLS backend in glib-networking.
HCoop / jackhill / guix / guix.git / blobdiff