;;; Copyright © 2018, 2019 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2019 Jonathan Brielmaier <jonathan.brielmaier@web.de>
+;;; Copyright © 2020 Mathieu Othacehe <m.othacehe@gmail.com>
+;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2020 Giacomo Leidi <goodoldpaul@autistici.org>
+;;; Copyright © 2020 Jesse Gibbons <jgibbons2357+guix@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
#:use-module (gnu packages autotools)
#:use-module (gnu packages backup)
#:use-module (gnu packages base)
+ #:use-module (gnu packages bash)
#:use-module (gnu packages bdw-gc)
#:use-module (gnu packages bison)
+ #:use-module (gnu packages boost)
#:use-module (gnu packages bootstrap) ;for 'bootstrap-guile-origin'
#:use-module (gnu packages check)
#:use-module (gnu packages compression)
#:use-module (gnu packages gtk)
#:use-module (gnu packages guile)
#:use-module (gnu packages guile-xyz)
+ #:use-module (gnu packages hurd)
+ #:use-module (gnu packages libedit)
#:use-module (gnu packages linux)
#:use-module (gnu packages lisp)
#:use-module (gnu packages man)
#:use-module (gnu packages nettle)
+ #:use-module (gnu packages networking)
#:use-module (gnu packages nss)
#:use-module (gnu packages patchutils)
#:use-module (gnu packages perl)
;; 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 "c2f9ea2b502a617bb69227d5f858eee9d4288a6a")
- (revision 14))
+ (let ((version "1.1.0")
+ (commit "218a67dfabcdf592325a8f8c49b86478f69ff589")
+ (revision 18))
(package
(name "guix")
(commit commit)))
(sha256
(base32
- "0hg6yrqlzqiv4gmk9liqar6m9qhhn66q75jsmh86awjwq4qmvyab"))
+ "0zjpfagd377i977xv1ljzl0cj4vlrk4qpyqmlhclcdkjfbbachaq"))
(file-name (string-append "guix-" version "-checkout"))))
(build-system gnu-build-system)
(arguments
;; To avoid problems with the length of shebangs,
;; choose a fixed-width and short directory name
;; for tests.
- "ac_cv_guix_test_root=/tmp/guix-tests")
+ "ac_cv_guix_test_root=/tmp/guix-tests"
+ ,@(if (hurd-target?) '("--with-courage") '()))
#:parallel-tests? #f ;work around <http://bugs.gnu.org/21097>
#:modules ((guix build gnu-build-system)
(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 'build 'use-host-compressors
+ (lambda* (#:key inputs target #:allow-other-keys)
+ (when target
+ ;; Use host compressors.
+ (let ((bzip2 (assoc-ref inputs "bzip2"))
+ (gzip (assoc-ref inputs "gzip"))
+ (xz (assoc-ref inputs "xz")))
+ (substitute* "guix/config.scm"
+ (("\"[^\"]*/bin/bzip2")
+ (string-append "\"" bzip2 "/bin/bzip2"))
+ (("\"[^\"]*/bin/gzip") gzip
+ (string-append "\"" gzip "/bin/gzip"))
+ (("\"[^\"]*/bin//xz")
+ (string-append "\"" xz "/bin/xz")))))
+ #t))
(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.
+ (lambda* (#:key system target inputs #:allow-other-keys)
+ ;; Copy the bootstrap guile tarball in the store
+ ;; used by the test suite.
(define (intern file recursive?)
;; Note: don't use 'guix download' here because we
;; need to set the 'recursive?' argument.
(invoke "./test-env" "guile" "-c"
(object->string code)))
- (intern (assoc-ref inputs "boot-guile") #f)
+ (unless target
+ (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") #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") #f))
+ '())
- ;; Copy the bootstrap executables.
- (for-each (lambda (input)
- (intern (assoc-ref inputs input) #t))
- '("bootstrap/bash" "bootstrap/mkdir"
- "bootstrap/tar" "bootstrap/xz"))
+ ;; 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.
(setenv "SHELL" (which "sh"))
#t))
(add-after 'install 'wrap-program
- (lambda* (#:key inputs outputs #:allow-other-keys)
+ (lambda* (#:key inputs native-inputs outputs target
+ #:allow-other-keys)
;; Make sure the 'guix' command finds GnuTLS,
;; Guile-JSON, and Guile-Git automatically.
(let* ((out (assoc-ref outputs "out"))
- (guile (assoc-ref inputs "guile"))
+ (guile ,@(if (%current-target-system)
+ '((assoc-ref native-inputs "guile"))
+ '((assoc-ref inputs "guile"))))
(gcrypt (assoc-ref inputs "guile-gcrypt"))
(json (assoc-ref inputs "guile-json"))
(sqlite (assoc-ref inputs "guile-sqlite3"))
`("GUILE_LOAD_COMPILED_PATH" ":" prefix (,gopath))
`("GUIX_LOCPATH" ":" suffix (,locpath)))
+ (when target
+ ;; XXX Touching wrap-program rebuilds world
+ (let ((bash (assoc-ref inputs "bash")))
+ (substitute* (string-append out "/bin/guix")
+ (("^#!.*/bash") (string-append "#! " bash "/bin/bash")))))
#t))))))
(native-inputs `(("pkg-config" ,pkg-config)
+ ;; Guile libraries are needed here for
+ ;; cross-compilation.
+ ("guile" ,guile-3.0-latest) ;for faster builds
+ ("gnutls" ,gnutls)
+ ("guile-gcrypt" ,guile-gcrypt)
+ ("guile-json" ,guile-json-4)
+ ("guile-sqlite3" ,guile-sqlite3)
+ ("guile-ssh" ,guile-ssh)
+ ("guile-git" ,guile-git)
+
;; XXX: Keep the development inputs here even though
;; they're unnecessary, just so that 'guix environment
;; guix' always contains them.
("sqlite" ,sqlite)
("libgcrypt" ,libgcrypt)
- ("guile" ,guile-2.2)
+ ("guile" ,guile-3.0-latest)
;; Some of the tests use "unshare" when it is available.
("util-linux" ,util-linux)
(string=? (%current-system) "x86_64-linux"))
`(("boot-guile/i686" ,(bootstrap-guile-origin "i686-linux")))
'())
+ ,@(if (%current-target-system)
+ `(("bash" ,bash-minimal)
+ ("xz" ,xz))
+ '())
;; Tests also rely on these bootstrap executables.
("bootstrap/bash" ,(bootstrap-executable "bash" (%current-system)))
("glibc-utf8-locales" ,glibc-utf8-locales)))
(propagated-inputs
- `(("gnutls" ,gnutls)
+ `(("gnutls" ,(if (%current-target-system) gnutls-3.6.14 guile3.0-gnutls))
("guile-gcrypt" ,guile-gcrypt)
- ("guile-json" ,guile-json-3)
+ ("guile-json" ,guile-json-4)
("guile-sqlite3" ,guile-sqlite3)
("guile-ssh" ,guile-ssh)
("guile-git" ,guile-git)))
(fold alist-delete (package-native-inputs guix)
'("po4a" "graphviz" "help2man")))
(inputs
- `(("gnutls" ,gnutls)
+ `(("gnutls" ,guile3.0-gnutls)
("guile-git" ,guile-git)
("guile-json" ,guile-json-3)
("guile-gcrypt" ,guile-gcrypt)
(invoke "make" "install-binPROGRAMS")))
(delete 'wrap-program)))))))
-(define-public guile2.0-guix
- (deprecated-package "guile2.0-guix" guix))
-(define-public guile3.0-guix
+(define-public guile2.2-guix
(package
(inherit guix)
- (name "guile3.0-guix")
+ (name "guile2.2-guix")
+ (native-inputs
+ `(("guile" ,guile-2.2)
+ ("gnutls" ,guile2.2-gnutls)
+ ("guile-gcrypt" ,guile2.2-gcrypt)
+ ("guile-json" ,guile2.2-json)
+ ("guile-sqlite3" ,guile2.2-sqlite3)
+ ("guile-ssh" ,guile2.2-ssh)
+ ("guile-git" ,guile2.2-git)
+ ,@(fold alist-delete (package-native-inputs guix)
+ '("guile" "gnutls" "guile-gcrypt" "guile-json"
+ "guile-sqlite3" "guile-ssh" "guile-git"))))
(inputs
- `(("guile" ,guile-3.0)
+ `(("guile" ,guile-2.2)
,@(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)))))
+ `(("gnutls" ,gnutls)
+ ("guile-gcrypt" ,guile2.2-gcrypt)
+ ("guile-json" ,guile2.2-json)
+ ("guile-sqlite3" ,guile2.2-sqlite3)
+ ("guile-ssh" ,guile2.2-ssh)
+ ("guile-git" ,guile2.2-git)))))
+
+(define-public guile3.0-guix
+ (deprecated-package "guile3.0-guix" guix))
(define-public guix-minimal
;; A version of Guix which is built with the minimal set of dependencies, as
(package
(inherit guix)
(name "guix-minimal")
- (inputs
- `(("guile" ,guile-2.2)
- ,@(alist-delete "guile" (package-inputs guix))))
+ (native-inputs
+ (fold alist-delete
+ (package-native-inputs guix)
+ '("guile-ssh")))
(propagated-inputs
(fold alist-delete
(package-propagated-inputs guix)
(define-public nix
(package
(name "nix")
- (version "2.0.4")
+ (version "2.3.6")
(source (origin
(method url-fetch)
(uri (string-append "http://nixos.org/releases/nix/nix-"
version "/nix-" version ".tar.xz"))
(sha256
(base32
- "0ss9svxlh1pvrdmnqjvjyqjmbqmrdbyfarvbb14i9d4bggzl0r8n"))))
+ "128xf2as0y7hr28x575pbf9lkjpxr9hsxknbavv4p7ywr4lhbs85"))))
(build-system gnu-build-system)
+ (arguments
+ `(#:configure-flags
+ (list "--sysconfdir=/etc")
+ #:phases
+ (modify-phases %standard-phases
+ (replace 'install
+ ;; Don't try & fail to create subdirectories in /etc, but keep them
+ ;; in the output as examples.
+ (lambda* (#:key (make-flags '()) outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (etc (string-append out "/etc")))
+ (apply invoke "make" "install"
+ (string-append "sysconfdir=" etc)
+ (string-append "profiledir=" etc "/profile.d")
+ make-flags)))))))
(native-inputs `(("pkg-config" ,pkg-config)))
- (inputs `(("curl" ,curl)
+ (inputs `(("boost" ,boost)
+ ("brotli" ,brotli)
("bzip2" ,bzip2)
+ ("curl" ,curl)
+ ("editline" ,editline)
("libgc" ,libgc)
("libseccomp" ,libseccomp)
("libsodium" ,libsodium)
("texinfo" ,texinfo)
("graphviz" ,graphviz)))
(inputs
- `(("guile" ,guile-3.0)))
+ `(("guile" ,@(assoc-ref (package-native-inputs guix) "guile"))))
(propagated-inputs
- `(("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)))
+ `(("guix" ,guix)
+ ("guile-commonmark" ,guile-commonmark)
+ ("guile-gcrypt" ,guile-gcrypt)
+ ("guile-pfds" ,guile-pfds)
+ ("guile-syntax-highlight" ,guile-syntax-highlight)
+ ("guile-wisp" ,guile-wisp)))
(home-page "https://workflows.guix.info")
(synopsis "Workflow management extension for GNU Guix")
(description "The @dfn{Guix Workflow Language} (GWL) provides an
(sha256
(base32
"01z7jjkc7r7lj6637rcgpz40v8xqqyfp6871h94yvcnwm7zy9h1n"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ ;; Allow builds with Guile 3.0.
+ (substitute* "configure.ac"
+ (("^GUILE_PKG.*")
+ "GUILE_PKG([3.0 2.2])\n"))
+ #t))
(file-name (string-append "guix-jupyter-" version "-checkout"))))
(build-system gnu-build-system)
(arguments
"-s")
"\",\n\t\t\""))
(("guix-jupyter-kernel.scm")
- (string-append out "/share/guile/site/2.2/"
+ (string-append out "/share/guile/site/3.0/"
"guix-jupyter-kernel.scm")))
#t))))))
(native-inputs
("python-ipykernel" ,python-ipykernel)))
(inputs
`(("guix" ,guix)
- ("guile" ,guile-2.2)))
+ ("guile" ,@(assoc-ref (package-native-inputs guix) "guile"))))
(propagated-inputs
- `(("guile-json" ,guile-json-3)
+ `(("guile-json" ,guile-json-4)
("guile-simple-zmq" ,guile-simple-zmq)
("guile-gcrypt" ,guile-gcrypt)))
(synopsis "Guix kernel for Jupyter")
("glib" ,glib)
("libgsf" ,libgsf)
("libxml2" ,libxml2)
- ("uuid" ,util-linux)))
+ ("uuid" ,util-linux "lib")))
(home-page "https://wiki.gnome.org/msitools")
(synopsis "Windows Installer file manipulation tool")
(description
(define-public libostree
(package
(name "libostree")
- (version "2020.2")
+ (version "2020.4")
(source (origin
(method url-fetch)
(uri (string-append
(version-major+minor version) "/libostree-" version ".tar.xz"))
(sha256
(base32
- "0bbk0sg4m38g7j00hy358p2azxas87minpgz3avwma6jsylj1qjg"))))
+ "0s13cjrpx5r1dc9j9c9924zak45wl9nlbg9hiwgpsal80l92c39n"))))
(build-system gnu-build-system)
(arguments
'(#:phases
(define-public flatpak
(package
(name "flatpak")
- (version "1.4.3")
+ (version "1.8.0")
(source
(origin
(method url-fetch)
version "/flatpak-" version ".tar.xz"))
(sha256
(base32
- "11bfxmv8pxlb5x0lb2rsl45615fzfvq5r6wldf0l6ab2ngryd7i7"))))
+ "0d4x79z96r60rc2gnf415da7z9x1my5hdyjdlklfiwll57jbqr23"))))
;; Wrap 'flatpak' so that GIO_EXTRA_MODULES is set, thereby allowing GIO to
;; find the TLS backend in glib-networking.
(build-system glib-or-gtk-build-system)
(arguments
- '(#:tests? #f ;; Tests fail due to trying to create files where it can't.
- #:configure-flags (list
- "--enable-documentation=no" ;; FIXME
- "--enable-system-helper=no"
- "--localstatedir=/var"
- (string-append "--with-system-bubblewrap="
- (assoc-ref %build-inputs "bubblewrap")
- "/bin/bwrap"))))
- (native-inputs `(("bison" ,bison)
- ("gettext" ,gnu-gettext)
- ("glib:bin" ,glib "bin") ; for glib-mkenums + gdbus-codegen
- ("gobject-introspection" ,gobject-introspection)
- ("libcap" ,libcap)
- ("pkg-config" ,pkg-config)))
+ '(#:configure-flags
+ (list
+ "--enable-documentation=no" ;; FIXME
+ "--enable-system-helper=no"
+ "--localstatedir=/var"
+ (string-append "--with-system-bubblewrap="
+ (assoc-ref %build-inputs "bubblewrap")
+ "/bin/bwrap")
+ (string-append "--with-system-dbus-proxy="
+ (assoc-ref %build-inputs "xdg-dbus-proxy")
+ "/bin/xdg-dbus-proxy"))
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'fix-tests
+ (lambda* (#:key inputs #:allow-other-keys)
+ (copy-recursively
+ (string-append (assoc-ref inputs "glibc-utf8-locales")
+ "/lib/locale/") "/tmp/locale")
+ (for-each make-file-writable (find-files "/tmp"))
+ (substitute* "tests/make-test-runtime.sh"
+ (("cp `which.*") "echo guix\n")
+ (("cp -r /usr/lib/locale/C\\.\\*")
+ (string-append "mkdir ${DIR}/usr/lib/locale/en_US; \
+cp -r /tmp/locale/*/en_US.*")))
+ (substitute* "tests/libtest.sh"
+ (("/bin/kill") (which "kill"))
+ (("/usr/bin/python3") (which "python3")))
+ #t))
+ ;; Many tests fail for unknown reasons, so we just run a few basic
+ ;; tests
+ (replace 'check
+ (lambda _
+ (setenv "HOME" "/tmp")
+ (invoke "make" "check"
+ "TESTS=tests/test-basic.sh tests/test-config.sh testcommon"))))))
+ (native-inputs
+ `(("bison" ,bison)
+ ("dbus" ,dbus) ; for dbus-daemon
+ ("gettext" ,gettext-minimal)
+ ("glib:bin" ,glib "bin") ; for glib-mkenums + gdbus-codegen
+ ("glibc-utf8-locales" ,glibc-utf8-locales)
+ ("gobject-introspection" ,gobject-introspection)
+ ("libcap" ,libcap)
+ ("pkg-config" ,pkg-config)
+ ("python" ,python)
+ ("python-pyparsing" ,python-pyparsing)
+ ("socat" ,socat)
+ ("which" ,which)))
(propagated-inputs `(("glib-networking" ,glib-networking)
("gnupg" ,gnupg)
("gsettings-desktop-schemas"
,gsettings-desktop-schemas)))
- (inputs `(("appstream-glib" ,appstream-glib)
- ("bubblewrap" ,bubblewrap)
- ("dconf" ,dconf)
- ("fuse" ,fuse)
- ("gdk-pixbuf" ,gdk-pixbuf)
- ("gpgme" ,gpgme)
- ("json-glib" ,json-glib)
- ("libarchive" ,libarchive)
- ("libostree" ,libostree)
- ("libseccomp" ,libseccomp)
- ("libsoup" ,libsoup)
- ("libxau" ,libxau)
- ("libxml2" ,libxml2)
- ("util-linux" ,util-linux)))
+ (inputs
+ `(("appstream-glib" ,appstream-glib)
+ ("bubblewrap" ,bubblewrap)
+ ("dconf" ,dconf)
+ ("fuse" ,fuse)
+ ("gdk-pixbuf" ,gdk-pixbuf)
+ ("gpgme" ,gpgme)
+ ("json-glib" ,json-glib)
+ ("libarchive" ,libarchive)
+ ("libostree" ,libostree)
+ ("libseccomp" ,libseccomp)
+ ("libsoup" ,libsoup)
+ ("libxau" ,libxau)
+ ("libxml2" ,libxml2)
+ ("util-linux" ,util-linux)
+ ("xdg-dbus-proxy" ,xdg-dbus-proxy)))
(home-page "https://flatpak.org")
(synopsis "System for building, distributing, and running sandboxed desktop
applications")
HCoop / jackhill / guix / guix.git / blobdiff