;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
-;;; Copyright © 2015, 2017 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2015, 2017, 2020 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017 Muriithi Frederick Muriuki <fredmanglis@gmail.com>
;;; Copyright © 2017, 2018 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2017 Roel Janssen <roel@gnu.org>
-;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Julien Lepiller <julien@lepiller.eu>
;;; 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.
;; 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 "0ed97e69805253656df929a6ad678016aa81f08a")
- (revision 6))
+ (let ((version "1.1.0")
+ (commit "619f9181a363576894a433206008b139255062dd")
+ (revision 2))
(package
(name "guix")
(commit commit)))
(sha256
(base32
- "1h2qlbbdqi72jslx17gp2cak5494nbm8j44rz57lnplnfcn6iwaw"))
+ "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)
;; Copy the bootstrap guile tarball in the store used
;; by the test suite.
- (define (intern tarball)
- (let ((base (strip-store-file-name tarball)))
- (copy-file tarball base)
- (invoke "./test-env" "guix" "download"
- (string-append "file://" (getcwd)
- "/" base))
- (delete-file base)))
+ (define (intern file recursive?)
+ ;; Note: don't use 'guix download' here because we
+ ;; need to set the 'recursive?' argument.
+ (define base
+ (strip-store-file-name file))
+
+ (define code
+ `(begin
+ (use-modules (guix))
+ (with-store store
+ (let* ((item (add-to-store store ,base
+ ,recursive?
+ "sha256" ,file))
+ (root (string-append "/tmp/gc-root-"
+ (basename item))))
+ ;; Register a root so that the GC tests
+ ;; don't delete those.
+ (symlink item root)
+ (add-indirect-root store root)))))
+ (invoke "./test-env" "guile" "-c"
+ (object->string code)))
- (intern (assoc-ref inputs "boot-guile"))
+ (intern (assoc-ref inputs "boot-guile") #f)
;; On x86_64 some tests need the i686 Guile.
,@(if (and (not (%current-target-system))
(string=? (%current-system)
"x86_64-linux"))
- '((intern (assoc-ref inputs "boot-guile/i686")))
+ '((intern (assoc-ref inputs "boot-guile/i686") #f))
'())
+
+ ;; Copy the bootstrap executables.
+ (for-each (lambda (input)
+ (intern (assoc-ref inputs input) #t))
+ '("bootstrap/bash" "bootstrap/mkdir"
+ "bootstrap/tar" "bootstrap/xz"))
#t))
(add-after 'unpack 'disable-failing-tests
;; XXX FIXME: These tests fail within the build container.
(inputs
`(("bzip2" ,bzip2)
("gzip" ,gzip)
- ("zlib" ,zlib) ;for 'guix publish'
+ ("zlib" ,zlib) ;for 'guix publish'
("lzlib" ,lzlib) ;for 'guix publish' and 'guix substitute'
("sqlite" ,sqlite)
("guile" ,guile-2.2)
+ ;; Some of the tests use "unshare" when it is available.
+ ("util-linux" ,util-linux)
+
;; Many tests rely on the 'guile-bootstrap' package, which is why we
;; have it here.
("boot-guile" ,(bootstrap-guile-origin (%current-system)))
- ;; Some of the tests use "unshare" when it is available.
- ("util-linux" ,util-linux)
,@(if (and (not (%current-target-system))
(string=? (%current-system) "x86_64-linux"))
`(("boot-guile/i686" ,(bootstrap-guile-origin "i686-linux")))
'())
+ ;; Tests also rely on these bootstrap executables.
+ ("bootstrap/bash" ,(bootstrap-executable "bash" (%current-system)))
+ ("bootstrap/mkdir" ,(bootstrap-executable "mkdir" (%current-system)))
+ ("bootstrap/tar" ,(bootstrap-executable "tar" (%current-system)))
+ ("bootstrap/xz" ,(bootstrap-executable "xz" (%current-system)))
+
("glibc-utf8-locales" ,glibc-utf8-locales)))
(propagated-inputs
`(("gnutls" ,gnutls)
(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)
+ (name "guile3.0-guix")
+ (inputs
+ `(("guile" ,guile-3.0)
+ ,@(alist-delete "guile" (package-inputs guix))))
+ (propagated-inputs
+ `(("gnutls" ,guile3.0-gnutls)
+ ("guile-gcrypt" ,guile3.0-gcrypt)
+ ("guile-json" ,guile3.0-json)
+ ("guile-sqlite3" ,guile3.0-sqlite3)
+ ("guile-ssh" ,guile3.0-ssh)
+ ("guile-git" ,guile3.0-git)))))
(define-public guix-minimal
;; A version of Guix which is built with the minimal set of dependencies, as
(version "1.6.3")
(source
(origin
- (method url-fetch)
- (uri (string-append "https://github.com/Anaconda-Platform/"
- "anaconda-client/archive/" version ".tar.gz"))
- (file-name (string-append name "-" version ".tar.gz"))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/Anaconda-Platform/anaconda-client")
+ (commit version)))
+ (file-name (git-file-name name version))
(sha256
(base32
- "1wv4wi6k5jz7rlwfgvgfdizv77x3cr1wa2aj0k1595g7fbhkjhz2"))))
+ "0w1bfxnydjl9qp53r2gcvr6vlpdqqilcrzqxrll9sgg6vwdyiyyp"))))
(build-system python-build-system)
(propagated-inputs
`(("python-pyyaml" ,python-pyyaml)
(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
;; 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 _
(define-public gwl
(package
(name "gwl")
- (version "0.1.1")
+ (version "0.2.1")
(source (origin
(method url-fetch)
- (uri (string-append "https://www.guixwl.org/releases/gwl-"
- version ".tar.gz"))
+ (uri (string-append "mirror://gnu/gwl/gwl-" version ".tar.gz"))
(sha256
(base32
- "06pm967mq1wyggx7l0nfapw5s0k5qc5r9lawk2v3db868br779a7"))))
+ "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)
- ("pkg-config" ,pkg-config)))
+ ("pkg-config" ,pkg-config)
+ ("texinfo" ,texinfo)
+ ("graphviz" ,graphviz)))
(inputs
- `(("guile" ,guile-2.2)))
+ `(("guile" ,guile-3.0)))
(propagated-inputs
- `(("guix" ,guix)
- ("guile-commonmark" ,guile-commonmark)))
- (home-page "https://www.guixwl.org")
+ `(("guix" ,guile3.0-guix)
+ ("guile-commonmark" ,guile3.0-commonmark)
+ ("guile-gcrypt" ,guile3.0-gcrypt)
+ ("guile-pfds" ,guile3.0-pfds)
+ ("guile-syntax-highlight" ,guile3.0-syntax-highlight)
+ ("guile-wisp" ,guile3.0-wisp)))
+ (home-page "https://workflows.guix.info")
(synopsis "Workflow management extension for GNU Guix")
- (description "This project provides two subcommands to GNU Guix and
-introduces two record types that provide a workflow management extension built
-on top of GNU Guix.")
+ (description "The @dfn{Guix Workflow Language} (GWL) provides an
+extension to GNU Guix's declarative language for package management to
+automate the execution of programs in scientific workflows. The GWL
+can use process engines to integrate with various computing
+environments.")
;; The Scheme modules in guix/ and gnu/ are licensed GPL3+,
;; the web interface modules in gwl/ are licensed AGPL3+,
;; and the fonts included in this package are licensed OFL1.1.
(license (list license:gpl3+ license:agpl3+ license:silofl1.1))))
+(define-public guix-jupyter
+ (package
+ (name "guix-jupyter")
+ (version "0.1.0")
+ (home-page "https://gitlab.inria.fr/guix-hpc/guix-kernel")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference (url home-page)
+ (commit (string-append "v" version))))
+ (sha256
+ (base32
+ "01z7jjkc7r7lj6637rcgpz40v8xqqyfp6871h94yvcnwm7zy9h1n"))
+ (file-name (string-append "guix-jupyter-" version "-checkout"))))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:modules ((srfi srfi-26)
+ (ice-9 match)
+ (ice-9 popen)
+ (ice-9 rdelim)
+ (guix build utils)
+ (guix build gnu-build-system))
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'install 'sed-kernel-json
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (guix (assoc-ref inputs "guix"))
+ (guile (assoc-ref inputs "guile"))
+ (json (assoc-ref inputs "guile-json"))
+ (git (assoc-ref inputs "guile-git"))
+ (bs (assoc-ref inputs "guile-bytestructures"))
+ (s-zmq (assoc-ref inputs "guile-simple-zmq"))
+ (gcrypt (assoc-ref inputs "guile-gcrypt"))
+ (deps (list out s-zmq guix json git bs gcrypt))
+ (effective
+ (read-line
+ (open-pipe* OPEN_READ
+ (string-append guile "/bin/guile")
+ "-c" "(display (effective-version))")))
+ (path (map (cut string-append "-L\", \"" <>
+ "/share/guile/site/"
+ effective)
+ deps))
+ (gopath (map (cut string-append "-C\", \"" <>
+ "/lib/guile/" effective
+ "/site-ccache")
+ deps))
+ (kernel-dir (string-append out "/share/jupyter/kernels/guix/")))
+ (substitute* (string-append kernel-dir "kernel.json")
+ (("-s")
+ (string-join
+ (list (string-join path "\",\n\t\t\"")
+ (string-join gopath "\",\n\t\t\"")
+ "-s")
+ "\",\n\t\t\""))
+ (("guix-jupyter-kernel.scm")
+ (string-append out "/share/guile/site/2.2/"
+ "guix-jupyter-kernel.scm")))
+ #t))))))
+ (native-inputs
+ `(("autoconf" ,autoconf)
+ ("automake" ,automake)
+ ("pkg-config" ,pkg-config)
+
+ ;; For testing.
+ ("jupyter" ,jupyter)
+ ("python-ipython" ,python-ipython)
+ ("python-ipykernel" ,python-ipykernel)))
+ (inputs
+ `(("guix" ,guix)
+ ("guile" ,guile-2.2)))
+ (propagated-inputs
+ `(("guile-json" ,guile-json-3)
+ ("guile-simple-zmq" ,guile-simple-zmq)
+ ("guile-gcrypt" ,guile-gcrypt)))
+ (synopsis "Guix kernel for Jupyter")
+ (description
+ "Guix-Jupyter is a Jupyter kernel. It allows you to annotate notebooks
+with information about their software dependencies, such that code is executed
+in the right software environment. Guix-Jupyter spawns the actual kernels
+such as @code{python-ipykernel} on behalf of the notebook user and runs them
+in an isolated environment, in separate namespaces.")
+ (license license:gpl3+)))
+
(define-public gcab
(package
(name "gcab")
(define-public msitools
(package
(name "msitools")
- (version "0.99")
+ (version "0.100")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/msitools/"
version "/msitools-" version ".tar.xz"))
(sha256
(base32
- "0d9nidn5zc81bc30w119933rn2g87mrsqyqkndg20srkbsd96xfl"))))
+ "1skq17qr2ic4qr3779j49byfm8rncwbsq9rj1a33ncn2m7isdwdv"))))
(build-system gnu-build-system)
(native-inputs
`(("bison" ,bison)
(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)
HCoop / jackhill / guix / guix.git / blobdiff