;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015, 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017 Muriithi Frederick Muriuki <fredmanglis@gmail.com>
;;; Copyright © 2017, 2018 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2018 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2018 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2018 Sou Bunnbu <iyzsong@member.fsf.org>
+;;; Copyright © 2018 Eric Bavier <bavier@member.fsf.org>
+;;; Copyright © 2019 Efraim Flashner <efraim@flashner.co.il>
;;;
;;; This file is part of GNU Guix.
;;;
#:use-module (gnu packages gnupg)
#:use-module (gnu packages gnuzilla)
#:use-module (gnu packages graphviz)
+ #:use-module (gnu packages gtk)
#:use-module (gnu packages guile)
#:use-module (gnu packages linux)
#:use-module (gnu packages lisp)
#:use-module (gnu packages popt)
#:use-module (gnu packages python)
#:use-module (gnu packages python-web)
+ #:use-module (gnu packages python-xyz)
#:use-module (gnu packages serialization)
+ #:use-module (gnu packages sqlite)
#:use-module (gnu packages ssh)
#:use-module (gnu packages texinfo)
#:use-module (gnu packages time)
#:use-module (gnu packages tls)
#:use-module (gnu packages vim)
+ #:use-module (gnu packages virtualization)
#:use-module (gnu packages web)
#:use-module (gnu packages xml)
+ #:use-module (gnu packages xorg)
#:use-module (guix build-system emacs)
#:use-module (guix build-system gnu)
#:use-module (guix build-system meson)
;; 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 "0.15.0")
- (commit "1d0be47ab680db938ac8da1ee65e1de91e198f67")
- (revision 5))
+ (let ((version "0.16.0")
+ (commit "7ba2b27467a39956f10e2e11061d9569e4b7d632")
+ (revision 8))
(package
(name "guix")
(commit commit)))
(sha256
(base32
- "19cn4ndmr9cqd7qh6w3nchbmdpaawdl9kc6g0v6g680vzcja417k"))
+ "14srgkl0vyr6q7azv76nncp63gngmm71y18ybyj9f6l6s4shbcm4"))
(file-name (string-append "guix-" version "-checkout"))))
(build-system gnu-build-system)
(arguments
(map (cut string-append <>
"/share/guile/site/"
effective)
- deps)
+ (delete #f deps))
":"))
(gopath (string-join
(map (cut string-append <>
"/lib/guile/" effective
"/site-ccache")
- deps)
+ (delete #f deps))
":")))
(wrap-program (string-append out "/bin/guix")
("sqlite" ,sqlite)
("libgcrypt" ,libgcrypt)
- ;; Use 2.2.4 to avoid various thread-safety issues while building
- ;; code in parallel.
- ("guile" ,guile-2.2.4)
+ ("guile" ,guile-2.2)
;; Many tests rely on the 'guile-bootstrap' package, which is why we
;; have it here.
(inputs
`(("gnutls" ,gnutls)
("guile-git" ,guile-git)
+ ("guile-json" ,guile-json)
("guile-gcrypt" ,guile-gcrypt)
,@(fold alist-delete (package-inputs guix)
'("boot-guile" "boot-guile/i686" "util-linux"))))
"install-nodist_pkglibexecSCRIPTS")
;; We need to tell 'guix-daemon' which 'guix' command to use.
- ;; Here we use a questionable hack where we hard-code
- ;; "~root/.config", which could be wrong (XXX).
+ ;; Here we use a questionable hack where we hard-code root's
+ ;; current guix, which could be wrong (XXX). Note that scripts
+ ;; like 'guix perform-download' do not run as root so we assume
+ ;; that they have access to /var/guix/profiles/per-user/root.
(let ((out (assoc-ref outputs "out")))
(substitute* (find-files (string-append out "/libexec"))
(("exec \".*/bin/guix\"")
- "exec ~root/.config/guix/current/bin/guix"))
+ "exec /var/guix/profiles/per-user/root/current-guix/bin/guix"))
#t)))
(delete 'wrap-program)))))))
(define-public guile2.0-guix
- (package
- (inherit guix)
- (name "guile2.0-guix")
- (inputs
- `(("guile" ,guile-2.0)
- ,@(alist-delete "guile" (package-inputs guix))))
- (propagated-inputs
- `(("gnutls" ,gnutls/guile-2.0)
- ("guile-json" ,guile2.0-json)
- ("guile-ssh" ,guile2.0-ssh)
- ("guile-git" ,guile2.0-git)))))
+ (deprecated-package "guile2.0-guix" guix))
+
+(define-public guix-minimal
+ ;; A version of Guix which is built with the minimal set of dependencies, as
+ ;; outlined in the README "Requirements" section. Intended as a CI job, so
+ ;; marked as hidden.
+ (hidden-package
+ (package
+ (inherit guix)
+ (name "guix-minimal")
+ (inputs
+ `(("guile" ,guile-2.2)
+ ,@(alist-delete "guile" (package-inputs guix))))
+ (propagated-inputs
+ (fold alist-delete
+ (package-propagated-inputs guix)
+ '("guile-ssh"))))))
(define (source-file? file stat)
"Return true if FILE is likely a source file, false if it is a typical
(define-public diffoscope
(package
(name "diffoscope")
- (version "102")
+ (version "106")
(source (origin
(method url-fetch)
(uri (pypi-uri name version))
(sha256
(base32
- "0v2z98xx7n4viw12yq83flpb9ir5ahy1gn44pic0i3dam18xhcm6"))))
+ "0qrfp7nha2n2s9h5ibcf7rqji1amh4cqbcf80m6anim6p3ik26da"))))
(build-system python-build-system)
(arguments
`(#:phases (modify-phases %standard-phases
(lambda _
(substitute* "setup.py"
(("'python-magic',") ""))))
+ ;; This test is broken because our `file` package has a
+ ;; bug in berkeley-db file type detection.
+ (add-after 'unpack 'remove-berkeley-test
+ (lambda _
+ (delete-file "tests/comparators/test_berkeley_db.py")
+ #t))
(add-after 'unpack 'embed-tool-references
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "diffoscope/comparators/utils/compare.py"
(replace 'check
(lambda _
(setenv "HOME" "/tmp")
- (zero? (system* "py.test")))))))
+ (invoke "py.test"))))))
(native-inputs
- `(("python-ruamel.yaml" ,python-ruamel.yaml)
+ `(("python-cytoolz" ,python-cytoolz)
+ ("python-ruamel.yaml" ,python-ruamel.yaml)
("python-requests" ,python-requests)
("python-pycosat" ,python-pycosat)
("python-pytest" ,python-pytest)
;; application form, rather than the default, library form.
;; With this, we are able to run commands like `conda --help`
;; directly on the command line
- (zero? (system* "python" "utils/setup-testing.py" "build_py"))))
+ (invoke "python" "utils/setup-testing.py" "build_py")))
(replace 'install
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
;; And it aborts if the directory doesn't exist.
(mkdir-p target)
- (zero? (system* "python" "utils/setup-testing.py" "install"
- (string-append "--prefix=" out))))))
+ (invoke "python" "utils/setup-testing.py" "install"
+ (string-append "--prefix=" out)))))
;; The "activate" and "deactivate" scripts don't need wrapping.
;; They also break when they are renamed.
(add-after 'wrap 'undo-wrap
(define-public libostree
(package
(name "libostree")
- (version "2018.7")
+ (version "2018.9.1")
(source (origin
(method url-fetch)
(uri (string-append
"https://github.com/ostreedev/ostree/releases/download/v"
- version "/libostree-" version ".tar.xz"))
+ (version-major+minor version) "/libostree-" version ".tar.xz"))
(sha256
(base32
- "1nc310lv36psxn5yslkxlgi9gjxwqpwqzkg2pldgpwrlv6gkagj8"))))
+ "01mygpkbl9sk2vr3hjbpih6qlg8lwx0q5lklm09f7jfwfpnwyqzj"))))
(build-system gnu-build-system)
(arguments
'(#:phases
bootable filesystem trees, along with a layer for deploying them and managing
the bootloader configuration.")
(license license:lgpl2.0+)))
+
+(define-public flatpak
+ (package
+ (name "flatpak")
+ (version "1.1.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "https://github.com/flatpak/flatpak/releases/download/"
+ version "/flatpak-" version ".tar.xz"))
+ (sha256
+ (base32
+ "0bkjwh49kajyd78vdh0g9arb352a7rccaifas9zxa78phhja2v2p"))))
+ (build-system gnu-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)))
+ (inputs `(("appstream-glib" ,appstream-glib)
+ ("bubblewrap" ,bubblewrap)
+ ("gdk-pixbuf" ,gdk-pixbuf)
+ ("gpgme" ,gpgme)
+ ("json-glib" ,json-glib)
+ ("libarchive" ,libarchive)
+ ("libostree" ,libostree)
+ ("libseccomp" ,libseccomp)
+ ("libsoup" ,libsoup)
+ ("libxau" ,libxau)
+ ("libxml2" ,libxml2)
+ ("nettle" ,nettle)
+ ("util-linux" ,util-linux)))
+ (home-page "https://flatpak.org")
+ (synopsis "System for building, distributing, and running sandboxed desktop
+applications")
+ (description "Flatpak is a system for building, distributing, and running
+sandboxed desktop applications on GNU/Linux.")
+ (license license:lgpl2.1+)))
HCoop / jackhill / guix / guix.git / blobdiff