;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015, 2017 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2017 Muriithi Frederick Muriuki <fredmanglis@gmail.com>
+;;; Copyright © 2017 Oleg Pykhalov <go.wigust@gmail.com>
+;;; Copyright © 2017 Roel Janssen <roel@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
#:use-module (guix utils)
#:use-module (guix build-system gnu)
#:use-module (guix build-system python)
- #:use-module ((guix licenses) #:select (gpl2+ gpl3+ lgpl2.1+ asl2.0))
+ #:use-module (guix build-system emacs)
+ #:use-module ((guix licenses) #:select (gpl2+ gpl3+ agpl3+ lgpl2.1+ asl2.0
+ bsd-3 silofl1.1))
#:use-module (gnu packages)
#:use-module (gnu packages guile)
#:use-module (gnu packages file)
#:use-module (gnu packages backup)
+ #:use-module (gnu packages bootstrap) ;for 'bootstrap-guile-origin'
+ #:use-module (gnu packages check)
#:use-module (gnu packages compression)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages databases)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages autotools)
#:use-module (gnu packages gettext)
+ #:use-module (gnu packages lisp)
#:use-module (gnu packages texinfo)
#:use-module (gnu packages nettle)
#:use-module (gnu packages perl)
+ #:use-module (gnu packages perl-check)
#:use-module (gnu packages curl)
#:use-module (gnu packages web)
#:use-module (gnu packages man)
#:use-module (gnu packages bdw-gc)
#:use-module (gnu packages patchutils)
#:use-module (gnu packages python)
+ #:use-module (gnu packages python-web)
#:use-module (gnu packages popt)
#:use-module (gnu packages gnuzilla)
#:use-module (gnu packages cpio)
+ #:use-module (gnu packages time)
#:use-module (gnu packages tls)
#:use-module (gnu packages ssh)
#:use-module (gnu packages vim)
+ #:use-module (gnu packages serialization)
+ #:use-module (gnu packages acl)
+ #:use-module (srfi srfi-1)
#:use-module (ice-9 match))
(define (boot-guile-uri arch)
;; 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.13.0")
- (commit "a6d728b7aaee09892b0b420d07ed2dbb7de5e63f")
- (revision 1))
+ (let ((version "0.14.0")
+ (commit "f76ff984ebdbed18fce4fe2a62cee73d0ccd8140")
+ (revision 3))
(package
(name "guix")
(commit commit)))
(sha256
(base32
- "1nrskyk8z6w5i9cdfh5zxfgsrqf744sb30ssqi2g5xhijwagr1yq"))
+ "1sslkcp14vx0fa3lmy7mx96z8slhq7qli0d6cvc7h39dbpkzs2ni"))
(file-name (string-append "guix-" version "-checkout"))))
(build-system gnu-build-system)
(arguments
#:modules ((guix build gnu-build-system)
(guix build utils)
+ (srfi srfi-26)
(ice-9 popen)
(ice-9 rdelim))
(chmod po #o666))
(find-files "." "\\.po$"))
+ (patch-shebang "build-aux/git-version-gen")
+
+ (call-with-output-file ".tarball-version"
+ (lambda (port)
+ (display ,version port)))
+
(zero? (system* "sh" "bootstrap"))))
(add-before
'configure 'copy-bootstrap-guile
(copy "armhf")
(copy "aarch64")
#t))
- (add-after
- 'unpack 'disable-container-tests
+ (add-after 'unpack 'disable-failing-tests
;; XXX FIXME: These tests fail within the build container.
(lambda _
(substitute* "tests/syscalls.scm"
#t))
(add-after 'install 'wrap-program
(lambda* (#:key inputs outputs #:allow-other-keys)
- ;; Make sure the 'guix' command finds GnuTLS and
- ;; Guile-JSON automatically.
+ ;; Make sure the 'guix' command finds GnuTLS,
+ ;; Guile-JSON, and Guile-Git automatically.
(let* ((out (assoc-ref outputs "out"))
(guile (assoc-ref inputs "guile"))
(json (assoc-ref inputs "guile-json"))
+ (git (assoc-ref inputs "guile-git"))
+ (bs (assoc-ref inputs
+ "guile-bytestructures"))
(ssh (assoc-ref inputs "guile-ssh"))
(gnutls (assoc-ref inputs "gnutls"))
+ (deps (list json gnutls git bs ssh))
(effective
(read-line
(open-pipe* OPEN_READ
(string-append guile "/bin/guile")
"-c" "(display (effective-version))")))
- (path (string-append
- json "/share/guile/site/" effective ":"
- ssh "/share/guile/site/" effective ":"
- gnutls "/share/guile/site/" effective)))
+ (path (string-join
+ (map (cut string-append <>
+ "/share/guile/site/"
+ effective)
+ deps)
+ ":"))
+ (gopath (string-join
+ (map (cut string-append <>
+ "/lib/guile/" effective
+ "/site-ccache")
+ deps)
+ ":")))
(wrap-program (string-append out "/bin/guix")
`("GUILE_LOAD_PATH" ":" prefix (,path))
- `("GUILE_LOAD_COMPILED_PATH" ":" prefix (,path)))
+ `("GUILE_LOAD_COMPILED_PATH" ":" prefix (,gopath)))
#t))))))
(native-inputs `(("pkg-config" ,pkg-config)
("graphviz" ,graphviz)
("help2man" ,help2man)))
(inputs
- (let ((boot-guile (lambda (arch hash)
- (origin
- (method url-fetch)
- (uri (boot-guile-uri arch))
- (sha256 hash)))))
- `(("bzip2" ,bzip2)
- ("gzip" ,gzip)
- ("zlib" ,zlib) ;for 'guix publish'
-
- ("sqlite" ,sqlite)
- ("libgcrypt" ,libgcrypt)
- ("guile" ,guile-2.2)
-
- ("boot-guile/i686"
- ,(boot-guile "i686"
- (base32
- "0im800m30abgh7msh331pcbjvb4n02smz5cfzf1srv0kpx3csmxp")))
- ("boot-guile/x86_64"
- ,(boot-guile "x86_64"
- (base32
- "1w2p5zyrglzzniqgvyn1b55vprfzhgk8vzbzkkbdgl5248si0yq3")))
- ("boot-guile/mips64el"
- ,(boot-guile "mips64el"
- (base32
- "0fzp93lvi0hn54acc0fpvhc7bvl0yc853k62l958cihk03q80ilr")))
- ("boot-guile/armhf"
- ,(boot-guile "armhf"
- (base32
- "1mi3brl7l58aww34rawhvja84xc7l1b4hmwdmc36fp9q9mfx0lg5")))
- ("boot-guile/aarch64"
- ,(boot-guile "aarch64"
- (base32
- "1giy2aprjmn5fp9c4s9r125fljw4wv6ixy5739i5bffw4jgr0f9r"))))))
+ `(("bzip2" ,bzip2)
+ ("gzip" ,gzip)
+ ("zlib" ,zlib) ;for 'guix publish'
+
+ ("sqlite" ,sqlite)
+ ("libgcrypt" ,libgcrypt)
+ ("guile" ,guile-2.2)
+
+ ("boot-guile/i686" ,(bootstrap-guile-origin "i686-linux"))
+ ("boot-guile/x86_64" ,(bootstrap-guile-origin "x86_64-linux"))
+ ("boot-guile/mips64el" ,(bootstrap-guile-origin "mips64el-linux"))
+ ("boot-guile/armhf" ,(bootstrap-guile-origin "armhf-linux"))
+ ("boot-guile/aarch64" ,(bootstrap-guile-origin "aarch64-linux"))))
(propagated-inputs
- `(("gnutls" ,gnutls/guile-2.2) ;for 'guix download' & co.
+ `(("gnutls" ,gnutls)
("guile-json" ,guile-json)
- ("guile-ssh" ,guile-ssh)))
+ ("guile-ssh" ,guile-ssh)
+ ("guile-git" ,guile-git)))
(home-page "https://www.gnu.org/software/guix/")
(synopsis "Functional package manager for installed software packages and versions")
;; Alias for backward compatibility.
(define-public guix-devel guix)
+(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)))))
+
(define (source-file? file stat)
"Return true if FILE is likely a source file, false if it is a typical
generated file."
#t)))
(define-public current-guix
- (let ((select? (delay (or (git-predicate
- (string-append (current-source-directory)
- "/../.."))
- source-file?))))
+ (let* ((repository-root (canonicalize-path
+ (string-append (current-source-directory)
+ "/../..")))
+ (select? (delay (or (git-predicate repository-root)
+ source-file?))))
(lambda ()
"Return a package representing Guix built from the current source tree.
This works by adding the current source tree to the store (after filtering it
(package
(inherit guix)
(version (string-append (package-version guix) "+"))
- (source (local-file "../.." "guix-current"
+ (source (local-file repository-root "guix-current"
#:recursive? #t
#:select? (force select?)))))))
sub-directory.")
(license lgpl2.1+)))
+(define-public emacs-nix-mode
+ (package
+ (inherit nix)
+ (name "emacs-nix-mode")
+ (build-system emacs-build-system)
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'chdir-elisp
+ ;; Elisp directory is not in root of the source.
+ (lambda _
+ (chdir "misc/emacs"))))))
+ (synopsis "Emacs major mode for editing Nix expressions")
+ (description "@code{nixos-mode} provides an Emacs major mode for editing
+Nix expressions. It supports syntax highlighting, indenting and refilling of
+comments.")))
+
(define-public stow
(package
(name "stow")
(define-public rpm
(package
(name "rpm")
- (version "4.12.0.1")
+ (version "4.13.0.2")
(source (origin
(method url-fetch)
- (uri (string-append "http://rpm.org/releases/rpm-4.12.x/rpm-"
+ (uri (string-append "http://ftp.rpm.org/releases/rpm-"
+ (version-major+minor version) ".x/rpm-"
version ".tar.bz2"))
(sha256
(base32
- "0a82ym8phx7g0f3k6smvxnvzh7yv857l42xafk49689kzhld5pbp"))
- (patches (search-patches "rpm-CVE-2014-8118.patch"))))
+ "1521y4ghjns449kzpwkjn9cksh686383xnfx0linzlalqc3jqgig"))))
(build-system gnu-build-system)
(arguments
'(#:configure-flags '("--with-external-db" ;use the system's bdb
(define-public diffoscope
(package
(name "diffoscope")
- (version "81")
+ (version "88")
(source (origin
(method url-fetch)
(uri (pypi-uri name version))
(sha256
(base32
- "093lxy6zj69i19fxdkj3jnai3b1ajqbksyqcvy8wqj3plaaxjna5"))))
+ "1zp6nb37igssxg4bqsi3cw5klx4prhcx50mzg4463l50mssn8mp2"))))
(build-system python-build-system)
(arguments
`(#:phases (modify-phases %standard-phases
- (add-before 'unpack 'n (lambda _ #t))
;; setup.py mistakenly requires python-magic from PyPi, even
;; though the Python bindings of `file` are sufficient.
;; https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=815844
(string-append "['" (which "xxd") "',")))
(substitute* "diffoscope/comparators/elf.py"
(("@tool_required\\('readelf'\\)") "")
- (("\\['readelf',")
- (string-append "['" (which "readelf") "',")))
+ (("get_tool_name\\('readelf'\\)")
+ (string-append "'" (which "readelf") "'")))
+ (substitute* "diffoscope/comparators/directory.py"
+ (("@tool_required\\('stat'\\)") "")
+ (("@tool_required\\('getfacl'\\)") "")
+ (("\\['stat',")
+ (string-append "['" (which "stat") "',"))
+ (("\\['getfacl',")
+ (string-append "['" (which "getfacl") "',")))
+ #t))
+ (add-before 'check 'delete-failing-test
+ (lambda _
+ (delete-file "tests/test_tools.py") ;this requires /sbin to be on the path
#t)))))
(inputs `(("rpm" ,rpm) ;for rpm-python
("python-file" ,python-file)
("python-debian" ,python-debian)
("python-libarchive-c" ,python-libarchive-c)
("python-tlsh" ,python-tlsh)
+ ("acl" ,acl) ;for getfacl
("colordiff" ,colordiff)
- ("xxd" ,vim)
+ ("xxd" ,xxd)
;; Below are modules used for tests.
("python-pytest" ,python-pytest)
("python-chardet" ,python-chardet)))
- (home-page "http://diffoscope.org/")
+ (home-page "https://diffoscope.org/")
(synopsis "Compare files, archives, and directories in depth")
(description
"Diffoscope tries to get to the bottom of what makes files or directories
various binary formats into more human readable forms to compare them. It can
compare two tarballs, ISO images, or PDFs just as easily.")
(license gpl3+)))
+
+(define-public python-anaconda-client
+ (package
+ (name "python-anaconda-client")
+ (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"))
+ (sha256
+ (base32
+ "1wv4wi6k5jz7rlwfgvgfdizv77x3cr1wa2aj0k1595g7fbhkjhz2"))))
+ (build-system python-build-system)
+ (propagated-inputs
+ `(("python-pyyaml" ,python-pyyaml)
+ ("python-requests" ,python-requests)
+ ("python-clyent" ,python-clyent)))
+ (native-inputs
+ `(("python-pytz" ,python-pytz)
+ ("python-dateutil" ,python-dateutil)
+ ("python-mock" ,python-mock)
+ ("python-coverage" ,python-coverage)
+ ("python-pillow" ,python-pillow)))
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ ;; This is needed for some tests.
+ (add-before 'check 'set-up-home
+ (lambda* _ (setenv "HOME" "/tmp") #t))
+ (add-before 'check 'remove-network-tests
+ (lambda* _
+ ;; Remove tests requiring a network connection
+ (let ((network-tests '("tests/test_upload.py"
+ "tests/test_authorizations.py"
+ "tests/test_login.py"
+ "tests/test_whoami.py"
+ "utils/notebook/tests/test_data_uri.py"
+ "utils/notebook/tests/test_base.py"
+ "utils/notebook/tests/test_downloader.py"
+ "inspect_package/tests/test_conda.py")))
+ (with-directory-excursion "binstar_client"
+ (for-each delete-file network-tests)))
+ #t)))))
+ (home-page "https://github.com/Anaconda-Platform/anaconda-client")
+ (synopsis "Anaconda Cloud command line client library")
+ (description
+ "Anaconda Cloud command line client library provides an interface to
+Anaconda Cloud. Anaconda Cloud is useful for sharing packages, notebooks and
+environments.")
+ (license bsd-3)))
+
+(define-public python2-anaconda-client
+ (package-with-python2 python-anaconda-client))
+
+(define-public python-conda
+ (package
+ (name "python-conda")
+ (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"))
+ (sha256
+ (base32
+ "1jq8hyrc5npb5sf4vw6s6by4602yj8f79vzpbwdfgpkn02nfk1dv"))))
+ (build-system python-build-system)
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-before 'build 'create-version-file
+ (lambda _
+ (with-output-to-file "conda/.version"
+ (lambda () (display ,version)))
+ #t))
+ (add-before 'check 'remove-failing-tests
+ (lambda _
+ ;; These tests require internet/network access
+ (let ((network-tests '("test_cli.py"
+ "test_create.py"
+ "test_export.py"
+ "test_fetch.py"
+ "test_history.py"
+ "test_info.py"
+ "test_install.py"
+ "test_priority.py"
+ "conda_env/test_cli.py"
+ "conda_env/test_create.py"
+ "conda_env/specs/test_notebook.py"
+ "conda_env/utils/test_notebooks.py"
+ "core/test_index.py"
+ "core/test_repodata.py")))
+ (with-directory-excursion "tests"
+ (for-each delete-file network-tests)
+
+ ;; FIXME: This test creates a file, then deletes it and tests
+ ;; that the file was deleted. For some reason it fails when
+ ;; building with guix, but does not when you run it in the
+ ;; directory left when you build with the --keep-failed
+ ;; option
+ (delete-file "gateways/disk/test_delete.py")
+ #t))))
+ (replace 'check
+ (lambda _
+ (setenv "HOME" "/tmp")
+ (zero? (system* "py.test")))))))
+ (native-inputs
+ `(("python-ruamel.yaml" ,python-ruamel.yaml)
+ ("python-requests" ,python-requests)
+ ("python-pycosat" ,python-pycosat)
+ ("python-pytest" ,python-pytest)
+ ("python-responses" ,python-responses)
+ ("python-pyyaml" ,python-pyyaml)
+ ("python-anaconda-client" ,python-anaconda-client)))
+ (home-page "https://github.com/conda/conda")
+ (synopsis "Cross-platform, OS-agnostic, system-level binary package manager")
+ (description
+ "Conda is a cross-platform, Python-agnostic binary package manager. It
+is the package manager used by Anaconda installations, but it may be used for
+other systems as well. Conda makes environments first-class citizens, making
+it easy to create independent environments even for C libraries. Conda is
+written entirely in Python.
+
+This package provides Conda as a library.")
+ (license bsd-3)))
+
+(define-public python2-conda
+ (let ((base (package-with-python2
+ (strip-python2-variant python-conda))))
+ (package (inherit base)
+ (native-inputs
+ `(("python2-enum34" ,python2-enum34)
+ ,@(package-native-inputs base))))))
+
+(define-public conda
+ (package (inherit python-conda)
+ (name "conda")
+ (arguments
+ (substitute-keyword-arguments (package-arguments python-conda)
+ ((#:phases phases)
+ `(modify-phases ,phases
+ (replace 'build
+ (lambda* (#:key outputs #:allow-other-keys)
+ ;; This test fails when run before installation.
+ (delete-file "tests/test_activate.py")
+
+ ;; Fix broken defaults
+ (substitute* "conda/base/context.py"
+ (("return sys.prefix")
+ (string-append "return \"" (assoc-ref outputs "out") "\""))
+ (("return (prefix_is_writable\\(self.root_prefix\\))" _ match)
+ (string-append "return False if self.root_prefix == self.conda_prefix else "
+ match)))
+
+ ;; The util/setup-testing.py is used to build conda in
+ ;; 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"))))
+ (replace 'install
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (target (string-append out "/lib/python"
+ ((@@ (guix build python-build-system)
+ get-python-version)
+ (assoc-ref inputs "python"))
+ "/site-packages/")))
+ ;; The installer aborts if the target directory is not on
+ ;; PYTHONPATH.
+ (setenv "PYTHONPATH"
+ (string-append target ":" (getenv "PYTHONPATH")))
+
+ ;; And it aborts if the directory doesn't exist.
+ (mkdir-p target)
+ (zero? (system* "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
+ (lambda* (#:key outputs #:allow-other-keys)
+ (with-directory-excursion (string-append (assoc-ref outputs "out") "/bin/")
+ (delete-file "deactivate")
+ (rename-file ".deactivate-real" "deactivate")
+ (delete-file "activate")
+ (rename-file ".activate-real" "activate")
+ #t)))))))
+ (description
+ "Conda is a cross-platform, Python-agnostic binary package manager. It
+is the package manager used by Anaconda installations, but it may be used for
+other systems as well. Conda makes environments first-class citizens, making
+it easy to create independent environments even for C libraries. Conda is
+written entirely in Python.")))
+
+(define-public gwl
+ (package
+ (name "gwl")
+ (version "0.1.1")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "https://www.guixwl.org/releases/gwl-"
+ version ".tar.gz"))
+ (sha256
+ (base32
+ "06pm967mq1wyggx7l0nfapw5s0k5qc5r9lawk2v3db868br779a7"))))
+ (build-system gnu-build-system)
+ (native-inputs
+ `(("autoconf" ,autoconf)
+ ("automake" ,automake)
+ ("pkg-config" ,pkg-config)))
+ (inputs
+ `(("guile" ,guile-2.2)))
+ (propagated-inputs
+ `(("guix" ,guix)
+ ("guile-commonmark" ,guile-commonmark)))
+ (home-page "https://www.guixwl.org")
+ (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.")
+ ;; 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 gpl3+ agpl3+ silofl1.1))))
HCoop / jackhill / guix / guix.git / blobdiff