From 12773de3e7cf87b77678d7692781a84460c6ad91 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 13 Mar 2017 21:50:39 +0100 Subject: gnu: Add guile2.2-lib. * gnu/packages/guile.scm (guile2.2-lib): New variable. --- gnu/packages/guile.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index d25603dfe3..17c808d4bd 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -670,6 +670,9 @@ (define-public guile-lib ;; details. (license license:gpl3+))) +(define-public guile2.2-lib + (package-for-guile-2.2 guile-lib)) + (define-public guile-json (package (name "guile-json") -- cgit v1.2.3 From b97438650d43f59e7f836b3471fc0e9b321c4c59 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 13 Mar 2017 22:18:13 +0100 Subject: gnu: guile-cairo: Use 'modify-phases'. * gnu/packages/gtk.scm (guile-cairo)[arguments]: Use 'modify-phases'. --- gnu/packages/gtk.scm | 62 +++++++++++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 32 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 0a291370e7..380fae594b 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013 Andreas Enge -;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2016, 2017 Ludovic Courtès ;;; Copyright © 2014, 2015, 2017 Mark H Weaver ;;; Copyright © 2014 Eric Bavier ;;; Copyright © 2015 Federico Beffa @@ -730,38 +730,36 @@ (define-public guile-cairo (name "guile-cairo") (version "1.4.1") (source (origin - (method url-fetch) - (uri (string-append - "http://download.gna.org/guile-cairo/guile-cairo-" - version - ".tar.gz")) - (sha256 - (base32 - "1f5nd9n46n6cwfl1byjml02q3y2hgn7nkx98km1czgwarxl7ws3x")))) + (method url-fetch) + (uri (string-append + "http://download.gna.org/guile-cairo/guile-cairo-" + version + ".tar.gz")) + (sha256 + (base32 + "1f5nd9n46n6cwfl1byjml02q3y2hgn7nkx98km1czgwarxl7ws3x")))) (build-system gnu-build-system) (arguments - '(#:phases (alist-cons-before - 'configure 'set-module-directory - (lambda* (#:key outputs #:allow-other-keys) - ;; Install modules under $out/share/guile/site/2.0. - (let ((out (assoc-ref outputs "out"))) - (substitute* "Makefile.in" - (("scmdir = ([[:graph:]]+).*" _ value) - (string-append "scmdir = " value "/2.0\n"))) - (substitute* "cairo/Makefile.in" - (("moduledir = ([[:graph:]]+).*" _ value) - (string-append "moduledir = " - "$(prefix)/share/guile/site/2.0/cairo\n'"))))) - (alist-cons-after - 'install 'install-missing-file - (lambda* (#:key outputs #:allow-other-keys) - ;; By default 'vector-types.scm' is not installed, so do - ;; it here. - (let ((out (assoc-ref outputs "out"))) - (copy-file "cairo/vector-types.scm" - (string-append out "/share/guile/site/2.0" - "/cairo/vector-types.scm")))) - %standard-phases)))) + '(#:phases (modify-phases %standard-phases + (add-before 'configure 'set-module-directory + (lambda* (#:key outputs #:allow-other-keys) + ;; Install modules under $out/share/guile/site/2.0. + (let ((out (assoc-ref outputs "out"))) + (substitute* "Makefile.in" + (("scmdir = ([[:graph:]]+).*" _ value) + (string-append "scmdir = " value "/2.0\n"))) + (substitute* "cairo/Makefile.in" + (("moduledir = ([[:graph:]]+).*" _ value) + (string-append "moduledir = " + "$(prefix)/share/guile/site/2.0/cairo\n'")))))) + (add-after 'install 'install-missing-file + (lambda* (#:key outputs #:allow-other-keys) + ;; By default 'vector-types.scm' is not installed, so do + ;; it here. + (let ((out (assoc-ref outputs "out"))) + (copy-file "cairo/vector-types.scm" + (string-append out "/share/guile/site/2.0" + "/cairo/vector-types.scm")))))))) (inputs `(("guile-lib" ,guile-lib) ("expat" ,expat) @@ -770,7 +768,7 @@ (define-public guile-cairo ;; The .pc file refers to 'cairo'. `(("cairo" ,cairo))) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("pkg-config" ,pkg-config))) (home-page "http://www.nongnu.org/guile-cairo/") (synopsis "Cairo bindings for GNU Guile") (description -- cgit v1.2.3 From 0f11f64022afbd82600b5c301f0af40fcb60fb9a Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 13 Mar 2017 22:26:54 +0100 Subject: gnu: guile-cairo: Honor the Guile effective version. * gnu/packages/gtk.scm (guile-cairo)[arguments]: Add #:modules. Get the effective version of Guile and use that in installation directory names. --- gnu/packages/gtk.scm | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 380fae594b..db19c9c931 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -740,26 +740,42 @@ (define-public guile-cairo "1f5nd9n46n6cwfl1byjml02q3y2hgn7nkx98km1czgwarxl7ws3x")))) (build-system gnu-build-system) (arguments - '(#:phases (modify-phases %standard-phases + '(#:modules ((guix build utils) + (guix build gnu-build-system) + (ice-9 popen) + (ice-9 rdelim)) + + #:phases (modify-phases %standard-phases (add-before 'configure 'set-module-directory (lambda* (#:key outputs #:allow-other-keys) ;; Install modules under $out/share/guile/site/2.0. - (let ((out (assoc-ref outputs "out"))) + (let ((out (assoc-ref outputs "out")) + (effective + (read-line + (open-pipe* OPEN_READ "guile" "-c" + "(display (effective-version))")))) (substitute* "Makefile.in" (("scmdir = ([[:graph:]]+).*" _ value) - (string-append "scmdir = " value "/2.0\n"))) + (string-append "scmdir = " value "/" effective "\n"))) (substitute* "cairo/Makefile.in" (("moduledir = ([[:graph:]]+).*" _ value) (string-append "moduledir = " - "$(prefix)/share/guile/site/2.0/cairo\n'")))))) + "$(prefix)/share/guile/site/" + effective "/cairo\n'"))) + #t))) (add-after 'install 'install-missing-file (lambda* (#:key outputs #:allow-other-keys) ;; By default 'vector-types.scm' is not installed, so do ;; it here. - (let ((out (assoc-ref outputs "out"))) - (copy-file "cairo/vector-types.scm" - (string-append out "/share/guile/site/2.0" - "/cairo/vector-types.scm")))))))) + (let ((out (assoc-ref outputs "out")) + (effective + (read-line + (open-pipe* OPEN_READ "guile" "-c" + "(display (effective-version))")))) + (install-file "cairo/vector-types.scm" + (string-append out "/share/guile/site/" + effective "/cairo")) + #t)))))) (inputs `(("guile-lib" ,guile-lib) ("expat" ,expat) -- cgit v1.2.3 From a70782d37b29c1af0cff5829027a242eaaa4453e Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 14 Mar 2017 01:54:17 -0400 Subject: gnu: wireless-regdb: Update to 2017.03.07. * gnu/packages/linux.scm (wireless-regdb): Update to 2017.03.07. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 93994f2a30..00db09152e 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2001,7 +2001,7 @@ (define-public crda (define-public wireless-regdb (package (name "wireless-regdb") - (version "2016.06.10") + (version "2017.03.07") (source (origin (method url-fetch) (uri (string-append @@ -2009,7 +2009,7 @@ (define-public wireless-regdb "wireless-regdb-" version ".tar.xz")) (sha256 (base32 - "1dxqy7a7zpzya30ff00s8k1qgrlndrwys99gc0r8yg0vab1z3vfg")) + "1f9mcp78sdd4sci6v32vxfcl1rfjpv205jisz1p93kkfnaisy7ip")) ;; We're building 'regulatory.bin' by ourselves. (snippet '(delete-file "regulatory.bin")))) -- cgit v1.2.3 From 944a5cdd0d8a659b675ec73e7cfa983048c96ed5 Mon Sep 17 00:00:00 2001 From: ng0 Date: Tue, 28 Feb 2017 11:11:46 +0000 Subject: gnu: Add dovecot-trees. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/mail.scm (dovecot-trees): New variable. Co-authored-by: Ludovic Courtès --- gnu/packages/mail.scm | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 58 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 070d9ba093..02147b3108 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -44,6 +44,7 @@ (define-module (gnu packages mail) #:use-module (gnu packages backup) #:use-module (gnu packages bash) #:use-module (gnu packages bison) + #:use-module (gnu packages crypto) #:use-module (gnu packages curl) #:use-module (gnu packages cyrus-sasl) #:use-module (gnu packages databases) @@ -93,7 +94,7 @@ (define-module (gnu packages mail) #:select (gpl2 gpl2+ gpl3 gpl3+ lgpl2.1 lgpl2.1+ lgpl3+ non-copyleft (expat . license:expat) bsd-3 public-domain bsd-4 isc (openssl . license:openssl) - bsd-2 x11-style)) + bsd-2 x11-style agpl3)) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) @@ -1130,6 +1131,62 @@ (define-public dovecot ;; Unicode, Inc. License Agreement for Data Files and Software. (license (list lgpl2.1 license:expat (non-copyleft "file://COPYING"))))) +(define-public dovecot-trees + (let ((commit "006059c8a47d68f14f73c09743e45b9a73014dbf") + (revision "1")) + (package + (name "dovecot-trees") + (version (string-append "2.0.0-" revision "." (string-take commit 7))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://0xacab.org/riseuplabs/trees.git") + (commit commit))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "0ax90bzc66x179wi1m7ywqwa8nssyhjngs7ij109hqqxg5ymfp73")))) + (build-system gnu-build-system) + (native-inputs + `(("automake" ,automake) + ("autoconf" ,autoconf) + ("libtool" ,libtool) + ("dovecot" ,dovecot) + ("pkg-config" ,pkg-config))) + (inputs + `(("libsodium" ,libsodium))) + (arguments + `(#:tests? #f ;No tests exist. + #:configure-flags (list (string-append "--with-dovecot=" + (assoc-ref %build-inputs "dovecot") + "/lib/dovecot")) + #:phases + (modify-phases %standard-phases + (add-before 'configure 'autogen + (lambda _ + (zero? (system* "./autogen.sh"))))))) + (home-page "https://0xacab.org/riseuplabs/trees") + (synopsis "NaCL-based Dovecot email storage encryption plugin") + (description + "Technology for Resting Email Encrypted Storage (TREES) is a NaCL-based +Dovecot encryption plugin. This plugin adds individually encrypted mail +storage to the Dovecot IMAP server. It is inspired by Posteo's scrambler +which uses OpenSSL and RSA keypairs. TREES works in a similar way, but uses +the Sodium crypto library (based on NaCL). + +How it works: +@enumerate +@item On IMAP log in, the user's cleartext password is passed to the plugin. +@item The plugin creates an argon2 digest from the password. +@item This password digest is used as a symmetric secret to decrypt a libsodium secretbox. +@item Inside the secretbox is stored a Curve25519 private key. +@item The Curve25519 private key is used to decrypt each individual message, +using lidsodium sealed boxes. +@item New mail is encrypted as it arrives using the Curve25519 public key. +@end enumerate\n") + (license agpl3)))) + (define-public isync (package (name "isync") -- cgit v1.2.3 From a4651f64117766abae659af848802d91cf607e17 Mon Sep 17 00:00:00 2001 From: ng0 Date: Tue, 28 Feb 2017 11:11:47 +0000 Subject: gnu: Add dovecot-libsodium-plugin. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/mail.scm (dovecot-libsodium-plugin): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/mail.scm | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 02147b3108..fa8a3aae6b 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1187,6 +1187,48 @@ (define-public dovecot-trees @end enumerate\n") (license agpl3)))) +(define-public dovecot-libsodium-plugin + (let ((commit "044de73c01c35385df0105f6b387bec5d5317ce7") + (revision "1")) + (package + (name "dovecot-libsodium-plugin") + (version (string-append "0.0.0-" revision "." (string-take commit 7))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/LuckyFellow/dovecot-libsodium-plugin") + (commit commit))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "13h07l7xy713zchnj2p9fhvq7fdl4zy1ai94li3ygkqjjj8hrgas")))) + (build-system gnu-build-system) + (native-inputs + `(("automake" ,automake) + ("autoconf" ,autoconf) + ("libtool" ,libtool) + ("dovecot" ,dovecot) + ("pkg-config" ,pkg-config))) + (inputs + `(("libsodium" ,libsodium))) + (arguments + `(#:tests? #f ;No tests exist. + #:configure-flags (list (string-append "--with-dovecot=" + (assoc-ref %build-inputs "dovecot") + "/lib/dovecot")) + #:phases + (modify-phases %standard-phases + (add-before 'configure 'autogen + (lambda _ + (zero? (system* "./autogen.sh"))))))) + (home-page "https://github.com/LuckyFellow/dovecot-libsodium-plugin") + (synopsis "Libsodium password hashing schemes plugin for Dovecot") + (description + "@code{dovecot-libsodium-plugin} provides libsodium password +hashing schemes plugin for @code{Dovecot}.") + (license gpl3+)))) + (define-public isync (package (name "isync") -- cgit v1.2.3 From 28958b646fb38a679e45d3c9d8257e46deebe190 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 14 Mar 2017 11:14:58 +0100 Subject: gnu: python-parsedatetime: Update to 2.3. Version 2.1 was apparently time-sensitive and started failing like this: ====================================================================== FAIL: testFloat (tests.TestDelta.test) ---------------------------------------------------------------------- Traceback (most recent call last): File "/tmp/guix-build-python2-parsedatetime-2.1.drv-0/parsedatetime-2.1/tests/TestDelta.py", line 64, in testFloat self.cal.parse('1.4 months ago', self.source), months=-1.4) File "/tmp/guix-build-python2-parsedatetime-2.1.drv-0/parsedatetime-2.1/tests/TestDelta.py", line 37, in assertDelta self.assertTrue(diff < 0.05, '%s is not less than 0.05' % diff) AssertionError: 0.0666666666667 is not less than 0.05 ---------------------------------------------------------------------- * gnu/packages/python.scm (python-parsedatetime): Update to 2.3. [native-inputs]: Add PYTHON-PYTEST and PYTHON-PYTEST-RUNNER. [propagated-inputs]: New field. --- gnu/packages/python.scm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 333cfd54e9..00796d166e 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013 Nikita Karetnikov -;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2016, 2017 Ludovic Courtès ;;; Copyright © 2013, 2014, 2015, 2016 Andreas Enge ;;; Copyright © 2014, 2015 Mark H Weaver ;;; Copyright © 2014, 2017 Eric Bavier @@ -1141,18 +1141,22 @@ (define-public python2-dateutil (define-public python-parsedatetime (package (name "python-parsedatetime") - (version "2.1") + (version "2.3") (source (origin (method url-fetch) (uri (pypi-uri "parsedatetime" version)) (sha256 (base32 - "0bdgyw6y3v7bcxlx0p50s8drxsh5bb5cy2afccqr3j90amvpii8p")))) + "1vkrmd398s11h1zn3zaqqsiqhj9lwy1ikcg6irx2lrgjzjg3rjll")))) (build-system python-build-system) (native-inputs `(("python-nose" ,python-nose) - ("python-pyicu" ,python-pyicu))) + ("python-pyicu" ,python-pyicu) + ("python-pytest" ,python-pytest) + ("python-pytest-runner" ,python-pytest-runner))) + (propagated-inputs + `(("python-future" ,python-future))) (home-page "http://github.com/bear/parsedatetime/") (synopsis "Parse human-readable date/time text") -- cgit v1.2.3 From d779305db0923cd613d82255b10fbf8c2fece4ad Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 14 Mar 2017 15:05:27 +0200 Subject: gnu: aria2: Update to 1.31.0. * gnu/packages/bittorrent.scm (aria2): Update to 1.31.0. --- gnu/packages/bittorrent.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index 9e56f667a4..635b94f4a0 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -263,7 +263,7 @@ (define-public transmission-remote-cli (define-public aria2 (package (name "aria2") - (version "1.30.0") + (version "1.31.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/tatsuhiro-t/aria2/" @@ -271,7 +271,7 @@ (define-public aria2 name "-" version ".tar.xz")) (sha256 (base32 - "1xiiqk4yiqr0c4hf05zkma9if13lp3wh37z1r0w60ahxs5k56v5z")))) + "131zh75fqw9a1j0igl8gx3lwmhhbicdmp2p387r0cd5j928631bv")))) (build-system gnu-build-system) (arguments `(#:configure-flags (list "--enable-libaria2" -- cgit v1.2.3 From 8cac5bca126fe9d1c7557cd64a3dc4332d41e664 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 14 Mar 2017 02:12:53 -0400 Subject: gnu: windowmaker: Update to 0.95.8. * gnu/packages/gnustep.scm (windowmaker): Update to 0.95.8. --- gnu/packages/gnustep.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnustep.scm b/gnu/packages/gnustep.scm index 8f72bb3253..6081549d7d 100644 --- a/gnu/packages/gnustep.scm +++ b/gnu/packages/gnustep.scm @@ -35,7 +35,7 @@ (define-module (gnu packages gnustep) (define-public windowmaker (package (name "windowmaker") - (version "0.95.7") + (version "0.95.8") (source (origin (method url-fetch) (uri (string-append @@ -43,7 +43,7 @@ (define-public windowmaker version ".tar.gz")) (sha256 (base32 - "1acph0nq6fsb452sl7j7a7kcc87zqqaw7qms1p8ijar19dn4hbc4")))) + "12p8kljqgx5hnic0zvs5mxwp7kg21sb6qjagb2qw8ydvf5amrgwx")))) (build-system gnu-build-system) (arguments '(#:phases (alist-cons-before -- cgit v1.2.3 From 962cbb24c5a9beea5c6bda0e7662bead7cb2c4ca Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 14 Mar 2017 02:14:32 -0400 Subject: gnu: windowmaker: Use modify-phases syntax. * gnu/packages/gnustep.scm (windowmaker)[arguments]: Use modify-phases. --- gnu/packages/gnustep.scm | 61 ++++++++++++++++++++++++------------------------ 1 file changed, 30 insertions(+), 31 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnustep.scm b/gnu/packages/gnustep.scm index 6081549d7d..6e729165c9 100644 --- a/gnu/packages/gnustep.scm +++ b/gnu/packages/gnustep.scm @@ -46,37 +46,36 @@ (define-public windowmaker "12p8kljqgx5hnic0zvs5mxwp7kg21sb6qjagb2qw8ydvf5amrgwx")))) (build-system gnu-build-system) (arguments - '(#:phases (alist-cons-before - 'configure 'pre-configure - (lambda* (#:key outputs #:allow-other-keys) - ;; 'wmaker' wants to invoke 'wmaker.inst' the first time, - ;; and the 'wmsetbg', so make sure it uses the right ones. - ;; We can't use a wrapper here because that would pollute - ;; $PATH in the whole session. - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin"))) - (substitute* "src/main.c" - (("\"wmaker\\.inst") - (string-append "\"" bin "/wmaker.inst"))) - (substitute* '("src/defaults.c" "WPrefs.app/Menu.c") - (("\"wmsetbg") - (string-append "\"" bin "/wmsetbg"))) - ;; Add enough cells to the command character array to - ;; allow passing our large path to the wmsetbg binary. - ;; The path to wmsetbg in Guix requires 67 extra characters. - (substitute* "src/defaults.c" - (("len = strlen\\(text\\) \\+ 40;") - (string-append "len = strlen(text) + 107;"))))) - (alist-cons-after - 'install 'wrap - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin"))) - ;; In turn, 'wmaker.inst' wants to invoke 'wmmenugen' - ;; etc., so make sure everything is in $PATH. - (wrap-program (string-append bin "/wmaker.inst") - `("PATH" ":" prefix (,bin))))) - %standard-phases)))) + '(#:phases + (modify-phases %standard-phases + (add-before 'configure 'pre-configure + (lambda* (#:key outputs #:allow-other-keys) + ;; 'wmaker' wants to invoke 'wmaker.inst' the first time, + ;; and the 'wmsetbg', so make sure it uses the right ones. + ;; We can't use a wrapper here because that would pollute + ;; $PATH in the whole session. + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin"))) + (substitute* "src/main.c" + (("\"wmaker\\.inst") + (string-append "\"" bin "/wmaker.inst"))) + (substitute* '("src/defaults.c" "WPrefs.app/Menu.c") + (("\"wmsetbg") + (string-append "\"" bin "/wmsetbg"))) + ;; Add enough cells to the command character array to + ;; allow passing our large path to the wmsetbg binary. + ;; The path to wmsetbg in Guix requires 67 extra characters. + (substitute* "src/defaults.c" + (("len = strlen\\(text\\) \\+ 40;") + (string-append "len = strlen(text) + 107;")))))) + (add-after 'install 'wrap + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin"))) + ;; In turn, 'wmaker.inst' wants to invoke 'wmmenugen' + ;; etc., so make sure everything is in $PATH. + (wrap-program (string-append bin "/wmaker.inst") + `("PATH" ":" prefix (,bin))))))))) (inputs `(("libxmu" ,libxmu) ("libxft" ,libxft) -- cgit v1.2.3 From 9b05ccfedd9945ca09103e1e9557d5988b4815d5 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 14 Mar 2017 12:54:53 -0400 Subject: gnu: linux-libre@4.1: Update to 4.1.39. * gnu/packages/linux.scm (linux-libre-4.1): Update to 4.1.39. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 00db09152e..28440297e0 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -360,8 +360,8 @@ (define-public linux-libre-4.4 #:configuration-file kernel-config)) (define-public linux-libre-4.1 - (make-linux-libre "4.1.38" - "165kmzglhg63hn7y4q7r6cb2dpsljxiq1czvgyx0bkd1vd2bcvsa" + (make-linux-libre "4.1.39" + "06pb3zpkfkc7pb7yh537vvzn8i9nhqyx58kqxv0wq23b4hhpza7d" %intel-compatible-systems #:configuration-file kernel-config #:patches -- cgit v1.2.3 From 9099a45792306fade2d9ca55138e49ef4f01f1ea Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sun, 12 Mar 2017 17:46:28 -0400 Subject: gnu: asciidoc: Add XML and XSLT support. * gnu/packages/documentation.scm (asciidoc)[arguments]: Add set-xml-binary-paths phase. [inputs]: Add libxml2 and libxslt. --- gnu/packages/documentation.scm | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm index bbc25e8797..94e979c881 100644 --- a/gnu/packages/documentation.scm +++ b/gnu/packages/documentation.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2014, 2016 Andreas Enge ;;; Copyright © 2016 Eric Bavier ;;; Copyright © 2016 Roel Janssen +;;; Copyright © 2017 Kei Kebreau ;;; ;;; This file is part of GNU Guix. ;;; @@ -53,6 +54,23 @@ (define-public asciidoc `(#:tests? #f ; no 'check' target #:phases (modify-phases %standard-phases + ;; Some XML-related binaries are required for asciidoc's proper usage. + ;; Without these, asciidoc fails when parsing XML documents, either + ;; reporting a missing "xmllint" binary or, when passed the + ;; "--no-xmllint" option, a missing "xsltproc" binary. + ;; The following phase enables asciidoc to find some of them. + (add-before 'configure 'set-xml-binary-paths + (lambda* (#:key inputs #:allow-other-keys) + (let* ((libxml2 (assoc-ref inputs "libxml2")) + (xmllint (string-append libxml2 "/bin/xmllint")) + (libxslt (assoc-ref inputs "libxslt")) + (xsltproc (string-append libxslt "/bin/xsltproc"))) + (substitute* "a2x.py" + (("XMLLINT = 'xmllint'") + (string-append "XMLLINT = '" xmllint "'")) + (("XSLTPROC = 'xsltproc'") + (string-append "XSLTPROC = '" xsltproc "'"))) + #t))) ;; Make asciidoc use the local docbook-xsl package instead of fetching ;; it from the internet at run-time. (add-before 'install 'make-local-docbook-xsl @@ -67,7 +85,9 @@ (define-public asciidoc ,(package-version docbook-xsl))))) #t))))) (inputs `(("python" ,python-2) - ("docbook-xsl" ,docbook-xsl))) + ("docbook-xsl" ,docbook-xsl) + ("libxml2" ,libxml2) + ("libxslt" ,libxslt))) (home-page "http://www.methods.co.nz/asciidoc/") (synopsis "Text-based document generation system") (description -- cgit v1.2.3 From d19c1b410508eee5824582d0ac6d8b00de483bbb Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 30 Dec 2016 19:21:17 +0100 Subject: gnu: Add ocaml-sexplib. * gnu/packages/ocaml.scm (ocaml-sexplib): New variable. --- gnu/packages/ocaml.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index e225aa6d68..dc2ce14d30 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2280,3 +2280,20 @@ (define-public ocaml-ppx-compare flexibility by allowing you to override them for a specific type and more safety by making sure that you only compare comparable values.") (license license:asl2.0))) + +(define-public ocaml-sexplib + (package + (name "ocaml-sexplib") + (version "113.33.03") + (source (janestreet-origin "sexplib" version + "1ffjmj8if9lyv965cgn2ld1xv7g52qsr8mqflbm515ck1i8l2ima")) + (build-system ocaml-build-system) + (native-inputs + `(("js-build-tools" ,ocaml-js-build-tools) + ("opam" ,opam))) + (arguments janestreet-arguments) + (home-page "https://github.com/janestreet/sexplib/") + (synopsis "Library for serializing OCaml values to and from S-expressions") + (description "Sexplib contains functionality for parsing and pretty-printing +s-expressions.") + (license license:asl2.0))) -- cgit v1.2.3 From ef0051b2c5a5d97d3a699a960e8d2d774879d07d Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 30 Dec 2016 19:22:46 +0100 Subject: gnu: Add ocaml-typerep. * gnu/packages/ocaml.scm (ocaml-typerep): New variable. --- gnu/packages/ocaml.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index dc2ce14d30..ce6c7fb8c4 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2297,3 +2297,19 @@ (define-public ocaml-sexplib (description "Sexplib contains functionality for parsing and pretty-printing s-expressions.") (license license:asl2.0))) + +(define-public ocaml-typerep + (package + (name "ocaml-typerep") + (version "113.33.03") + (source (janestreet-origin "typerep" version + "1b9v5bmi824a9d4sx0f40ixq0yfcbiqxafg4a1jx95xg9199zafy")) + (native-inputs + `(("js-build-tools" ,ocaml-js-build-tools) + ("opam" ,opam))) + (build-system ocaml-build-system) + (arguments janestreet-arguments) + (home-page "https://github.com/janestreet/typerep/") + (synopsis "Typerep is a library for runtime types") + (description "Typerep is a library for runtime types.") + (license license:asl2.0))) -- cgit v1.2.3 From d1d90df63b57faefd2bd938302225e1f26ffb774 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 30 Dec 2016 19:23:34 +0100 Subject: gnu: Add ocaml-variantslib. * gnu/packages/ocaml.scm (ocaml-variantslib): New variable. --- gnu/packages/ocaml.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index ce6c7fb8c4..ed77b468f8 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2313,3 +2313,19 @@ (define-public ocaml-typerep (synopsis "Typerep is a library for runtime types") (description "Typerep is a library for runtime types.") (license license:asl2.0))) + +(define-public ocaml-variantslib + (package + (name "ocaml-variantslib") + (version "113.33.03") + (source (janestreet-origin "variantslib" version + "05vp799vl38fvl98ga5miwbzh09cnnpapi6q6gdvwyqi6w7s919n")) + (native-inputs + `(("js-build-tools" ,ocaml-js-build-tools) + ("opam" ,opam))) + (build-system ocaml-build-system) + (arguments janestreet-arguments) + (home-page "https://github.com/janestreet/variantslib") + (synopsis "OCaml variants as first class values") + (description "OCaml variants as first class values.") + (license license:asl2.0))) -- cgit v1.2.3 From 334436f051172bd5b2ad5afa003ff311580ce920 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 30 Dec 2016 19:25:45 +0100 Subject: gnu: Add ocaml-ppx-sexp-conv. * gnu/packages/ocaml.scm (ocaml-ppx-sexp-conv): New variable. --- gnu/packages/ocaml.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index ed77b468f8..a46183ac01 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2329,3 +2329,26 @@ (define-public ocaml-variantslib (synopsis "OCaml variants as first class values") (description "OCaml variants as first class values.") (license license:asl2.0))) + +(define-public ocaml-ppx-sexp-conv + (package + (name "ocaml-ppx-sexp-conv") + (version "113.33.03") + (source (janestreet-origin "ppx_sexp_conv" version + "1rbj6d5dl625gdxih34xcrdvikci6h8i2dl9x3wraa4qrgishiw7")) + (build-system ocaml-build-system) + (native-inputs + `(("js-build-tools" ,ocaml-js-build-tools) + ("opam" ,opam) + ("ppx-core" ,ocaml-ppx-core))) + (propagated-inputs + `(("sexplib" ,ocaml-sexplib) + ("ppx-core" ,ocaml-ppx-core) + ("ppx-type-conv" ,ocaml-ppx-type-conv) + ("ppx-tools" ,ocaml-ppx-tools))) + (arguments janestreet-arguments) + (home-page "https://github.com/janestreet/ppx_sexp_conv") + (synopsis "Generation of S-expression conversion functions from type definitions") + (description "Generation of S-expression conversion functions from type +definitions.") + (license license:asl2.0))) -- cgit v1.2.3 From 14af90cfbd864aae8637f3046cf878c5dd4c8778 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 30 Dec 2016 19:27:10 +0100 Subject: gnu: Add ocaml-ppx-variants-conv. * gnu/packages/ocaml.scm (ocaml-ppx-variants-conv): New variable. --- gnu/packages/ocaml.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index a46183ac01..63a7c082a3 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2352,3 +2352,26 @@ (define-public ocaml-ppx-sexp-conv (description "Generation of S-expression conversion functions from type definitions.") (license license:asl2.0))) + +(define-public ocaml-ppx-variants-conv + (package + (name "ocaml-ppx-variants-conv") + (version "113.33.03") + (source (janestreet-origin "ppx_variants_conv" version + "0vnn2l1118cj72413d3f7frlw6yc09l8f64jlzkzbgb9bxpalx34")) + (build-system ocaml-build-system) + (native-inputs + `(("js-build-tools" ,ocaml-js-build-tools) + ("opam" ,opam))) + (propagated-inputs + `(("ppx-core" ,ocaml-ppx-core) + ("variantslib" ,ocaml-variantslib) + ("ppx-tools" ,ocaml-ppx-tools) + ("ppx-type-conv" ,ocaml-ppx-type-conv))) + (arguments janestreet-arguments) + (home-page "https://github.com/janestreet/ppx_variants_conv") + (synopsis "Generation of accessor and iteration functions for ocaml variant +types") + (description "Generation of accessor and iteration functions for ocaml +variant types.") + (license license:asl2.0))) -- cgit v1.2.3 From 651563bd71ba40d35507f42493dd5a6ff9a94077 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 30 Dec 2016 19:28:31 +0100 Subject: gnu: Add ocaml-ppx-here. * gnu/packages/ocaml.scm (ocaml-ppx-here): New variable. --- gnu/packages/ocaml.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 63a7c082a3..fa9fb51155 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2375,3 +2375,22 @@ (define-public ocaml-ppx-variants-conv (description "Generation of accessor and iteration functions for ocaml variant types.") (license license:asl2.0))) + +(define-public ocaml-ppx-here + (package + (name "ocaml-ppx-here") + (version "113.33.03") + (source (janestreet-origin "ppx_here" version + "1ay8lfxi0qg3ib2zkwh4h0vqk3gjmxaz572gzab0bbxyqn3z86v7")) + (build-system ocaml-build-system) + (native-inputs + `(("js-build-tools" ,ocaml-js-build-tools) + ("opam" ,opam))) + (propagated-inputs + `(("ppx-driver" ,ocaml-ppx-driver) + ("ppx-core" ,ocaml-ppx-core))) + (arguments janestreet-arguments) + (home-page "https://github.com/janestreet/ppx_here") + (synopsis "Expands [%here] into its location") + (description "Expands [%here] into its location.") + (license license:asl2.0))) -- cgit v1.2.3 From a43160ee6f12a8dd8540ef674472acabf4b192d9 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 30 Dec 2016 19:30:07 +0100 Subject: gnu: Add ocaml-ppx-assert. * gnu/packages/ocaml.scm (ocaml-ppx-assert): New variable. --- gnu/packages/ocaml.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index fa9fb51155..c3ee884549 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2394,3 +2394,28 @@ (define-public ocaml-ppx-here (synopsis "Expands [%here] into its location") (description "Expands [%here] into its location.") (license license:asl2.0))) + +(define-public ocaml-ppx-assert + (package + (name "ocaml-ppx-assert") + (version "113.33.03") + (source (janestreet-origin "ppx_assert" version + "1k5kxmqkibp5fk25pgz81f3c1r4mgvb5byzf6bnmxd24y60wn46p")) + (build-system ocaml-build-system) + (native-inputs + `(("js-build-tools" ,ocaml-js-build-tools) + ("opam" ,opam))) + (propagated-inputs + `(("ppx-compare" ,ocaml-ppx-compare) + ("ppx-core" ,ocaml-ppx-core) + ("ppx-driver" ,ocaml-ppx-driver) + ("ppx-sexp-conv" ,ocaml-ppx-sexp-conv) + ("ppx-tools" ,ocaml-ppx-tools) + ("ppx-type-conv" ,ocaml-ppx-type-conv) + ("ppx-sexplib" ,ocaml-sexplib) + ("ppx-here" ,ocaml-ppx-here))) + (arguments janestreet-arguments) + (home-page "https://github.com/janestreet/ppx_assert") + (synopsis "Assert-like extension nodes that raise useful errors on failure") + (description "Assert-like extension nodes that raise useful errors on failure.") + (license license:asl2.0))) -- cgit v1.2.3 From 250ac438e79076410964bbe9e091ae39dea1c4d0 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 30 Dec 2016 19:32:14 +0100 Subject: gnu: Add ocaml-ppx-enumerate. * gnu/packages/ocaml.scm (ocaml-ppx-enumerate): New variable. --- gnu/packages/ocaml.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index c3ee884549..23590054e0 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2419,3 +2419,25 @@ (define-public ocaml-ppx-assert (synopsis "Assert-like extension nodes that raise useful errors on failure") (description "Assert-like extension nodes that raise useful errors on failure.") (license license:asl2.0))) + +(define-public ocaml-ppx-enumerate + (package + (name "ocaml-ppx-enumerate") + (version "113.33.03") + (source (janestreet-origin "ppx_enumerate" version + "15g7yfv9wg2h9r6k6q1zrhygmsl4xrfn25mrb0i4czjjivzmxjh4")) + (build-system ocaml-build-system) + (native-inputs + `(("js-build-tools" ,ocaml-js-build-tools) + ("opam" ,opam))) + (propagated-inputs + `(("ppx-tools" ,ocaml-ppx-tools) + ("ppx-type-conv" ,ocaml-ppx-type-conv) + ("ppx-core" ,ocaml-ppx-core))) + (arguments janestreet-arguments) + (home-page "https://github.com/janestreet/ppx_enumerate") + (synopsis "Generate a list containing all values of a finite type") + (description "Ppx_enumerate is a ppx rewriter which generates a definition +for the list of all values of a type (for a type which only has finitely +many values).") + (license license:asl2.0))) -- cgit v1.2.3 From d2203187feaa0d3c7ebc9c9f1c49cd0788615f01 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 30 Dec 2016 19:36:47 +0100 Subject: gnu: Add ocaml-ppx-let. * gnu/packages/ocaml.scm (ocaml-ppx-let): New variable. --- gnu/packages/ocaml.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 23590054e0..a12d198089 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2441,3 +2441,23 @@ (define-public ocaml-ppx-enumerate for the list of all values of a type (for a type which only has finitely many values).") (license license:asl2.0))) + +(define-public ocaml-ppx-let + (package + (name "ocaml-ppx-let") + (version "113.33.03") + (source (janestreet-origin "ppx_let" version + "0gd6d3gdaqfwjcs7gaw1qxc30i584q6a86ndaj1bx1q63xqd6yx9")) + (build-system ocaml-build-system) + (native-inputs + `(("js-build-tools" ,ocaml-js-build-tools) + ("opam" ,opam))) + (propagated-inputs + `(("ppx-driver" ,ocaml-ppx-driver) + ("ppx-core" ,ocaml-ppx-core))) + (arguments janestreet-arguments) + (home-page "https://github.com/janestreet/ppx_let") + (synopsis "Monadic let-bindings") + (description "A ppx rewriter for monadic and applicative let bindings, +match expressions, and if expressions.") + (license license:asl2.0))) -- cgit v1.2.3 From edda7ebec15ad15339b067225efc55207867a5e1 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 30 Dec 2016 19:38:28 +0100 Subject: gnu: Add ocaml-ppx-typerep-conv. * gnu/packages/ocaml.scm (ocaml-ppx-typerep-conv): New variable. --- gnu/packages/ocaml.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index a12d198089..ebc5caf254 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2461,3 +2461,24 @@ (define-public ocaml-ppx-let (description "A ppx rewriter for monadic and applicative let bindings, match expressions, and if expressions.") (license license:asl2.0))) + +(define-public ocaml-ppx-typerep-conv + (package + (name "ocaml-ppx-typerep-conv") + (version "113.33.03") + (source (janestreet-origin "ppx_typerep_conv" version + "0g0xqm9s1b2jjvxb8yp69281q2s3bwz6sibn10fvgcdawpa0rmrg")) + (build-system ocaml-build-system) + (native-inputs + `(("js-build-tools" ,ocaml-js-build-tools) + ("opam" ,opam))) + (propagated-inputs + `(("ppx-tools" ,ocaml-ppx-tools) + ("ppx-type-conv" ,ocaml-ppx-type-conv) + ("ppx-core" ,ocaml-ppx-core) + ("typerep" ,ocaml-typerep))) + (arguments janestreet-arguments) + (home-page "https://github.com/janestreet/ppx_typerep_conv") + (synopsis "Generation of runtime types from type declarations") + (description "Automatic generation of runtime types from type definitions.") + (license license:asl2.0))) -- cgit v1.2.3 From 031349075a5b7b40d85059aed6113c926babdc7f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 14 Mar 2017 22:25:49 +0100 Subject: Revert "gnu: nss, nss-certs: Update to 3.29.3." Hydra failed to build this version. See discussion at https://lists.gnu.org/archive/html/guix-devel/2017-03/msg00408.html. This reverts commit 4f3dcdd99ba13ab3bdbf1e014afcd076cd95fac7. --- gnu/packages/certs.scm | 4 ++-- gnu/packages/gnuzilla.scm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/certs.scm b/gnu/packages/certs.scm index 7f5c5b793f..e35e9aabab 100644 --- a/gnu/packages/certs.scm +++ b/gnu/packages/certs.scm @@ -74,7 +74,7 @@ (define certdata2pem (define-public nss-certs (package (name "nss-certs") - (version "3.29.3") + (version "3.29.2") (source (origin (method url-fetch) (uri (let ((version-with-underscores @@ -85,7 +85,7 @@ (define-public nss-certs "nss-" version ".tar.gz"))) (sha256 (base32 - "1sz1r2iml9bhd4iqiqz75gii855a25895vpy9scjky0y4lqwrp9m")))) + "149807rmzb76hnh48rw4m9jw83iw0168njzchz0hmbsgc8mk0i5w")))) (build-system gnu-build-system) (outputs '("out")) (native-inputs diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 55dfda4948..e11e831cbe 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -186,7 +186,7 @@ (define-public nspr (define-public nss (package (name "nss") - (version "3.29.3") + (version "3.29.2") (source (origin (method url-fetch) (uri (let ((version-with-underscores @@ -197,7 +197,7 @@ (define-public nss "nss-" version ".tar.gz"))) (sha256 (base32 - "1sz1r2iml9bhd4iqiqz75gii855a25895vpy9scjky0y4lqwrp9m")) + "149807rmzb76hnh48rw4m9jw83iw0168njzchz0hmbsgc8mk0i5w")) ;; Create nss.pc and nss-config. (patches (search-patches "nss-pkgconfig.patch")))) (build-system gnu-build-system) -- cgit v1.2.3 From 796d2f2d0b86a49e3b6ec89de406aa8ec19f0eda Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 14 Mar 2017 22:25:55 +0100 Subject: Revert "gnu: nss: Use 'modify-phases' syntax." This reverts commit 87f1c7efc18f8996b0b2817a5f7b84eebe2ddf5a. --- gnu/packages/gnuzilla.scm | 91 ++++++++++++++++++++++++----------------------- 1 file changed, 47 insertions(+), 44 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index e11e831cbe..e6e24f6650 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -221,52 +221,55 @@ (define-public nss (ice-9 match) (srfi srfi-26)) #:phases - (modify-phases %standard-phases - (replace 'configure - (lambda* (#:key system inputs #:allow-other-keys) - (setenv "CC" "gcc") - ;; Tells NSS to build for the 64-bit ABI if we are 64-bit system. - (when (string-prefix? "x86_64" system) - (setenv "USE_64" "1")) - #t)) - (replace 'check - (lambda _ - ;; Use 127.0.0.1 instead of $HOST.$DOMSUF as HOSTADDR for testing. - ;; The later requires a working DNS or /etc/hosts. - (setenv "DOMSUF" "(none)") - (setenv "USE_IP" "TRUE") - (setenv "IP_ADDRESS" "127.0.0.1") - (zero? (system* "./nss/tests/all.sh")))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append (assoc-ref outputs "bin") "/bin")) - (inc (string-append out "/include/nss")) - (lib (string-append out "/lib/nss")) - (obj (match (scandir "dist" (cut string-suffix? "OBJ" <>)) - ((obj) (string-append "dist/" obj))))) - ;; Install nss-config to $out/bin. - (install-file (string-append obj "/bin/nss-config") - (string-append out "/bin")) - (delete-file (string-append obj "/bin/nss-config")) - ;; Install nss.pc to $out/lib/pkgconfig. - (install-file (string-append obj "/lib/pkgconfig/nss.pc") - (string-append out "/lib/pkgconfig")) - (delete-file (string-append obj "/lib/pkgconfig/nss.pc")) - (rmdir (string-append obj "/lib/pkgconfig")) - ;; Install other files. - (copy-recursively "dist/public/nss" inc) - (copy-recursively (string-append obj "/bin") bin) - (copy-recursively (string-append obj "/lib") lib) + (alist-replace + 'configure + (lambda* (#:key system inputs #:allow-other-keys) + (setenv "CC" "gcc") + ;; Tells NSS to build for the 64-bit ABI if we are 64-bit system. + (when (string-prefix? "x86_64" system) + (setenv "USE_64" "1")) + #t) + (alist-replace + 'check + (lambda _ + ;; Use 127.0.0.1 instead of $HOST.$DOMSUF as HOSTADDR for testing. + ;; The later requires a working DNS or /etc/hosts. + (setenv "DOMSUF" "(none)") + (setenv "USE_IP" "TRUE") + (setenv "IP_ADDRESS" "127.0.0.1") + (zero? (system* "./nss/tests/all.sh"))) + (alist-replace + 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append (assoc-ref outputs "bin") "/bin")) + (inc (string-append out "/include/nss")) + (lib (string-append out "/lib/nss")) + (obj (match (scandir "dist" (cut string-suffix? "OBJ" <>)) + ((obj) (string-append "dist/" obj))))) + ;; Install nss-config to $out/bin. + (install-file (string-append obj "/bin/nss-config") + (string-append out "/bin")) + (delete-file (string-append obj "/bin/nss-config")) + ;; Install nss.pc to $out/lib/pkgconfig. + (install-file (string-append obj "/lib/pkgconfig/nss.pc") + (string-append out "/lib/pkgconfig")) + (delete-file (string-append obj "/lib/pkgconfig/nss.pc")) + (rmdir (string-append obj "/lib/pkgconfig")) + ;; Install other files. + (copy-recursively "dist/public/nss" inc) + (copy-recursively (string-append obj "/bin") bin) + (copy-recursively (string-append obj "/lib") lib) - ;; FIXME: libgtest1.so is installed in the above step, and it's - ;; (unnecessarily) linked with several NSS libraries, but - ;; without the needed rpaths, causing the 'validate-runpath' - ;; phase to fail. Here we simply delete libgtest1.so, since it - ;; seems to be used only during the tests. - (delete-file (string-append lib "/libgtest1.so")) + ;; FIXME: libgtest1.so is installed in the above step, and it's + ;; (unnecessarily) linked with several NSS libraries, but + ;; without the needed rpaths, causing the 'validate-runpath' + ;; phase to fail. Here we simply delete libgtest1.so, since it + ;; seems to be used only during the tests. + (delete-file (string-append lib "/libgtest1.so")) - #t)))))) + #t)) + %standard-phases))))) (inputs `(("sqlite" ,sqlite) ("zlib" ,zlib))) -- cgit v1.2.3 From 2eab5db300b729b5e5cab95a8c39c3e4e0153b37 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 14 Mar 2017 15:49:36 -0400 Subject: Revert "gnu: gitolite: Fix shebangs in hooks." This change embedded store references in the shebangs of scripts that were meant to be copied out of the store. Those scripts would break when the interpreters expected by the shebangs were garbage collected. This reverts commit d0c16adb190c7244ee3ef1329cba78a015ae5d10. --- gnu/packages/version-control.scm | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index ccda00173d..1076c18905 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -616,17 +616,6 @@ (define-public gitolite (substitute* (find-files "." ".*") ((" perl -") (string-append " " perl " -")))))) - (add-before 'install 'fix-hooks-shebangs - (lambda* (#:key inputs #:allow-other-keys) - (let ((perl (string-append (assoc-ref inputs "perl") - "/bin/perl"))) - ;; The files in 'lib/Gitolite/Hooks' keep references to - ;; '/usr/bin/perl', without this fix it is impossible to - ;; to run gitolite in production. - (substitute* (find-files "src/lib/Gitolite/Hooks" ".*") - (("/usr/bin/perl") - perl)) - #t))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let* ((output (assoc-ref outputs "out")) -- cgit v1.2.3 From 35dcfed370a3385fdd3743ddb64f2f0aaaee2fc6 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 14 Mar 2017 18:16:27 -0400 Subject: gnu: w3m: Update to 0.5.3+git20170102 [security fixes]. See 'NEWS' and 'ChangeLog' in the source distribution for more information about the security-related bug fixes. * gnu/packages/w3m.scm (w3m): Update to 0.5.3+git20170102. --- gnu/packages/w3m.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/w3m.scm b/gnu/packages/w3m.scm index 12114b13b9..0489212197 100644 --- a/gnu/packages/w3m.scm +++ b/gnu/packages/w3m.scm @@ -36,7 +36,7 @@ (define-module (gnu packages w3m) (define-public w3m (package (name "w3m") - (version "0.5.3+git20161120") + (version "0.5.3+git20170102") (source (origin (method git-fetch) ;; Debian's fork of w3m is the only one that is still @@ -47,7 +47,7 @@ (define-public w3m (file-name (string-append "w3m-" version "-checkout")) (sha256 (base32 - "06n5a9jdyihkd4xdjmyci32dpqp1k2l5awia5g9ng0bn256bacdc")))) + "0p8csd49b550q69bk45ncs2y2x48xij7jj11xapp0s8dn1j7kcgx")))) (build-system gnu-build-system) (arguments '(#:tests? #f ; no check target -- cgit v1.2.3 From b2d748edff6d50d15e060c215c54eb8edbd45f08 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 13 Mar 2017 16:26:40 +0100 Subject: gnu: samtools: End installation phases with truth. * gnu/packages/bioinformatics.scm (samtools, samtools-0.1)[arguments]: Return #T instead of the undefined results of COPY-FILE or INSTALL-FILE. --- gnu/packages/bioinformatics.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 770bea7e32..239b94b6c4 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -4284,7 +4284,8 @@ (define-public samtools 'install 'install-library (lambda* (#:key outputs #:allow-other-keys) (let ((lib (string-append (assoc-ref outputs "out") "/lib"))) - (install-file "libbam.a" lib))) + (install-file "libbam.a" lib) + #t)) (alist-cons-after 'install 'install-headers (lambda* (#:key outputs #:allow-other-keys) @@ -4336,7 +4337,8 @@ (define-public samtools-0.1 (assoc-ref outputs "out") "/bin"))) (mkdir-p bin) (copy-file "samtools" - (string-append bin "/samtools"))))) + (string-append bin "/samtools")) + #t))) (delete 'patch-tests) (delete 'configure)))))))) -- cgit v1.2.3 From 6d57723ac8d63c0f303495e3f37f5e3a4a13849c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 13 Mar 2017 17:52:12 +0100 Subject: gnu: grue-hunter: Correctly install documentation. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/games.scm (grue-hunter)[arguments]: Install and populate ‘/share/doc/grue-hunter’ as a directory, not a plain file. --- gnu/packages/games.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 1ce18658d0..f8152e0184 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2528,7 +2528,8 @@ (define-public grue-hunter "/bin/tar")) (out (assoc-ref %outputs "out")) (bin (string-append out "/bin")) - (doc (string-append out "/share/doc"))) + (doc (string-append out + "/share/doc/grue-hunter"))) (begin (mkdir out) (copy-file tarball "grue-hunter.tar.gz") @@ -2542,8 +2543,7 @@ (define-public grue-hunter (list perl)) (mkdir-p doc) - (copy-file "grue-hunter/AGPLv3.txt" - (string-append doc "/grue-hunter"))))))) + (install-file "grue-hunter/AGPLv3.txt" doc)))))) (inputs `(("perl" ,perl) ("tar" ,tar) ("gzip" ,gzip) -- cgit v1.2.3 From d540156c694531c78ca0b9929d992d1c7cdb8e69 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 14 Mar 2017 13:05:44 +0100 Subject: gnu: znc: Update to 1.6.5. * gnu/packages/messaging.scm (znc): Update to 1.6.5. --- gnu/packages/messaging.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index f2f36ad876..4e40567b1c 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -386,14 +386,14 @@ (define-public pidgin-otr (define-public znc (package (name "znc") - (version "1.6.4") + (version "1.6.5") (source (origin (method url-fetch) (uri (string-append "http://znc.in/releases/archive/znc-" version ".tar.gz")) (sha256 (base32 - "070d6b1i3jy66m4ci4ypxkg4pbwqbzbzss1y1ycgq2w62zmrf423")))) + "1jia6kq6bp8yxfj02d5vj9vqb4pylqcldspyjj6iz82kkka2a0ig")))) (build-system gnu-build-system) (arguments '(#:tests? #f ; tries to download GoogleTest with wget -- cgit v1.2.3 From a988cbb766b849854113222cea81c03041540b66 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 14 Mar 2017 22:09:06 +0100 Subject: gnu: stress-make: Fix description. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/debug.scm (stress-make)[description]: Fix typo. Avoid ambiguous use of ‘in order’. --- gnu/packages/debug.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm index b7d6bbc0eb..6278f661ef 100644 --- a/gnu/packages/debug.scm +++ b/gnu/packages/debug.scm @@ -304,12 +304,12 @@ (define-public stress-make (home-page "https://github.com/losalamos/stress-make") (synopsis "Expose race conditions in Makefiles") (description - "Stress Make is a customized GNU Make that explicitely managess the -order in which concurrent jobs are run in order to provoke erroneous behavior -into becoming manifest. It can run jobs in the order they're launched, in -backwards order, or in random order. The thought is that if code builds -correctly with Stress Make then it is likely that the @code{Makefile} contains -no race conditions.") + "Stress Make is a customized GNU Make that explicitely manages the order +in which concurrent jobs are run to provoke erroneous behavior into becoming +manifest. It can run jobs in the order in which they're launched, in backwards +order, or in random order. The thought is that if code builds correctly with +Stress Make, then it is likely that the @code{Makefile} contains no race +conditions.") ;; stress-make wrapper is under BSD-3-modifications-must-be-indicated, ;; and patched GNU Make is under its own license. (license (list (non-copyleft "COPYING.md") -- cgit v1.2.3 From 17753e6edb81a67170236b64aad09e424897c1ce Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 14 Mar 2017 22:10:03 +0100 Subject: gnu: youtube-dl: Update to 2017.03.15. * gnu/packages/video.scm (youtube-dl): Update to 2017.03.15. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index e10c1fe67d..aa4c043652 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -975,7 +975,7 @@ (define-public libvpx (define-public youtube-dl (package (name "youtube-dl") - (version "2017.03.07") + (version "2017.03.15") (source (origin (method url-fetch) (uri (string-append "https://yt-dl.org/downloads/" @@ -983,7 +983,7 @@ (define-public youtube-dl version ".tar.gz")) (sha256 (base32 - "19acz9m3gazd1ims4l9a9ni1p7jw8z4y0ncqn99xlx9kna8ryjnv")))) + "0h561pbphdkfalir9awp0k4fmsnzdf6kx56adb9bb0v9pfsb1y0f")))) (build-system python-build-system) (arguments ;; The problem here is that the directory for the man page and completion -- cgit v1.2.3 From 708e76287c8181f75052314cf9f0330b19b2a238 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 14 Mar 2017 22:27:30 +0100 Subject: gnu: obs: Update to 18.0.1. * gnu/packages/video.scm (obs): Update to 18.0.1. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index aa4c043652..9e18790d6f 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1490,7 +1490,7 @@ (define-public v4l-utils (define-public obs (package (name "obs") - (version "18.0.0") + (version "18.0.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/jp9000/obs-studio" @@ -1498,7 +1498,7 @@ (define-public obs (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0pxrzzp8z7kmwfdp49rwrk0j3lpya6garvbbzzfvldwhyam9az5d")))) + "043f8mfdh4ll0hpivpyg3iniirckwsgri0gzamyrba1yhf2c2ibr")))) (build-system cmake-build-system) (arguments `(#:tests? #f ; no tests -- cgit v1.2.3 From 68c10f31f912688fc0d6204cd9b44ba462e83b20 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 15 Mar 2017 03:29:19 +0100 Subject: gnu: conky: Update to 1.10.6. * gnu/packages/conky.scm (conky): Update to 1.10.6. --- gnu/packages/conky.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/conky.scm b/gnu/packages/conky.scm index 206546b53a..9c933a4bc0 100644 --- a/gnu/packages/conky.scm +++ b/gnu/packages/conky.scm @@ -32,7 +32,7 @@ (define-module (gnu packages conky) (define-public conky (package (name "conky") - (version "1.10.3") + (version "1.10.6") (source (origin (method url-fetch) @@ -40,7 +40,7 @@ (define-public conky version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1m9byrmpc2sprzk44v447yaqjzsvw230a0mlw7y1ngz3m3y44qs5")))) + (base32 "1jk0my7z45vz9vd8958d27nkk4kvr53k7wyf6cz2x9xjc0lri02c")))) (build-system cmake-build-system) (arguments `(#:tests? #f ; there are no tests -- cgit v1.2.3 From 283234a30910b56fcaebae3b9700a5fbd92e21b2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 15 Mar 2017 03:30:17 +0100 Subject: gnu: direnv: Update to 2.11.3. * gnu/packages/shellutils.scm (direnv): Update to 2.11.3. --- gnu/packages/shellutils.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm index e69df7d832..3ecc1ee8ba 100644 --- a/gnu/packages/shellutils.scm +++ b/gnu/packages/shellutils.scm @@ -94,7 +94,7 @@ (define-public trash-cli (define-public direnv (package (name "direnv") - (version "2.10.0") + (version "2.11.3") (source (origin (method url-fetch) (uri (string-append "https://github.com/direnv/" name @@ -102,7 +102,7 @@ (define-public direnv (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1h5ywn0glw1kmxs3jwjv9fvnhha942c6k740p5ghvyns05ds9cqf")))) + "01mhwzq9ss2qlnn8aahvwsgnspq8hbz0qfknf290aicngwx10d1d")))) (build-system gnu-build-system) (arguments '(#:test-target "test" -- cgit v1.2.3 From 27bf00e691750c9bd916f6f0560bfaa36ce5a185 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 14 Mar 2017 21:55:58 +0200 Subject: gnu: python-waf: Update to 1.9.8. * gnu/packages/python.scm (python-waf, python2-waf): Update to 1.9.8. [home-page]: Use https. --- gnu/packages/python.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 00796d166e..f6042d97f2 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -6176,14 +6176,14 @@ (define-public python2-backports-shutil-get-terminal-size (define-public python-waf (package (name "python-waf") - (version "1.9.5") + (version "1.9.8") (source (origin (method url-fetch) (uri (string-append "https://waf.io/" "waf-" version ".tar.bz2")) (sha256 (base32 - "1sl3ipi2czds57rlzjnpdzqa0skx8asfvmh3qmibpvdwf15rpppg")))) + "0wl4cnmp06lfxqjxaan58bqxn27smhydz0sg5prrfbl3bsw4gv6q")))) (build-system python-build-system) (arguments '(#:phases @@ -6197,7 +6197,7 @@ (define-public python-waf (replace 'install (lambda _ (copy-file "waf" %output)))))) - (home-page "http://waf.io/") + (home-page "https://waf.io/") (synopsis "Python-based build system") (description "Waf is a Python-based framework for configuring, compiling and installing -- cgit v1.2.3 From bd102157a10370e9e6d392b28eff63022d168f3d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 15 Mar 2017 15:04:07 +0100 Subject: gnu: mariadb: Update to 10.1.22 [fixes CVE-2017-3302 and CVE-2017-3313]. * gnu/packages/databases.scm (mariadb): Update to 10.1.22. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 5199d0c4f1..4549272728 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -328,7 +328,7 @@ (define-public mysql (define-public mariadb (package (name "mariadb") - (version "10.1.21") + (version "10.1.22") (source (origin (method url-fetch) (uri (string-append "https://downloads.mariadb.org/f/" @@ -336,7 +336,7 @@ (define-public mariadb name "-" version ".tar.gz")) (sha256 (base32 - "144lcm5awcf0k6a7saqfr4p2kg8r5wbdhdm4cmn2m8hyg1an70as")))) + "1kk674mx2bf22yivvzv1al5gdg9kyxar47m282bylb6kg8p5gc5w")))) (build-system cmake-build-system) (arguments '(#:configure-flags -- cgit v1.2.3