From 62196859227a91a206deceaae2829d9c32308347 Mon Sep 17 00:00:00 2001 From: Gábor Boskovits Date: Sat, 28 Jul 2018 08:04:53 +0200 Subject: gnu: clojure: Fix index generation. * gnu/packages/java.scm (clojure)[arguments]: Add phase 'fix-manifest-classpath to remove offending directory entry making indexing fail. --- gnu/packages/java.scm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 2ba6d76cae..0ff92c763d 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1862,6 +1862,11 @@ new Date();")) "test-generative-src" "tools-namespace-src")) #t)) + (add-after 'unpack 'fix-manifest-classpath + (lambda _ + (substitute* "build.xml" + (("") "")) + #t)) ;; The javadoc target is not built by default. (add-after 'build 'build-doc (lambda _ -- cgit v1.2.3 From 4262a491ce8cf0beaa1ddfa0fc9bc3e115de699a Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 29 Jul 2018 03:29:42 -0400 Subject: gnu: linux-libre@4.4: Update to 4.4.145. * gnu/packages/linux.scm (linux-libre-4.4): Update to 4.4.145. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 70615df93c..1cfe76ec8a 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -429,8 +429,8 @@ It has been modified to remove all non-free binary blobs.") #:configuration-file kernel-config)) (define-public linux-libre-4.4 - (make-linux-libre "4.4.144" - "1001nw9d51vbiisrjv5ffqigcwfs0r9gav2f8hkw9hzjw64nhanp" + (make-linux-libre "4.4.145" + "1c8lcibc6f8194ix3paip30jb9cqvn4lni6jjskyrmavcfy4rlbp" %intel-compatible-systems #:configuration-file kernel-config)) -- cgit v1.2.3 From 8b30bc82dc11754555ecee6da5dd8cdb09afdfd8 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 29 Jul 2018 03:30:32 -0400 Subject: gnu: linux-libre@4.9: Update to 4.9.116. * gnu/packages/linux.scm (linux-libre-4.9): Update to 4.9.116. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 1cfe76ec8a..29bcfb7859 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -423,8 +423,8 @@ It has been modified to remove all non-free binary blobs.") #:configuration-file kernel-config)) (define-public linux-libre-4.9 - (make-linux-libre "4.9.115" - "12n3wwfz22hxqqy7bdchl894x5krylcd4vx65837w7rybnb5w2wj" + (make-linux-libre "4.9.116" + "1v5138a5317ddrl0zvlip18586si68ccw6y5wdxgpkh8ixvcamy6" %intel-compatible-systems #:configuration-file kernel-config)) -- cgit v1.2.3 From c85a76cc005a440f9ba52b5936dd2729c1c35e8e Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 29 Jul 2018 03:31:10 -0400 Subject: gnu: linux-libre@4.14: Update to 4.14.59. * gnu/packages/linux.scm (%linux-libre-4.14-version): Update to 4.14.59. (%linux-libre-4.14-hash): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 29bcfb7859..4f9c29f8e0 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -413,8 +413,8 @@ It has been modified to remove all non-free binary blobs.") %linux-compatible-systems #:configuration-file kernel-config)) -(define %linux-libre-4.14-version "4.14.58") -(define %linux-libre-4.14-hash "1ny2b5zmgvbxglpy88aicdxix2ygr1qmar2rgaa336czfjninwr5") +(define %linux-libre-4.14-version "4.14.59") +(define %linux-libre-4.14-hash "1mf22i8a71qs04x4wfqmm21clj4jnqia6rpk7jbh3r3vjfjjbd1d") (define-public linux-libre-4.14 (make-linux-libre %linux-libre-4.14-version -- cgit v1.2.3 From f8e2df9851941d337219bef66a6dd8cec7f3a0e8 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 29 Jul 2018 03:32:03 -0400 Subject: gnu: linux-libre: Update to 4.17.11. * gnu/packages/linux.scm (%linux-libre-version): Update to 4.17.11. (%linux-libre-hash): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 4f9c29f8e0..f1bf65d27a 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -404,8 +404,8 @@ It has been modified to remove all non-free binary blobs.") ;; supports qemu "virt" machine and possibly a large number of ARM boards. ;; See : https://wiki.debian.org/DebianKernel/ARMMP. -(define %linux-libre-version "4.17.10") -(define %linux-libre-hash "1ab349s18avigd2592i11pab4klqzzxy11a1zp16mb842d8chkj2") +(define %linux-libre-version "4.17.11") +(define %linux-libre-hash "0c0ryl8rnzizr0x2gj9kprj9wfjz536574fnn46r0ww3szrzdm78") (define-public linux-libre (make-linux-libre %linux-libre-version -- cgit v1.2.3 From 10d53153613f97731a32a85077db6e0a4f2baa98 Mon Sep 17 00:00:00 2001 From: Christopher Lemmer Webber Date: Thu, 26 Jul 2018 17:37:53 -0400 Subject: gnu: Add chroma. * gnu/packages/games.scm (chroma): New variable. --- gnu/packages/games.scm | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 33429dbc2a..ee4ef78edc 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -10,7 +10,7 @@ ;;; Copyright © 2014, 2015 Mark H Weaver ;;; Copyright © 2015, 2016 Andreas Enge ;;; Copyright © 2015 David Hashe -;;; Copyright © 2015, 2017 Christopher Allan Webber +;;; Copyright © 2015, 2017, 2018 Christopher Lemmer Webber ;;; Copyright © 2015, 2016, 2017, 2018 Ricardo Wurmus ;;; Copyright © 2015, 2016, 2017 Alex Kost ;;; Copyright © 2015 Paul van der Walt @@ -4107,6 +4107,38 @@ laws of physics (Enigma’s special laws of physics, that is), controlling them with the mouse isn’t always trivial.") (license license:gpl2+))) +(define-public chroma + (package + (name "chroma") + (version "1.15") + (source (origin + (method url-fetch) + (uri (string-append "http://level7.org.uk/chroma/download/chroma-" + version ".tar.bz2")) + (sha256 + (base32 + "0nzm3j5wjazr1d6pkydqlc48sjf72hggq0hmx8mhq03114mmiir5")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f)) ; no tests included + (inputs + `(("sdl-union" ,(sdl-union (list sdl sdl-image sdl-mixer sdl-ttf))) + ("freetype" ,freetype) + ("ncurses" ,ncurses) + ("fontconfig" ,fontconfig) + ("libxft" ,libxft))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (home-page "http://level7.org.uk/chroma/") + (synopsis "Abstract puzzle game") + (description "Chroma is an abstract puzzle game. A variety of colourful +shapes are arranged in a series of increasingly complex patterns, forming + fiendish traps that must be disarmed and mysterious puzzles that must be + manipulated in order to give up their subtle secrets. Initially so + straightforward that anyone can pick it up and begin to play, yet gradually + becoming difficult enough to tax even the brightest of minds.") + (license license:gpl2+))) + (define-public fillets-ng (package (name "fillets-ng") -- cgit v1.2.3 From 5d5a02dd4c036d790c209bc235a5702488f3cc33 Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Sun, 29 Jul 2018 21:57:51 +1000 Subject: gnu: Add python-fastalite. * gnu/packages/bioinformatics.scm (python-fastalite, python2-fastalite): New variables. --- gnu/packages/bioinformatics.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index e87cef61be..4d84b90f1e 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -767,6 +767,29 @@ into separate processes; and more.") (define-public python2-biopython (package-with-python2 python-biopython)) +(define-public python-fastalite + (package + (name "python-fastalite") + (version "0.3") + (source + (origin + (method url-fetch) + (uri (pypi-uri "fastalite" version)) + (sha256 + (base32 + "1qli6pxp77i9xn2wfciq2zaxhl82bdxb33cpzqzj1z25yd036wqj")))) + (build-system python-build-system) + (arguments + `(#:tests? #f)) ; Test data is not distributed. + (home-page "https://github.com/nhoffman/fastalite") + (synopsis "Simplest possible FASTA parser") + (description "This library implements a FASTA and a FASTQ parser without +relying on a complex dependency tree.") + (license license:expat))) + +(define-public python2-fastalite + (package-with-python2 python-fastalite)) + (define-public bpp-core ;; The last release was in 2014 and the recommended way to install from source ;; is to clone the git repository, so we do this. -- cgit v1.2.3 From 19601e895b816afc033a155a9309037ec21fd3ed Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Sun, 29 Jul 2018 22:38:08 +1000 Subject: gnu: python2-psycopg2: Update to 2.7.5. * gnu/packages/bioinformatics.scm (python2-psycopg2): Update to 2.7.5. --- gnu/packages/databases.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 1433ca59c6..7b056eb13b 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -25,7 +25,7 @@ ;;; Copyright © 2017 Arun Isaac ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2017 Alex Vong -;;; Copyright © 2017 Ben Woodcroft +;;; Copyright © 2017, 2018 Ben Woodcroft ;;; Copyright © 2017 Rutger Helling ;;; Copyright © 2017 Pierre Langlois ;;; Copyright © 2015, 2017, 2018 Ricardo Wurmus @@ -2400,14 +2400,14 @@ designed to be easy and intuitive to use.") (define-public python-psycopg2 (package (name "python-psycopg2") - (version "2.7.3.1") + (version "2.7.5") (source (origin (method url-fetch) (uri (pypi-uri "psycopg2" version)) (sha256 (base32 - "0rda1j02ds6s28752fhmpwg761sh6jsxi1gpczqkrd28cki1cywv")))) + "17klx964gw8z0znl0raz3by8vdc7cq5gxj4pdcrfcina84nrdkzc")))) (build-system python-build-system) (arguments ;; Tests would require a postgresql database "psycopg2_test" @@ -2418,7 +2418,8 @@ designed to be easy and intuitive to use.") (home-page "http://initd.org/psycopg/") (synopsis "Python PostgreSQL adapter") (description - "psycopg2 is a thread-safe PostgreSQL adapter that implements DB-API 2.0. ") + "psycopg2 is a thread-safe PostgreSQL adapter that implements DB-API +2.0.") (license license:lgpl3+))) (define-public python2-psycopg2 -- cgit v1.2.3 From 9e0c135c39b5f1fa2c5c9cd4a1e50ccee75cc31e Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Sun, 29 Jul 2018 22:44:37 +1000 Subject: gnu: python-dendropy: Update to 4.4.0. * gnu/packages/bioinformatics.scm (python-dendropy, python2-dendropy): Update to 4.4.0. [source]: Use GitHub URI. Remove patch. [properties]: Remove field. (python2-dendropy)[arguments]: Run tests with setup.py. [native-inputs]: Remove 'python2-nose. * gnu/packages/patches/python-dendropy-fix-tests.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Delete it. --- gnu/local.mk | 1 - gnu/packages/bioinformatics.scm | 28 +++++---------- .../patches/python-dendropy-fix-tests.patch | 41 ---------------------- 3 files changed, 9 insertions(+), 61 deletions(-) delete mode 100644 gnu/packages/patches/python-dendropy-fix-tests.patch diff --git a/gnu/local.mk b/gnu/local.mk index af25477466..c58eec7bad 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1064,7 +1064,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-3-fix-tests.patch \ %D%/packages/patches/python-axolotl-AES-fix.patch \ %D%/packages/patches/python-cairocffi-dlopen-path.patch \ - %D%/packages/patches/python-dendropy-fix-tests.patch \ %D%/packages/patches/python-fix-tests.patch \ %D%/packages/patches/python-genshi-add-support-for-python-3.4-AST.patch \ %D%/packages/patches/python-genshi-buildable-on-python-2.7.patch \ diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 4d84b90f1e..7509f07d4a 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -1971,15 +1971,18 @@ accessing bigWig files.") (define-public python-dendropy (package (name "python-dendropy") - (version "4.2.0") + (version "4.4.0") (source (origin (method url-fetch) - (uri (pypi-uri "DendroPy" version)) + ;; Source from GitHub so that tests are included. + (uri + (string-append "https://github.com/jeetsukumaran/DendroPy/archive/v" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "15c7s3d5gf19ljsxvq5advaa752wfi7pwrdjyhzmg85hccyvp47p")) - (patches (search-patches "python-dendropy-fix-tests.patch")))) + "0v2fccny5xjaah546bsch1mw4kh61qq5frz2ibllxs9mp6ih9bsn")))) (build-system python-build-system) (home-page "http://packages.python.org/DendroPy/") (synopsis "Library for phylogenetics and phylogenetic computing") @@ -1987,23 +1990,10 @@ accessing bigWig files.") "DendroPy is a library for phylogenetics and phylogenetic computing: reading, writing, simulation, processing and manipulation of phylogenetic trees (phylogenies) and characters.") - (license license:bsd-3) - (properties `((python2-variant . ,(delay python2-dendropy)))))) + (license license:bsd-3))) (define-public python2-dendropy - (let ((base (package-with-python2 (strip-python2-variant python-dendropy)))) - (package - (inherit base) - (arguments - `(#:python ,python-2 - #:phases - (modify-phases %standard-phases - (replace 'check - ;; There is currently a test failure that only happens on some - ;; systems, and only using "setup.py test" - (lambda _ (zero? (system* "nosetests"))))))) - (native-inputs `(("python2-nose" ,python2-nose) - ,@(package-native-inputs base)))))) + (package-with-python2 python-dendropy)) (define-public python-py2bit (package diff --git a/gnu/packages/patches/python-dendropy-fix-tests.patch b/gnu/packages/patches/python-dendropy-fix-tests.patch deleted file mode 100644 index 30ab618ff1..0000000000 --- a/gnu/packages/patches/python-dendropy-fix-tests.patch +++ /dev/null @@ -1,41 +0,0 @@ -This patch fixes two test failures. It was downloaded from: -https://github.com/jeetsukumaran/DendroPy/commit/93f984bba7a6c588a28ca87f4e557ce283809453 - -From 93f984bba7a6c588a28ca87f4e557ce283809453 Mon Sep 17 00:00:00 2001 -From: jeetsukumaran -Date: Tue, 21 Feb 2017 16:41:01 -0500 -Subject: [PATCH] Update to Python 3 container and iteration semantics - ---- - dendropy/dataio/newickreader.py | 3 ++- - dendropy/datamodel/treemodel.py | 3 +++ - 2 files changed, 5 insertions(+), 1 deletion(-) - -diff --git a/dendropy/dataio/newickreader.py b/dendropy/dataio/newickreader.py -index 6dcf3c5..f978729 100644 ---- a/dendropy/dataio/newickreader.py -+++ b/dendropy/dataio/newickreader.py -@@ -303,7 +303,8 @@ def tree_iter(self, - taxon_symbol_map_fn=taxon_symbol_mapper.require_taxon_for_symbol) - yield tree - if tree is None: -- raise StopIteration -+ # raise StopIteration -+ return - - def _read(self, - stream, -diff --git a/dendropy/datamodel/treemodel.py b/dendropy/datamodel/treemodel.py -index 0ecfe31..73146f0 100644 ---- a/dendropy/datamodel/treemodel.py -+++ b/dendropy/datamodel/treemodel.py -@@ -772,6 +772,9 @@ def __hash__(self): - def __eq__(self, other): - return self is other - -+ def __lt__(self, other): -+ return id(self) < id(other) -+ - ########################################################################### - ### Basic Structure - -- cgit v1.2.3 From 3f8c82e6d3094c41ff0ad841aa5f06959144da71 Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Sun, 29 Jul 2018 22:48:32 +1000 Subject: gnu: taxtastic: Add missing propagated-inputs. * gnu/packages/bioinformatics.scm (taxtastic)[propagated-inputs]: Add python-psycopg2, python-fastalite, python-pyyaml, python-six, python-jinja2, python-dendropy. --- gnu/packages/bioinformatics.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 7509f07d4a..849225bd78 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -6059,7 +6059,13 @@ Cuffdiff or Ballgown programs.") `(("python-sqlalchemy" ,python2-sqlalchemy) ("python-decorator" ,python2-decorator) ("python-biopython" ,python2-biopython) - ("python-pandas" ,python2-pandas))) + ("python-pandas" ,python2-pandas) + ("python-psycopg2" ,python2-psycopg2) + ("python-fastalite" ,python2-fastalite) + ("python-pyyaml" ,python2-pyyaml) + ("python-six" ,python2-six) + ("python-jinja2" ,python2-jinja2) + ("python-dendropy" ,python2-dendropy))) (home-page "https://github.com/fhcrc/taxtastic") (synopsis "Tools for taxonomic naming and annotation") (description -- cgit v1.2.3 From b90d97ec2e80830e387716d2919ba36e5b6afac8 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 29 Jul 2018 15:19:55 +0200 Subject: ssh: Display the size of the store items being sent. * guix/ssh.scm (send-files): Compute the size of MISSING and display it. --- guix/ssh.scm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/guix/ssh.scm b/guix/ssh.scm index 9e90216a2d..da20d4d8db 100644 --- a/guix/ssh.scm +++ b/guix/ssh.scm @@ -279,10 +279,15 @@ Return the list of store items actually sent." (remove (cut valid-path? store <>) ',files))))) (count (length missing)) + (sizes (map (lambda (item) + (path-info-nar-size (query-path-info local item))) + missing)) (port (store-import-channel session))) - (format log-port (N_ "sending ~a store item to '~a'...~%" - "sending ~a store items to '~a'...~%" count) - count (session-get session 'host)) + (format log-port (N_ "sending ~a store item (~h MiB) to '~a'...~%" + "sending ~a store items (~h MiB) to '~a'...~%" count) + count + (inexact->exact (round (/ (reduce + 0 sizes) (expt 2. 20)))) + (session-get session 'host)) ;; Send MISSING in topological order. (export-paths local missing port) -- cgit v1.2.3 From 5b6823907216d6c6c98fdb962f2005f154328878 Mon Sep 17 00:00:00 2001 From: Eric Brown Date: Tue, 24 Jul 2018 16:19:40 -0500 Subject: services: openssh: Add forwarding options. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/services/ssh.scm ()[allow-agent-forwarding?] [allow-tcp-forwarding?, gateway-ports?]: New fields. (openssh-config-file): Handle them. * doc/guix.texi (Networking Services): Adjust accordingly. Signed-off-by: Ludovic Courtès --- doc/guix.texi | 9 +++++++++ gnu/services/ssh.scm | 22 ++++++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/doc/guix.texi b/doc/guix.texi index 19c9813f6a..d5588066bb 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -11650,6 +11650,15 @@ When true, forwarding of X11 graphical client connections is enabled---in other words, @command{ssh} options @option{-X} and @option{-Y} will work. +@item @code{allow-agent-forwarding?} (default: @code{#t}) +Whether to allow agent forwarding. + +@item @code{allow-tcp-forwarding?} (default: @code{#t}) +Whether to allow TCP forwarding. + +@item @code{gateway-ports?} (default: @code{#f}) +Whether to allow gateway ports. + @item @code{challenge-response-authentication?} (default: @code{#f}) Specifies whether challenge response authentication is allowed (e.g. via PAM). diff --git a/gnu/services/ssh.scm b/gnu/services/ssh.scm index f158fdf01f..dd96ad6aec 100644 --- a/gnu/services/ssh.scm +++ b/gnu/services/ssh.scm @@ -289,6 +289,19 @@ The other options should be self-descriptive." ;; Boolean (x11-forwarding? openssh-configuration-x11-forwarding? (default #f)) + + ;; Boolean + (allow-agent-forwarding? openssh-configuration-allow-agent-forwarding? + (default #t)) + + ;; Boolean + (allow-tcp-forwarding? openssh-configuration-allow-tcp-forwarding? + (default #t)) + + ;; Boolean + (gateway-ports? openssh-configuration-gateway-ports? + (default #f)) + ;; Boolean (challenge-response-authentication? openssh-challenge-response-authentication? (default #f)) @@ -418,6 +431,15 @@ of user-name/file-like tuples." (format port "X11Forwarding ~a\n" #$(if (openssh-configuration-x11-forwarding? config) "yes" "no")) + (format port "AllowAgentForwarding ~a\n" + #$(if (openssh-configuration-allow-agent-forwarding? config) + "yes" "no")) + (format port "AllowTcpForwarding ~a\n" + #$(if (openssh-configuration-allow-tcp-forwarding? config) + "yes" "no")) + (format port "GatewayPorts ~a\n" + #$(if (openssh-configuration-gateway-ports? config) + "yes" "no")) (format port "PidFile ~a\n" #$(openssh-configuration-pid-file config)) (format port "ChallengeResponseAuthentication ~a\n" -- cgit v1.2.3 From d2a1cf45f74f4be67bd51068fc531a1b8ae54536 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 29 Jul 2018 17:53:12 +0200 Subject: linux-initrd: Improve check of initrd modules. Previously we would not strip the ".ko" suffix if present. * gnu/build/linux-modules.scm (file-name->module-name): Export. * gnu/system/mapped-devices.scm (check-device-initrd-modules): Use 'file-name->module-name' instead of 'normalize-module-name'. --- gnu/build/linux-modules.scm | 1 + gnu/system/mapped-devices.scm | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/build/linux-modules.scm b/gnu/build/linux-modules.scm index 2ee2f1771f..b06c576441 100644 --- a/gnu/build/linux-modules.scm +++ b/gnu/build/linux-modules.scm @@ -33,6 +33,7 @@ module-aliases module-dependencies normalize-module-name + file-name->module-name recursive-module-dependencies modules-loaded module-loaded? diff --git a/gnu/system/mapped-devices.scm b/gnu/system/mapped-devices.scm index c452bdd894..aec49322e7 100644 --- a/gnu/system/mapped-devices.scm +++ b/gnu/system/mapped-devices.scm @@ -21,7 +21,7 @@ (define-module (gnu system mapped-devices) #:use-module (guix gexp) #:use-module (guix records) - #:use-module (guix modules) + #:use-module ((guix modules) #:hide (file-name->module-name)) #:use-module (guix i18n) #:use-module ((guix utils) #:select (source-properties->location @@ -33,7 +33,7 @@ #:autoload (gnu build file-systems) (find-partition-by-luks-uuid) #:autoload (gnu build linux-modules) (device-module-aliases matching-modules known-module-aliases - normalize-module-name) + normalize-module-name file-name->module-name) #:autoload (gnu packages cryptsetup) (cryptsetup-static) #:autoload (gnu packages linux) (mdadm-static) #:use-module (srfi srfi-1) @@ -135,7 +135,7 @@ DEVICE must be a \"/dev\" file name." ;; Module names (not file names) are supposed to use underscores ;; instead of hyphens. MODULES is a list of module names, whereas ;; LINUX-MODULES is file names without '.ko', so normalize them. - (provided (map normalize-module-name linux-modules))) + (provided (map file-name->module-name linux-modules))) (unless (every (cut member <> provided) modules) (raise (condition (&message -- cgit v1.2.3 From fcd068e984078ab74c6842af2525bf88096cd262 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 29 Jul 2018 18:31:42 +0200 Subject: linux-initrd: Try several file names when looking up modules. Fixes . Reported by Tonton . * gnu/build/linux-modules.scm (find-module-file): New procedure. * gnu/system/linux-initrd.scm (flat-linux-module-directory)[build-exp]: Remove 'lookup' procedure and use 'find-module-file' instead. * gnu/system/mapped-devices.scm (check-device-initrd-modules): Add comment. --- gnu/build/linux-modules.scm | 35 +++++++++++++++++++++++++++++++++++ gnu/system/linux-initrd.scm | 26 +++++--------------------- gnu/system/mapped-devices.scm | 4 ++++ 3 files changed, 44 insertions(+), 21 deletions(-) diff --git a/gnu/build/linux-modules.scm b/gnu/build/linux-modules.scm index b06c576441..9c8761527a 100644 --- a/gnu/build/linux-modules.scm +++ b/gnu/build/linux-modules.scm @@ -21,6 +21,7 @@ #:use-module (guix elf) #:use-module (guix glob) #:use-module (guix build syscalls) + #:use-module ((guix build utils) #:select (find-files)) #:use-module (rnrs io ports) #:use-module (rnrs bytevectors) #:use-module (srfi srfi-1) @@ -34,6 +35,7 @@ module-dependencies normalize-module-name file-name->module-name + find-module-file recursive-module-dependencies modules-loaded module-loaded? @@ -131,6 +133,39 @@ underscores." and normalizing it." (normalize-module-name (basename file ".ko"))) +(define (find-module-file directory module) + "Lookup module NAME under DIRECTORY, and return its absolute file name. +NAME can be a file name with or without '.ko', or it can be a module name. +Return #f if it could not be found. + +Module names can differ from file names in interesting ways; for instance, +module names usually (always?) use underscores as the inter-word separator, +whereas file names often, but not always, use hyphens. Examples: +\"usb-storage.ko\", \"serpent_generic.ko\"." + (define names + ;; List of possible file names. XXX: It would of course be cleaner to + ;; have a database that maps module names to file names and vice versa, + ;; but everyone seems to be doing hacks like this one. Oh well! + (map ensure-dot-ko + (delete-duplicates + (list module + (normalize-module-name module) + (string-map (lambda (chr) ;converse of 'normalize-module-name' + (case chr + ((#\_) #\-) + (else chr))) + module))))) + + (match (find-files directory + (lambda (file stat) + (member (basename file) names))) + ((file) + file) + (() + #f) + ((_ ...) + (error "several modules by that name" module directory)))) + (define* (recursive-module-dependencies files #:key (lookup-module dot-ko)) "Return the topologically-sorted list of file names of the modules depended diff --git a/gnu/system/linux-initrd.scm b/gnu/system/linux-initrd.scm index d73ebfd8d3..a5a111908f 100644 --- a/gnu/system/linux-initrd.scm +++ b/gnu/system/linux-initrd.scm @@ -108,34 +108,18 @@ the derivations referenced by EXP are automatically copied to the initrd." MODULES and taken from LINUX." (define build-exp (with-imported-modules (source-module-closure - '((guix build utils) - (gnu build linux-modules))) + '((gnu build linux-modules))) #~(begin - (use-modules (ice-9 match) (ice-9 regex) + (use-modules (gnu build linux-modules) (srfi srfi-1) - (guix build utils) - (gnu build linux-modules)) - - (define (string->regexp str) - ;; Return a regexp that matches STR exactly. - (string-append "^" (regexp-quote str) "$")) + (srfi srfi-26)) (define module-dir (string-append #$linux "/lib/modules")) - (define (lookup module) - (let ((name (ensure-dot-ko module))) - (match (find-files module-dir (string->regexp name)) - ((file) - file) - (() - (error "module not found" name module-dir)) - ((_ ...) - (error "several modules by that name" - name module-dir))))) - (define modules - (let ((modules (map lookup '#$modules))) + (let* ((lookup (cut find-module-file module-dir <>)) + (modules (map lookup '#$modules))) (append modules (recursive-module-dependencies modules #:lookup-module lookup)))) diff --git a/gnu/system/mapped-devices.scm b/gnu/system/mapped-devices.scm index aec49322e7..384b1aaf7d 100644 --- a/gnu/system/mapped-devices.scm +++ b/gnu/system/mapped-devices.scm @@ -137,6 +137,10 @@ DEVICE must be a \"/dev\" file name." ;; LINUX-MODULES is file names without '.ko', so normalize them. (provided (map file-name->module-name linux-modules))) (unless (every (cut member <> provided) modules) + ;; Note: What we suggest here is a list of module names (e.g., + ;; "usb_storage"), not file names (e.g., "usb-storage.ko"). This is + ;; OK because we have machinery that accepts both the hyphen and the + ;; underscore version. (raise (condition (&message (message (format #f (G_ "you may need these modules \ -- cgit v1.2.3 From 99b78ba49872bf8a7023bc1ae50e9e0995d0267d Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 29 Jul 2018 18:45:18 +0200 Subject: linux-initrd: Report only missing modules, not all needed modules. Previously the warning would list all the required modules rather than just those that are missing. * gnu/system/mapped-devices.scm (check-device-initrd-modules): Compute 'missing' and report it. --- gnu/system/mapped-devices.scm | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/gnu/system/mapped-devices.scm b/gnu/system/mapped-devices.scm index 384b1aaf7d..af73dc608c 100644 --- a/gnu/system/mapped-devices.scm +++ b/gnu/system/mapped-devices.scm @@ -128,15 +128,16 @@ DEVICE must be a \"/dev\" file name." (const #f))) (when aliases - (let ((modules (delete-duplicates - (append-map (cut matching-modules <> aliases) - (device-module-aliases device)))) + (let* ((modules (delete-duplicates + (append-map (cut matching-modules <> aliases) + (device-module-aliases device)))) - ;; Module names (not file names) are supposed to use underscores - ;; instead of hyphens. MODULES is a list of module names, whereas - ;; LINUX-MODULES is file names without '.ko', so normalize them. - (provided (map file-name->module-name linux-modules))) - (unless (every (cut member <> provided) modules) + ;; Module names (not file names) are supposed to use underscores + ;; instead of hyphens. MODULES is a list of module names, whereas + ;; LINUX-MODULES is file names without '.ko', so normalize them. + (provided (map file-name->module-name linux-modules)) + (missing (remove (cut member <> provided) modules))) + (unless (null? missing) ;; Note: What we suggest here is a list of module names (e.g., ;; "usb_storage"), not file names (e.g., "usb-storage.ko"). This is ;; OK because we have machinery that accepts both the hyphen and the @@ -145,7 +146,7 @@ DEVICE must be a \"/dev\" file name." (&message (message (format #f (G_ "you may need these modules \ in the initrd for ~a:~{ ~a~}") - device modules))) + device missing))) (&fix-hint (hint (format #f (G_ "Try adding them to the @code{initrd-modules} field of your @code{operating-system} declaration, along @@ -157,7 +158,7 @@ these lines: (initrd-modules (append (list~{ ~s~}) %base-initrd-modules))) @end example\n") - modules))) + missing))) (&error-location (location (source-properties->location location))))))))) -- cgit v1.2.3 From 26b8cd1a5a0e28b3ff192c86f52fd43d22e55223 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Tue, 17 Jul 2018 20:19:20 +0100 Subject: gnu: Remove duplicated emacs-csv-mode. It was first added in 9faa46ee48d12bf55355805a84a7c533f904a39d, and then again in 8bc8efc753605e404c1efcdc5b53a780feb0760c. * gnu/packages/emacs.scm (emacs-csv-mode): Remove duplicated package definition. --- gnu/packages/emacs.scm | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 114fcee343..ca686d32ba 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -9653,26 +9653,6 @@ buffer.") downloading manager for Emacs.") (license license:gpl3+)))) -(define-public emacs-csv-mode - (package - (name "emacs-csv-mode") - (version "1.7") - (source - (origin - (method url-fetch) - (uri (string-append "http://elpa.gnu.org/packages/csv-mode-" - version ".el")) - (sha256 - (base32 - "0r4bip0w3h55i8h6sxh06czf294mrhavybz0zypzrjw91m1bi7z6")))) - (build-system emacs-build-system) - (home-page "http://elpa.gnu.org/packages/csv-mode.html") - (synopsis "Major mode for editing comma or char separated values") - (description - "This package provides an Emacs CSV mode, a major mode for editing -records in a generalized CSV (character-separated values) format.") - (license license:gpl3+))) - (define-public emacs-helpful (package (name "emacs-helpful") -- cgit v1.2.3 From d493d59a7f044edb766209b5daff2b68a7a61da0 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Tue, 17 Jul 2018 20:25:41 +0100 Subject: gnu: Remove duplicated emacs-load-relative. It was first added in fa1a17b78631681a23ae1fb7b1f902148bbebdbb, and then again in f8a88f223ea2ac36576cd92f457790df5a6f2408. * gnu/packages/emacs.scm (emacs-load-relative): Remove duplicated package definition. --- gnu/packages/emacs.scm | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index ca686d32ba..e607337fbf 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -8709,32 +8709,6 @@ region instead.") schema validation.") (license license:gpl3+))) -(define-public emacs-load-relative - (let ((commit "738896e3da491b35399178ed2c6bc92cc728d119") - (revision "1")) - (package - (name "emacs-load-relative") - (version (string-append "0.0.1" "-" revision "." - (string-take commit 7))) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/rocky/emacs-load-relative") - (commit commit))) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "1rpy5mfncncl6gqgg53d3g25g1700g4b9bivd4c0cfcv5dbxhp73")))) - (build-system emacs-build-system) - (home-page "https://github.com/rocky/emacs-load-relative") - (synopsis "Relative loads for Emacs Lisp files") - (description "@code{load-relative} allows to write small Emacs -functions or modules in a larger multi-file Emacs package and -facilitate running from the source tree without having to install the -code or fiddle with evil @code{load-path}.") - (license license:gpl3+)))) - (define-public emacs-rainbow-blocks (let ((commit "dd435d7bb34ff6f162a5f315df308b90b7e9f842")) (package -- cgit v1.2.3 From cfa6cc4d9a02447e4c8892df9dee9225e748291f Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Tue, 17 Jul 2018 20:38:27 +0100 Subject: gnu: Remove duplicated r-psych package. It was first added in cdc129dc53b1c04e9a6577f7d2b9641a0a03c32f, then again in db80dd4a1d7e2371bc3c300f48b84a817adb3550. * gnu/packages/cran.scm (r-psych): Remove duplicated package definition. --- gnu/packages/cran.scm | 35 ++--------------------------------- 1 file changed, 2 insertions(+), 33 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index fc4baa5b54..106b8c7fe6 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1686,14 +1686,14 @@ problems as well as resampling based estimators of prediction error.") (define-public r-psych (package (name "r-psych") - (version "1.7.8") + (version "1.8.4") (source (origin (method url-fetch) (uri (cran-uri "psych" version)) (sha256 (base32 - "0daismb8pdk392vdy304hqx0m3jx62gx3a0hygjygc125rhfla7k")))) + "1kzv9nc7rwn1sj1zxd8xrbs6c7qlka7j2c8lsr4f20znkd3qx8gf")))) (build-system r-build-system) (propagated-inputs `(("r-foreign" ,r-foreign) @@ -3467,37 +3467,6 @@ filtering functions, resampling routines, and visualization of filter models. It also includes interpolation functions.") (license license:gpl2))) -(define-public r-psych - (package - (name "r-psych") - (version "1.8.4") - (source - (origin - (method url-fetch) - (uri (cran-uri "psych" version)) - (sha256 - (base32 - "1kzv9nc7rwn1sj1zxd8xrbs6c7qlka7j2c8lsr4f20znkd3qx8gf")))) - (build-system r-build-system) - (propagated-inputs - `(("r-foreign" ,r-foreign) - ("r-lattice" ,r-lattice) - ("r-mnormt" ,r-mnormt) - ("r-nlme" ,r-nlme))) - (home-page "http://cran.r-project.org/web/packages/psych") - (synopsis "Procedures for psychological, psychometric, and personality research") - (description - "This package provides a general purpose toolbox for personality, -psychometric theory and experimental psychology. The functions are primarily -for multivariate analysis and scale construction using factor analysis, -principal component analysis, cluster analysis and reliability analysis, -although others provide basic descriptive statistics. It provides functions -for analyzing data at multiple levels within and between group statistics, -including correlations and factor analysis; functions for simulating and -testing particular item and test structures are included. Several functions -serve as a useful front end for structural equation modeling.") - (license license:gpl2+))) - (define-public r-gsubfn (package (name "r-gsubfn") -- cgit v1.2.3 From 89b48821767d78fede67065028ee0a0f3f172acb Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Tue, 17 Jul 2018 20:46:19 +0100 Subject: gnu: Remove duplicated ghc-th-lift-instances. It was first added in a6d1c4e75a76399c8d82a9570db5cd14351f661b, then again in ff7dd11f0a4fd6ca947cfa40cec42628fde44667. * gnu/packages/haskell.scm (ghc-th-lift-instances): Remove duplicated package definition. --- gnu/packages/haskell.scm | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 8d2dcba208..d9d39fb721 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -9221,31 +9221,6 @@ connections.") from aeson.") (license license:bsd-3))) -(define-public ghc-th-lift-instances - (package - (name "ghc-th-lift-instances") - (version "0.1.11") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "th-lift-instances-" version "/" - "th-lift-instances-" version ".tar.gz")) - (sha256 - (base32 - "1f56cp6ckcalld5jchv0kxpjkwcsixd7smd0g7r8cg67ppx6m90x")))) - (build-system haskell-build-system) - (inputs `(("ghc-th-lift" ,ghc-th-lift) - ("ghc-vector" ,ghc-vector) - ("ghc-text" ,ghc-text))) - (native-inputs `(("ghc-quickcheck" ,ghc-quickcheck))) - (home-page "https://github.com/bennofs/th-lift-instances") - (synopsis "Lift instances for template-haskell for common data types") - (description "Most data types in the Haskell platform do not have Lift -instances. This package provides orphan instances for containers, text, -bytestring and vector.") - (license license:bsd-3))) - (define-public ghc-generics-sop (package (name "ghc-generics-sop") -- cgit v1.2.3 From f694b4ba9c0f03f68b8430ad13742eee9e4f78b7 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Tue, 17 Jul 2018 20:56:09 +0100 Subject: gnu: Remove duplicated ghc-time-locale-compat. It was first added in 5e51bcf7b38511d943f4d24621be5817144061cd, then again in c56a30b3ba3e1e93ced3c6ba2cfb4c738b805074. * gnu/packages/haskell.scm (ghc-time-locale-compat): Remove duplicated package definition. --- gnu/packages/haskell.scm | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index d9d39fb721..7f14c59450 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -9278,26 +9278,6 @@ each constructor are represented using an n-ary product.") parser that uses ByteStrings for parsing and representing the URI data.") (license license:bsd-3))) -(define-public ghc-time-locale-compat - (package - (name "ghc-time-locale-compat") - (version "0.1.1.3") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "time-locale-compat-" version "/" - "time-locale-compat-" version ".tar.gz")) - (sha256 - (base32 - "1vdcfr2hp9qh3ag90x6ikbdf42wiqpdylnplffna54bpnilbyi4i")))) - (build-system haskell-build-system) - (home-page "https://github.com/khibino/haskell-time-locale-compat") - (synopsis "Compatibility of TimeLocale between old-locale and time-1.5") - (description "This Haskell package contains wrapped name module for -TimeLocale.") - (license license:bsd-3))) - (define-public ghc-http-api-data (package (name "ghc-http-api-data") -- cgit v1.2.3 From 3b4b6667af403f0d766307b7fd8effea96a106a0 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Tue, 17 Jul 2018 20:59:24 +0100 Subject: gnu: Remove duplicated perl-extutils-depends. This was first added in 84e8b19fe150ae843d63ca7343aa7172f35153f3, and then again in 017b014ce4a5defed12836886c4dfe2c5ae89d2d. * gnu/packages/perl.scm (perl-extutils-depends): Remove duplicated package definition. --- gnu/packages/perl.scm | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index afbe5979db..493b7860bd 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -3166,30 +3166,6 @@ and alternative installers with the `installler` option. But it's written in only about 40% as many lines of code and with zero non-core dependencies.") (license (package-license perl)))) -(define-public perl-extutils-depends - (package - (name "perl-extutils-depends") - (version "0.405") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://cpan/authors/id/X/XA/XAOC/ExtUtils-Depends-" - version - ".tar.gz")) - (sha256 - (base32 - "0b4ab9qmcihsfs2ajhn5qzg7nhazr68v3r0zvb7076smswd41mla")))) - (build-system perl-build-system) - (native-inputs - `(("perl-test-number-delta" - ,perl-test-number-delta))) - (home-page "http://search.cpan.org/dist/ExtUtils-Depends/") - (synopsis "Easily build XS extensions that depend on XS extensions") - (description "ExtUtils::Depends builds XS extensions that depend on XS -extensions") - (license (package-license perl)))) - (define-public perl-extutils-installpaths (package (name "perl-extutils-installpaths") -- cgit v1.2.3 From 6465497fb9a8980bc010ec8f68b320dc1a73b5cb Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Tue, 17 Jul 2018 21:13:38 +0100 Subject: gnu: Remove duplicated python-pafy. It was first added in 02f8f804f0242df885311715412a1e3ee5436f3b, then again in 2dd12924cf4a30a96262b6d392fcde58c9f10d4b. * gnu/packages/python.scm (python-pafy): Remove duplicated package definition. --- gnu/packages/python.scm | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index e9fb9f529f..d4448f23ad 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1747,30 +1747,6 @@ matching them against a list of media-ranges.") `(#:tests? #f ,@(package-arguments python2-funcsigs))))) -(define-public python-pafy - (package - (name "python-pafy") - (version "0.5.3.1") - (source - (origin - (method url-fetch) - (uri (pypi-uri "pafy" version)) - (sha256 - (base32 - "1a7dxi95m1043rxx1r5x3ngb66nwlq6aqcasyqqjzmmmjps4zrim")))) - (build-system python-build-system) - (arguments - `(#:tests? #f)) ; Currently pafy can not find itself in the tests - (propagated-inputs - ;; Youtube-dl is a python package which is imported in the file - ;; "backend_youtube_dl.py", therefore it needs to be propagated. - `(("youtube-dl" ,youtube-dl))) - (home-page "https://np1.github.io/pafy/") - (synopsis "Retrieve YouTube content and metadata") - (description - "@code{pafy} is a python library to retrieve YouTube content and metadata.") - (license license:lgpl3+))) - (define-public python-py (package (name "python-py") -- cgit v1.2.3 From 077d66ed4277d8195272bc64feed650a27cc2995 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 29 Jul 2018 15:32:22 +0300 Subject: gnu: mcrl2: Build with modular qt. * gnu/packages/maths.scm (mcrl2)[inputs]: Replace qt with qtbase. --- gnu/packages/maths.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index e828dbb2d3..f07c83dc0d 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -3968,7 +3968,7 @@ reduction.") `(("boost" ,boost) ("glu" ,glu) ("mesa" ,mesa) - ("qt" ,qt))) + ("qtbase" ,qtbase))) (build-system cmake-build-system) (synopsis "Toolset for the mCRL2 formal specification language") (description -- cgit v1.2.3 From 136ff9a2472506e02876ab04795a14b8e9f06eac Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 29 Jul 2018 16:03:59 +0300 Subject: gnu: monero: Use git-file-name. * gnu/packages/finance.scm (monero)[source]: Rename the downloaded source using 'git-file-name'. --- gnu/packages/finance.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 3ddaa76a4e..c20880b14b 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015, 2016 Andreas Enge -;;; Copyright © 2016, 2017 Efraim Flashner +;;; Copyright © 2016, 2017, 2018 Efraim Flashner ;;; Copyright © 2016 Alex Griffin ;;; Copyright © 2016 Hartmut Goebel ;;; Copyright © 2017 Carlo Zancanaro @@ -376,7 +376,7 @@ other machines/servers. Electroncash does not download the Bitcoin Cash blockch (uri (git-reference (url "https://github.com/monero-project/monero") (commit (string-append "v" version)))) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (git-file-name name version)) (patches (search-patches "monero-use-system-miniupnpc.patch")) (sha256 (base32 -- cgit v1.2.3 From 398a96a2864aa3101adfc7bbd56e4ea980fa3798 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 29 Jul 2018 16:05:53 +0300 Subject: gnu: monero-gui: Use git-file-name. * gnu/packages/finance.scm (monero-gui)[source]: Rename the downloaded source using 'git-file-name'. --- gnu/packages/finance.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index c20880b14b..69209e9a63 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -470,7 +470,7 @@ Monero command line client and daemon.") (uri (git-reference (url "https://github.com/monero-project/monero-gui") (commit (string-append "v" version)))) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (git-file-name name version)) (sha256 (base32 "1cnrkwh7kp64lnzz1xfmkf1mhsgm5gls292gpqai3jr8jydpkahl")))) -- cgit v1.2.3 From c6b60d30ad2dbb1371c74347cbb1dc8620891568 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 29 Jul 2018 19:21:08 +0300 Subject: gnu: libqmatrixclient: Don't use unstable tarball. * gnu/packages/messaging.scm (libqmatrixclient)[source]: Download using git reference and not autogenerated tarball. --- gnu/packages/messaging.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index a34f744659..715806d166 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer ;;; Copyright © 2015 Andreas Enge ;;; Copyright © 2015, 2016, 2017, 2018 Ricardo Wurmus -;;; Copyright © 2015 Efraim Flashner +;;; Copyright © 2015, 2018 Efraim Flashner ;;; Copyright © 2016, 2017 Nils Gillmann ;;; Copyright © 2016 Andy Patterson ;;; Copyright © 2016, 2017, 2018 Clément Lassieur @@ -1650,13 +1650,14 @@ notifications, and Python scripting support.") (version "0.3.0.2") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/QMatrixClient/libqmatrixclient/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/QMatrixClient/libqmatrixclient") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0yl7lw0s2z98xkxbklkb3i8xcd9af9qayl1zxl070d8ykl6ayqy3")))) + "03pxmr4wa818fgqddkr2fkwz6pda538x3ic9yq7c40x98zqf55w5")))) (build-system cmake-build-system) (inputs `(("qt" ,qt))) -- cgit v1.2.3 From 6f066db11f36d200eb15af6b0be4d9a2c094ef32 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 29 Jul 2018 19:22:36 +0300 Subject: gnu: quaternion: Don't use unstable tarball. * gnu/packages/messaging.scm (quaternion)[source]: Download using git reference and not autogenerated tarball. --- gnu/packages/messaging.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 715806d166..8caa120e2b 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1678,13 +1678,14 @@ QMatrixClient project.") (version "0.0.9.2") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/QMatrixClient/Quaternion/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/QMatrixClient/Quaternion") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0s2mpw11s2n21ds1spf94j1p2lj2px2bv5zxldlcx81ch0rb4ng8")))) + "0zrr4khbbdf5ziq65gi0cb1yb1d0y5rv18wld22w1x96f7fkmrib")))) (build-system cmake-build-system) (inputs `(("libqmatrixclient" ,libqmatrixclient) -- cgit v1.2.3 From 9febf39582d95940f295d5478f35a596eeb94a81 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 29 Jul 2018 19:28:23 +0300 Subject: gnu: libqmatrixclient: Build with modular qt. * gnu/packages/messaging.scm (libqmatrixclient)[inputs]: Remove qt, add qtbase. --- gnu/packages/messaging.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 8caa120e2b..6301a6878d 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1660,7 +1660,7 @@ notifications, and Python scripting support.") "03pxmr4wa818fgqddkr2fkwz6pda538x3ic9yq7c40x98zqf55w5")))) (build-system cmake-build-system) (inputs - `(("qt" ,qt))) + `(("qtbase" ,qtbase))) (arguments `(#:configure-flags (list "-DBUILD_SHARED_LIBS=ON") #:tests? #f)) ; No tests -- cgit v1.2.3 From 29739890601bfff91538ae494dd171b0e43b4cbb Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 29 Jul 2018 19:29:00 +0300 Subject: gnu: quaternion: Build with modular qt. * gnu/packages/messaging.scm (quaternion)[inputs]: Remove qt, add qtbase, qtdeclarative. --- gnu/packages/messaging.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 6301a6878d..98a65dcd3d 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1689,7 +1689,8 @@ QMatrixClient project.") (build-system cmake-build-system) (inputs `(("libqmatrixclient" ,libqmatrixclient) - ("qt" ,qt))) + ("qtbase" ,qtbase) + ("qtdeclarative" ,qtdeclarative))) (arguments `(#:tests? #f ; No tests #:phases -- cgit v1.2.3 From 42531fd3a7cf117e20806a9f7ed4df1c16b9ddd9 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 24 Jul 2018 17:14:55 +0300 Subject: gnu: Add python-docker-pycreds. * gnu/packages/docker.scm (python-docker-pycreds): New variable. --- gnu/packages/docker.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index f540417b4f..748de9aaaf 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 David Thompson +;;; Copyright © 2018 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -24,6 +25,7 @@ #:use-module (guix git-download) #:use-module (guix build-system python) #:use-module (guix utils) + #:use-module (gnu packages check) #:use-module (gnu packages python) #:use-module (gnu packages python-web)) @@ -103,3 +105,40 @@ multi-container Docker applications. A Compose file is used to configure an application’s services. Then, using a single command, the containers are created and all the services are started as specified in the configuration.") (license license:asl2.0))) + +(define-public python-docker-pycreds + (package + (name "python-docker-pycreds") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "docker-pycreds" version)) + (sha256 + (base32 + "1zxvam1q22qb0jf48553nnncnfrcp88ag4xa0qmq6vr0imn9a3lb")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-versioning + (lambda _ + (substitute* "test-requirements.txt" + (("3.0.2") ,(package-version python-pytest)) + (("2.3.1") ,(package-version python-pytest-cov)) + (("2.4.1") ,(package-version python-flake8))) + #t))))) + (native-inputs + `(("python-flake8" ,python-flake8) + ("python-pytest" ,python-pytest) + ("python-pytest-cov" ,python-pytest-cov))) + (propagated-inputs + `(("python-six" ,python-six))) + (home-page "https://github.com/shin-/dockerpy-creds") + (synopsis + "Python bindings for the Docker credentials store API") + (description + "Docker-Pycreds contains the Python bindings for the docker credentials +store API. It allows programmers to interact with a Docker registry using +Python without keeping their credentials in a Docker configuration file.") + (license license:asl2.0))) -- cgit v1.2.3 From 19110787aba7d1cb97b1c3ec4e006230bacf43bf Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 24 Jul 2018 17:19:02 +0300 Subject: gnu: Add python-pyperclip. * gnu/packages/xdisorg.scm (python-pyperclip): New variable. --- gnu/packages/xdisorg.scm | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 2a8958d37f..59ac02f79f 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -11,7 +11,7 @@ ;;; Copyright © 2015 Florian Paul Schmidt ;;; Copyright © 2016 Christopher Allan Webber ;;; Copyright © 2016 Ricardo Wurmus -;;; Copyright © 2016, 2017 Efraim Flashner +;;; Copyright © 2016, 2017, 2018 Efraim Flashner ;;; Copyright © 2016 Leo Famulari ;;; Copyright © 2016 Alex Kost ;;; Copyright © 2016, 2017 Marius Bakke @@ -1476,3 +1476,27 @@ first. Additionally, xss-lock uses the inhibition logic to lock the screen before the system goes to sleep.") (home-page "https://bitbucket.org/raymonad/xss-lock") (license license:expat)))) + +(define-public python-pyperclip + (package + (name "python-pyperclip") + (version "1.6.4") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pyperclip" version)) + (sha256 + (base32 + "1p505c23ji06r28k1y67siihsbdzdf1brhlqpyv9ams4gk9863pp")))) + (build-system python-build-system) + (arguments + '(#:tests? #f)) ; Not clear how to make tests pass. + (inputs + `(("xclip" ,xclip) + ("xsel" ,xsel))) + (home-page "https://github.com/asweigart/pyperclip") + (synopsis "Python clipboard module") + (description + "Pyperclip is a clipboard module for Python, handling copy/pasting from +the X11 clipboard") + (license license:bsd-3))) -- cgit v1.2.3 From c3f9a6ce676d0023484d52ea92813857d4574a8e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 24 Jul 2018 17:25:17 +0300 Subject: gnu: Add python-codecov. * gnu/packages/check.scm (python-codecov): New variable. --- gnu/packages/check.scm | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 42b90bc2b2..17a69bcd1c 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2015, 2017 Cyril Roelandt ;;; Copyright © 2015 Federico Beffa ;;; Copyright © 2015 Andreas Enge -;;; Copyright © 2015, 2016 Efraim Flashner +;;; Copyright © 2015, 2016, 2018 Efraim Flashner ;;; Copyright © 2016, 2017 Leo Famulari ;;; Copyright © 2016 Christopher Allan Webber ;;; Copyright © 2016, 2017 Danny Milosavljevic @@ -1223,6 +1223,30 @@ testing frameworks.") (define-public python2-cov-core (package-with-python2 python-cov-core)) +(define-public python-codecov + (package + (name "python-codecov") + (version "2.0.15") + (source + (origin + (method url-fetch) + (uri (pypi-uri "codecov" version)) + (sha256 + (base32 + "1217c0vqf7ii65635gvl27a5pfhv0r7zhrpdp9cx640hg73bgn4f")))) + (build-system python-build-system) + (native-inputs + `(("python-unittest2" ,python-unittest2))) + (propagated-inputs + `(("python-coverage" ,python-coverage) + ("python-requests" ,python-requests))) + (home-page "http://github.com/codecov/codecov-python") + (synopsis "Upload code coverage reports to @code{codecov.io}") + (description + "Codecov collects code coverage reports from code written in Python, Java, +C/C++, R, and more, and uploads it to the @code{codecov.io} service.") + (license license:asl2.0))) + (define-public python-testpath (package (name "python-testpath") -- cgit v1.2.3 From 2b1e80d2a922ebb04467aaa901212f490642fc89 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 24 Jul 2018 17:32:45 +0300 Subject: gnu: Add python-androguard. * gnu/packages/android.scm (python-androguard): New variable. --- gnu/packages/android.scm | 50 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm index 7618c0e1f6..997da710ec 100644 --- a/gnu/packages/android.scm +++ b/gnu/packages/android.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2017 Hartmut Goebel ;;; Copyright © 2017 Maxim Cournoyer ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -37,10 +38,12 @@ #:use-module (gnu packages gnupg) #:use-module (gnu packages pcre) #:use-module (gnu packages python) + #:use-module (gnu packages python-crypto) #:use-module (gnu packages selinux) #:use-module (gnu packages ssh) - #:use-module (gnu packages version-control) #:use-module (gnu packages tls) + #:use-module (gnu packages version-control) + #:use-module (gnu packages xdisorg) #:use-module (gnu packages linux)) (define-public android-make-stub @@ -807,3 +810,48 @@ script that you can put anywhere in your path.") Boot Images. @code{abootimg} can work directly on block devices, or, the safest way, on a file image.") (license license:gpl2+))) + +(define-public python-androguard + (package + (name "python-androguard") + (version "3.2.1") + (source + (origin + ;; The pypi release doesn't have the tests, but the tests use + ;; packaged binaries, so we skip them. + (method url-fetch) + (uri (pypi-uri "androguard" version)) + (sha256 + (base32 + "0ndsw00pkyda4i2s3wi5ap8gbk6a9d23xhhxpdbk02padv8sxkfv")))) + (build-system python-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (replace 'check + ;; Adapted from .travis.yml + (lambda _ + (invoke "nosetests" "--with-coverage" "--with-timer" + "--timer-top-n" "50")))))) + (native-inputs + `(("python-codecov" ,python-codecov) + ("python-coverage" ,python-coverage) + ("python-mock" ,python-mock) + ("python-nose" ,python-nose) + ("python-nose-timer" ,python-nose-timer))) + (propagated-inputs + `(("python-asn1crypto" ,python-asn1crypto) + ("python-colorama" ,python-colorama) + ("python-future" ,python-future) + ("python-ipython" ,python-ipython) + ("python-lxml" ,python-lxml) + ("python-matplotlib" ,python-matplotlib) + ("python-networkx" ,python-networkx) + ("python-pygments" ,python-pygments) + ("python-pyperclip" ,python-pyperclip))) + (home-page "https://github.com/androguard/androguard") + (synopsis "Python tool to play with Android files") + (description + "Androguard is a full Python tool to manipulate Android files. It is +useful for reverse engineering, analysis of Android applications and more.") + (license license:asl2.0))) -- cgit v1.2.3 From b23b9667d9db6bab519a738f1b5f0400cbeeacf6 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 24 Jul 2018 17:43:54 +0300 Subject: gnu: virtualization.scm: Use license prefix. * gnu/packages/virtualization.scm: Replace all 'license' values with a 'license:' prefix. --- gnu/packages/virtualization.scm | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index ebc57dc369..05605a0bbd 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -76,8 +76,7 @@ #:use-module (guix build-system python) #:use-module (guix download) #:use-module (guix git-download) - #:use-module ((guix licenses) #:select (gpl2 gpl2+ gpl3+ lgpl2.1 lgpl2.1+ - asl2.0)) + #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix utils) #:use-module (srfi srfi-1)) @@ -227,7 +226,7 @@ the KVM kernel module in Linux. When using KVM, QEMU can virtualize x86, server and embedded PowerPC, and S390 guests.") ;; Many files are GPLv2+, but some are GPLv2-only---e.g., `memory.c'. - (license gpl2) + (license license:gpl2) ;; Several tests fail on MIPS; see . (supported-systems (delete "mips64el-linux" %supported-systems)))) @@ -337,7 +336,7 @@ system on a hypervisor. Via GObject Introspection, the API is available in all common programming languages. Vala bindings are also provided.") ;; The library files are released under LGPLv2.1 or later; the source ;; files in the "tools" directory are released under GPLv2+. - (license (list lgpl2.1+ gpl2+)))) + (license (list license:lgpl2.1+ license:gpl2+)))) (define-public lxc (package @@ -382,7 +381,7 @@ all common programming languages. Vala bindings are also provided.") "LXC is a userspace interface for the Linux kernel containment features. Through a powerful API and simple tools, it lets Linux users easily create and manage system or application containers.") - (license lgpl2.1+))) + (license license:lgpl2.1+))) (define-public libvirt (package @@ -467,7 +466,7 @@ manage system or application containers.") capabilities of recent versions of Linux. The library aims at providing long term stable C API initially for the Xen paravirtualization but should be able to integrate other virtualization mechanisms if needed.") - (license lgpl2.1+))) + (license license:lgpl2.1+))) (define-public libvirt-glib (package @@ -515,7 +514,7 @@ three libraries: @item libvirt-gobject - GObjects for managing libvirt objects @end enumerate ") - (license lgpl2.1+))) + (license license:lgpl2.1+))) (define-public python-libvirt (package @@ -550,7 +549,7 @@ three libraries: (synopsis "Python bindings to libvirt") (description "This package provides Python bindings to the libvirt virtualization library.") - (license lgpl2.1+))) + (license license:lgpl2.1+))) (define-public python2-libvirt (package-with-python2 python-libvirt)) @@ -649,7 +648,7 @@ virtualization library.") virtual machines through libvirt. It primarily targets KVM VMs, but also manages Xen and LXC (Linux containers). It presents a summary view of running domains, their live performance and resource utilization statistics.") - (license gpl2+))) + (license license:gpl2+))) (define-public criu (package @@ -743,7 +742,7 @@ was frozen at. The distinctive feature of the CRIU project is that it is mainly implemented in user space.") ;; The project is licensed under GPLv2; files in the lib/ directory are ;; LGPLv2.1. - (license (list gpl2 lgpl2.1)))) + (license (list license:gpl2 license:lgpl2.1)))) (define-public qmpbackup (package @@ -765,7 +764,7 @@ mainly implemented in user space.") (description "qmpbackup is designed to create and restore full and incremental backups of running QEMU virtual machines via QMP, the QEMU Machine Protocol.") - (license gpl3+))) + (license license:gpl3+))) (define-public lookingglass (package @@ -813,7 +812,7 @@ monitor, keyboard or mouse. It displays the VM's rendered contents on your main monitor/GPU.") ;; This package requires SSE instructions. (supported-systems '("i686-linux" "x86_64-linux")) - (license gpl2+))) + (license license:gpl2+))) (define-public runc (package @@ -870,7 +869,7 @@ packaged according to the @uref{https://github.com/opencontainers/runtime-spec/blob/master/spec.md, Open Container Initiative (OCI) format} and is a compliant implementation of the Open Container Initiative specification.") - (license asl2.0))) + (license license:asl2.0))) (define-public umoci (package @@ -915,7 +914,7 @@ Open Container Initiative specification.") (description "@command{umoci} is a tool that allows for high-level modification of an Open Container Initiative (OCI) image layout and its tagged images.") - (license asl2.0))) + (license license:asl2.0))) (define-public skopeo (package @@ -977,4 +976,4 @@ the image. @item Delete container images from a remote container registry. @end enumerate") - (license asl2.0))) + (license license:asl2.0))) -- cgit v1.2.3 From 5e95181b9d3e27c68402d99b1523962ca0dd49f1 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 24 Jul 2018 17:44:21 +0300 Subject: gnu: Add python-vagrant. * gnu/packages/virtualization.scm (python-vagrant): New variable. --- gnu/packages/virtualization.scm | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 05605a0bbd..e4120de38f 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014, 2015, 2016, 2017 Ludovic Courtès ;;; Copyright © 2015, 2016, 2017, 2018 Mark H Weaver -;;; Copyright © 2016, 2017 Efraim Flashner +;;; Copyright © 2016, 2017, 2018 Efraim Flashner ;;; Copyright © 2016, 2017 Ricardo Wurmus ;;; Copyright © 2017 Alex Vong ;;; Copyright © 2017 Andy Patterson @@ -977,3 +977,25 @@ the image. @end enumerate") (license license:asl2.0))) + +(define-public python-vagrant + (package + (name "python-vagrant") + (version "0.5.15") + (source + (origin + (method url-fetch) + (uri (pypi-uri "python-vagrant" version)) + (sha256 + (base32 + "1ikrh6canhcxg5y7pzmkcnnydikppv7s6sm9prfx90nk0ac8m6mg")))) + (build-system python-build-system) + (arguments + '(#:tests? #f)) ; tests involve running vagrant. + (home-page "https://github.com/todddeluca/python-vagrant") + (synopsis "Python bindings for Vagrant") + (description + "Python-vagrant is a Python module that provides a thin wrapper around the +@code{vagrant} command line executable, allowing programmatic control of Vagrant +virtual machines.") + (license license:expat))) -- cgit v1.2.3 From b24da117e86db1e50bbb37cc608e78423b0c3712 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 24 Jul 2018 17:45:32 +0300 Subject: gnu: python-docker-py: Update to 1.10.6. * gnu/packages/docker.scm (python-docker-py): Update to 1.10.6. --- gnu/packages/docker.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 748de9aaaf..c58f3f3caa 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -32,14 +32,14 @@ (define-public python-docker-py (package (name "python-docker-py") - (version "1.6.0") + (version "1.10.6") (source (origin (method url-fetch) (uri (pypi-uri "docker-py" version)) (sha256 (base32 - "16ba4xyd46hkj9nkfpz15r8kskl7ljx1afjzchyrhdsrklvzgzim")))) + "05f49f6hnl7npmi7kigg0ibqk8s3fhzx1ivvz1kqvlv4ay3paajc")))) (build-system python-build-system) ;; TODO: Tests require a running Docker daemon. (arguments '(#:tests? #f)) -- cgit v1.2.3 From 76e206e644830d84f13213b7d50f7431c2def0e0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 24 Jul 2018 17:49:22 +0300 Subject: gnu: Add fdroidserver. * gnu/packages/android.scm (fdroidserver): New variable. --- gnu/packages/android.scm | 56 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm index 997da710ec..53d7d8d441 100644 --- a/gnu/packages/android.scm +++ b/gnu/packages/android.scm @@ -35,14 +35,18 @@ #:use-module (gnu packages) #:use-module (gnu packages check) #:use-module (gnu packages compression) + #:use-module (gnu packages docker) #:use-module (gnu packages gnupg) #:use-module (gnu packages pcre) #:use-module (gnu packages python) #:use-module (gnu packages python-crypto) + #:use-module (gnu packages python-web) #:use-module (gnu packages selinux) + #:use-module (gnu packages serialization) #:use-module (gnu packages ssh) #:use-module (gnu packages tls) #:use-module (gnu packages version-control) + #:use-module (gnu packages virtualization) #:use-module (gnu packages xdisorg) #:use-module (gnu packages linux)) @@ -855,3 +859,55 @@ safest way, on a file image.") "Androguard is a full Python tool to manipulate Android files. It is useful for reverse engineering, analysis of Android applications and more.") (license license:asl2.0))) + +(define-public fdroidserver + (package + (name "fdroidserver") + (version "1.0.9") + (source + (origin + (method url-fetch) + (uri (pypi-uri "fdroidserver" version)) + (sha256 + (base32 + "0cwb1fmindw6v9jkiim9yn3496rk1pvnk94s1r0vz2hxgz16xp7n")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-versioning + (lambda _ + (substitute* "setup.py" + (("0.2.1") ,(package-version python-pyasn1-modules))) + #t))))) + (propagated-inputs + `(("python-androguard" ,python-androguard) + ("python-apache-libcloud" ,python-apache-libcloud) + ("python-clint" ,python-clint) + ("python-docker-py" ,python-docker-py) + ("python-gitpython" ,python-gitpython) + ("python-mwclient" ,python-mwclient) + ("python-paramiko" ,python-paramiko) + ("python-pillow" ,python-pillow) + ("python-pyasn1" ,python-pyasn1) + ("python-pyasn1-modules" ,python-pyasn1-modules) + ("python-pyyaml" ,python-pyyaml) + ("python-qrcode" ,python-qrcode) + ("python-ruamel.yaml" ,python-ruamel.yaml) + ("python-requests" ,python-requests) + ("python-vagrant" ,python-vagrant))) + (native-inputs + `(("python-babel" ,python-babel) + ("python-bcrypt" ,python-bcrypt) + ("python-docker-pycreds" ,python-docker-pycreds) + ("python-pynacl" ,python-pynacl) + ("python-websocket-client" ,python-websocket-client))) + (home-page "https://f-droid.org") + (synopsis "F-Droid server tools") + (description + "The F-Droid server tools provide various scripts and tools that are used +to maintain F-Droid, the repository of free Android applications. You can use +these same tools to create your own additional or alternative repository for +publishing, or to assist in creating, testing and submitting metadata to the +main repository.") + (license license:agpl3+))) -- cgit v1.2.3 From 37297674184cf3c8645c8450b0f9ac458d1868be Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 29 Jul 2018 20:49:42 +0300 Subject: gnu: make-u-boot-package: Add missing module. * gnu/packages/bootloaders.scm (make-u-boot-package)[arguments]: Add missing 'srfi srfi-1' module. --- gnu/packages/bootloaders.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index de85ead174..e59d15c087 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -476,7 +476,10 @@ board-independent tools."))) `(("gcc-7" ,gcc-7))) ,@(package-native-inputs u-boot))) (arguments - `(#:modules ((ice-9 ftw) (guix build utils) (guix build gnu-build-system)) + `(#:modules ((ice-9 ftw) + (srfi srfi-1) + (guix build utils) + (guix build gnu-build-system)) #:test-target "test" #:make-flags (list "HOSTCC=gcc" -- cgit v1.2.3 From 4266df5cf847badc1bc929dc09b57f946e57c04e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 29 Jul 2018 20:37:59 +0200 Subject: gnu: libwps: Update to 0.4.9. * gnu/packages/libreoffice.scm (libwps): Update to 0.4.9. --- gnu/packages/libreoffice.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index dc13be19d2..a624a67e58 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -665,14 +665,14 @@ from the old StarOffice (.sdc, .sdw, ...).") (define-public libwps (package (name "libwps") - (version "0.4.7") + (version "0.4.9") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/" name "/" name "/" name "-" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "05xjb35y5ha9grgjqs3viaglq7ydsry1hzdvkm7y5b6f1disnb1g")))) + "08j9nxnrzxsnq35d9l824ad8w8az42fivaxn8ajl85dv6g3v1ghk")))) (build-system gnu-build-system) (native-inputs `(("doxygen" ,doxygen) -- cgit v1.2.3 From 1743172cdb420aafb2b417ee588e6d1bc66eebab Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 29 Jul 2018 21:31:55 +0200 Subject: gnu: libreoffice: Fix build with newer GLM. * gnu/packages/patches/libreoffice-glm.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/libreoffice.scm (libreoffice)[source](patches): Add it. --- gnu/local.mk | 1 + gnu/packages/libreoffice.scm | 3 +- gnu/packages/patches/libreoffice-glm.patch | 58 ++++++++++++++++++++++++++++++ 3 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/libreoffice-glm.patch diff --git a/gnu/local.mk b/gnu/local.mk index c58eec7bad..20b213c5fb 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -880,6 +880,7 @@ dist_patch_DATA = \ %D%/packages/patches/libmygpo-qt-fix-qt-5.11.patch \ %D%/packages/patches/libmygpo-qt-missing-qt5-modules.patch \ %D%/packages/patches/libreoffice-icu.patch \ + %D%/packages/patches/libreoffice-glm.patch \ %D%/packages/patches/libsndfile-armhf-type-checks.patch \ %D%/packages/patches/libsndfile-CVE-2017-8361-8363-8365.patch \ %D%/packages/patches/libsndfile-CVE-2017-8362.patch \ diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index a624a67e58..0fa04bdec7 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -907,7 +907,8 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.") (sha256 (base32 "0vnmb231hyhxm7klaqd8vp3rmvix145bq8iqzv19jgl1yaqkxl21")) - (patches (search-patches "libreoffice-icu.patch")))) + (patches (search-patches "libreoffice-icu.patch" + "libreoffice-glm.patch")))) (build-system gnu-build-system) (native-inputs `(("bison" ,bison) diff --git a/gnu/packages/patches/libreoffice-glm.patch b/gnu/packages/patches/libreoffice-glm.patch new file mode 100644 index 0000000000..9e76cf1389 --- /dev/null +++ b/gnu/packages/patches/libreoffice-glm.patch @@ -0,0 +1,58 @@ +Fix build with GLM 0.9.9. + +This patch is an amalgamation of these upstream commits: + +https://github.com/LibreOffice/core/commit/953c4add8fd76d88f49a81ae4c21a1fdcc007e57 +https://github.com/LibreOffice/core/commit/5f1bf6598b5725ad1e50ae9f7ec7524cc8a834fa + +diff --git a/chart2/Library_chartcore.mk b/chart2/Library_chartcore.mk +index 28bc87b89057..69d4c0552636 100644 +--- a/chart2/Library_chartcore.mk ++++ b/chart2/Library_chartcore.mk +@@ -23,6 +23,12 @@ $(eval $(call gb_Library_add_defs,chartcore,\ + -DOOO_DLLIMPLEMENTATION_CHARTVIEW \ + )) + ++ifeq ($(SYSTEM_GLM),TRUE) ++$(eval $(call gb_Library_add_defs,chartcore,\ ++ -DGLM_ENABLE_EXPERIMENTAL \ ++)) ++endif ++ + $(eval $(call gb_Library_set_precompiled_header,chartcore,$(SRCDIR)/chart2/inc/pch/precompiled_chartcore)) + + $(eval $(call gb_Library_use_externals,chartcore,\ +diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk +index c1f3cc5324e7..0b684c6185a9 100644 +--- a/vcl/Library_vcl.mk ++++ b/vcl/Library_vcl.mk +@@ -49,6 +49,12 @@ $(eval $(call gb_Library_add_defs,vcl,\ + -DENABLE_MERGELIBS=$(if $(MERGELIBS),1,0) \ + )) + ++ifeq ($(SYSTEM_GLM),TRUE) ++$(eval $(call gb_Library_add_defs,vcl,\ ++ -DGLM_ENABLE_EXPERIMENTAL \ ++)) ++endif ++ + $(eval $(call gb_Library_use_sdk_api,vcl)) + + $(eval $(call gb_Library_use_custom_headers,vcl,\ +diff --git a/vcl/Executable_icontest.mk b/vcl/Executable_icontest.mk +index ce163303f8a4..8c917b71cd0e 100644 +--- a/vcl/Executable_icontest.mk ++++ b/vcl/Executable_icontest.mk +@@ -19,6 +19,12 @@ $(eval $(call gb_Executable_use_externals,icontest,\ + )) + endif + ++ifeq ($(SYSTEM_GLM),TRUE) ++$(eval $(call gb_Executable_add_defs,icontest,\ ++ -DGLM_ENABLE_EXPERIMENTAL \ ++)) ++endif ++ + $(eval $(call gb_Executable_use_api,icontest,\ + offapi \ + udkapi \ -- cgit v1.2.3 From 253340dcc8c44acb4c687ebcc56e6f17167c5659 Mon Sep 17 00:00:00 2001 From: Alex ter Weele Date: Fri, 20 Jul 2018 21:35:14 -0500 Subject: gnu: agda: Compile .agda files. * gnu/packages/agda.scm: (agda)[arguments]: Compile .agda files. Signed-off-by: Marius Bakke --- gnu/packages/agda.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/gnu/packages/agda.scm b/gnu/packages/agda.scm index 6aa230116c..d677bb7e53 100644 --- a/gnu/packages/agda.scm +++ b/gnu/packages/agda.scm @@ -67,6 +67,19 @@ ("ghc-text" ,ghc-text) ("ghc-unordered-containers" ,ghc-unordered-containers) ("ghc-zlib" ,ghc-zlib))) + (arguments + `(#:modules ((guix build haskell-build-system) + (guix build utils) + (srfi srfi-26)) + #:phases + (modify-phases %standard-phases + (add-after 'compile 'agda-compile + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (agda-compiler (string-append out "/bin/agda"))) + (for-each (cut invoke agda-compiler <>) + (find-files (string-append out "/share") "\\.agda$")) + #t)))))) (home-page "http://wiki.portal.chalmers.se/agda/") (synopsis "Dependently typed functional programming language and proof assistant") -- cgit v1.2.3 From 1237653aa5c555bc6b621b6402b26064db2e668e Mon Sep 17 00:00:00 2001 From: Alex ter Weele Date: Sat, 21 Jul 2018 10:57:35 -0500 Subject: gnu: Add emacs-agda2-mode * gnu/packages/agda.scm (emacs-agda2-mode): New variable. Signed-off-by: Marius Bakke --- gnu/packages/agda.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/gnu/packages/agda.scm b/gnu/packages/agda.scm index d677bb7e53..df4968c445 100644 --- a/gnu/packages/agda.scm +++ b/gnu/packages/agda.scm @@ -20,6 +20,7 @@ #:use-module (gnu packages haskell) #:use-module (gnu packages haskell-check) #:use-module (gnu packages haskell-web) + #:use-module (guix build-system emacs) #:use-module (guix build-system haskell) #:use-module (guix build-system trivial) #:use-module (guix download) @@ -97,3 +98,19 @@ such as Coq, Epigram and NuPRL.") ;; Agda is distributed under the MIT license, and a couple of ;; source files are BSD-3. See LICENSE for details. (license (list license:expat license:bsd-3)))) + +(define-public emacs-agda2-mode + (package + (inherit agda) + (name "emacs-agda2-mode") + (build-system emacs-build-system) + (inputs '()) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'enter-elisp-dir + (lambda _ (chdir "src/data/emacs-mode") #t))))) + (home-page "https://agda.readthedocs.io/en/latest/tools/emacs-mode.html") + (synopsis "Emacs mode for Agda") + (description "This Emacs mode enables interactive development with +Agda. It also aids the input of Unicode characters."))) -- cgit v1.2.3 From 78022159a79c7ae30750a91c8630bf170dc336ea Mon Sep 17 00:00:00 2001 From: Clément Lassieur Date: Mon, 30 Jul 2018 00:46:26 +0200 Subject: gnu: cuirass: Update to 99241ef. * gnu/packages/ci.scm (cuirass): Update to 99241ef. --- gnu/packages/ci.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index 85dbefae7a..05353a790b 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -185,7 +185,7 @@ their dependencies.") (license l:gpl3+)))) (define-public cuirass - (let ((commit "7b2f9e0de1ad2d320973b7aea132a8afcad8bece") + (let ((commit "99241ef1af24cadf39e3cad39f9ff27c96b22068") (revision "17")) (package (name "cuirass") @@ -198,7 +198,7 @@ their dependencies.") (file-name (string-append name "-" version)) (sha256 (base32 - "0knww99adgjh8s6f38z3hpwi9hxhmnvqj5g35pcj80xv8j4xj3y3")))) + "1hj17s07sq6nn9wlssd4pi4hzdfyp74kyz5rqv7wr4468xh80pk7")))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) -- cgit v1.2.3 From 0c85d2c62dd0d439ff87f243c0885e5b207bee85 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Mon, 30 Jul 2018 10:45:16 +0530 Subject: gnu: youtube-dl: Update to 2018.07.29. * gnu/packages/video.scm (youtube-dl): Update to 2018.07.29. --- gnu/packages/video.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 930f83a3e5..605e461a6c 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -27,6 +27,7 @@ ;;; Copyright © 2018 Pierre Neidhardt ;;; Copyright © 2018 Leo Famulari ;;; Copyright © 2018 Brendan Tildesley +;;; Copyright © 2018 Arun Isaac ;;; ;;; This file is part of GNU Guix. ;;; @@ -1256,7 +1257,7 @@ access to mpv's powerful playback capabilities.") (define-public youtube-dl (package (name "youtube-dl") - (version "2018.07.10") + (version "2018.07.29") (source (origin (method url-fetch) (uri (string-append "https://yt-dl.org/downloads/" @@ -1264,7 +1265,7 @@ access to mpv's powerful playback capabilities.") version ".tar.gz")) (sha256 (base32 - "1rigah941k2drzx5qz937lk68gw9jrizj5lgd9f9znp0bgi2d0xd")))) + "18rszvvpw9zyqfjysydvl24jf0hlpfcd22fgqsijhsq7bznwr9jj")))) (build-system python-build-system) (arguments ;; The problem here is that the directory for the man page and completion -- cgit v1.2.3 From 6915d20f05363f61cef9c4ed7ebda3fe5a19325d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 30 Jul 2018 09:43:15 +0300 Subject: gnu: monero-gui: Build with modular qt. * gnu/packages/finance.scm (monero-gui)[inputs]: Remove qt, add qtbase, qtdeclarative, qtgraphicaleffects, qtquickcontrols. [native-inputs]: Add qttools. [arguments]: Add a custom phase to patch the absolute file-name of lrelease and lupdate. Add a custom phase to wrap the executable with QT environmental variables. --- gnu/packages/finance.scm | 35 ++++++++++++++++++++++++++++++++--- 1 file changed, 32 insertions(+), 3 deletions(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 69209e9a63..fd2a5af0cb 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -478,12 +478,16 @@ Monero command line client and daemon.") (native-inputs `(("doxygen" ,doxygen) ("graphviz" ,graphviz) - ("pkg-config" ,pkg-config))) + ("pkg-config" ,pkg-config) + ("qttools" ,qttools))) (inputs `(("boost" ,boost) ("libunwind" ,libunwind) ("openssl" ,openssl) - ("qt" ,qt) + ("qtbase" ,qtbase) + ("qtdeclarative" ,qtdeclarative) + ("qtgraphicaleffects" ,qtgraphicaleffects) + ("qtquickcontrols" ,qtquickcontrols) ("readline" ,readline) ("unbound" ,unbound))) (propagated-inputs @@ -518,6 +522,15 @@ Monero command line client and daemon.") (string-append "\""(assoc-ref inputs "monero") "/bin/monerod"))) #t)) + (add-after 'fix-monerod-path 'fix-qt-paths + (lambda* (#:key inputs #:allow-other-keys) + (let* ((qttools (assoc-ref inputs "qttools")) + (lrelease (string-append qttools "/bin/lrelease")) + (lupdate (string-append qttools "/bin/lupdate"))) + (substitute* "monero-wallet-gui.pro" + (("\\$\\$\\[QT_INSTALL_BINS\\]/lrelease") lrelease) + (("\\$\\$\\[QT_INSTALL_BINS\\]/lupdate") lupdate)) + #t))) (replace 'build (lambda _ (invoke "./build.sh"))) @@ -529,7 +542,23 @@ Monero command line client and daemon.") #t)) (add-before 'install 'change-dir (lambda _ - (chdir "build")))))) + (chdir "build"))) + (add-after 'install 'wrap-executable + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (wrap-program (string-append out "/bin/monero-wallet-gui") + `("QT_PLUGIN_PATH" ":" prefix + ,(map (lambda (label) + (string-append (assoc-ref inputs label) + "/lib/qt5/plugins")) + '("qtbase" "qtdeclarative"))) + `("QML2_IMPORT_PATH" ":" prefix + ,(map (lambda (label) + (string-append (assoc-ref inputs label) + "/lib/qt5/qml")) + '("qtdeclarative" "qtgraphicaleffects" + "qtquickcontrols")))) + #t)))))) (home-page "https://getmonero.org/") (synopsis "Graphical user interface for the Monero currency") (description -- cgit v1.2.3 From 5416e40f1ab14ed0844e255f269d144eab185eec Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 30 Jul 2018 14:38:17 +0300 Subject: gnu: tig: Update to 2.4.1. * gnu/packages/version-control.scm (tig): Update to 2.4.1. [description]: Fix texinfo markup. --- gnu/packages/version-control.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 6cb3354204..3db5796b4c 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1579,7 +1579,7 @@ from Subversion to any supported Distributed Version Control System (DVCS).") (define-public tig (package (name "tig") - (version "2.3.3") + (version "2.4.1") (source (origin (method url-fetch) (uri (string-append @@ -1587,7 +1587,7 @@ from Subversion to any supported Distributed Version Control System (DVCS).") version "/tig-" version ".tar.gz")) (sha256 (base32 - "1skbhhj1narsnsff1azdylcy6xghxb18mzqysmipcyyvlv2i17fk")))) + "1f2qhpzbl7f35lsjcnx8lxzskha24m4frczsw78284jp7qcamdmn")))) (build-system gnu-build-system) (native-inputs `(("asciidoc" ,asciidoc) @@ -1608,7 +1608,7 @@ from Subversion to any supported Distributed Version Control System (DVCS).") (description "Tig is an ncurses text user interface for Git, primarily intended as a history browser. It can also stage hunks for commit, or colorize the -output of the 'git' command.") +output of the @code{git} command.") (license license:gpl2+))) (define-public findnewest -- cgit v1.2.3 From 1121a5c67aff73e129c3dffa61645ebb6f77c9d7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 30 Jul 2018 14:41:14 +0300 Subject: gnu: openssh: Update home-page. * gnu/packages/ssh.scm (openssh)[home-page]: Update to new home-page. --- gnu/packages/ssh.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index cd92c62f58..faa09e94c3 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès ;;; Copyright © 2013, 2014 Andreas Enge ;;; Copyright © 2014, 2015, 2016 Mark H Weaver -;;; Copyright © 2015, 2016 Efraim Flashner +;;; Copyright © 2015, 2016, 2018 Efraim Flashner ;;; Copyright © 2016 Leo Famulari ;;; Copyright © 2016 Nicolas Goaziou ;;; Copyright © 2016 Christopher Allan Webber @@ -232,7 +232,7 @@ TCP-forwarding. It provides a flow control service for these channels. Additionally, various channel-specific options can be negotiated.") (license (license:non-copyleft "file://LICENSE" "See LICENSE in the distribution.")) - (home-page "http://www.openssh.org/"))) + (home-page "https://www.openssh.com/"))) (define-public guile-ssh (package -- cgit v1.2.3 From de596e99549d7764f370ab2ed3b756f620b1f23d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 30 Jul 2018 14:58:28 +0300 Subject: gnu: parallel: Update to 20180722. * gnu/packages/parallel.scm (parallel): Update to 20180722. --- gnu/packages/parallel.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm index cb27f49c07..a7fe44243a 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014 Eric Bavier ;;; Copyright © 2015 Mark H Weaver -;;; Copyright © 2015, 2016, 2017 Efraim Flashner +;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner ;;; Copyright © 2016 Pjotr Prins ;;; Copyright © 2016 Andreas Enge ;;; Copyright © 2016 Ricardo Wurmus @@ -48,7 +48,7 @@ (define-public parallel (package (name "parallel") - (version "20180622") + (version "20180722") (source (origin (method url-fetch) @@ -56,7 +56,7 @@ version ".tar.bz2")) (sha256 (base32 - "1n91dnnl8d8pman20hr03l9qrpc9wm5hw32ph45xjs0bgp1nmk7j")))) + "06635p9w4kl0mvqlbgglsndl1zm06f65ckzrjl9p8n4cswf443fg")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From f475b90c353deff5b848753bf88c855f481f1ec0 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sun, 29 Jul 2018 22:31:46 -0400 Subject: gnu: warzone2100: Update to 3.2.3. * gnu/packages/games.scm (warzone2100): Update to 3.2.3. [arguments]: Add "--with-distributor=Guix" to #:configure-flags. Remove 'remove-reference-to-missing-file' and 'patch-for-qt5.8' phases. Add 'fix-ivis-linktest' phase. [native-inputs]: Add gettext-minimal. [inputs]: Add harfbuzz and remove quesoglc. --- gnu/packages/games.scm | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index ee4ef78edc..5ed928f5b7 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2957,7 +2957,7 @@ fullscreen, use F5 or Alt+Enter.") (define-public warzone2100 (package (name "warzone2100") - (version "3.2.1") + (version "3.2.3") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/" name @@ -2965,10 +2965,11 @@ fullscreen, use F5 or Alt+Enter.") ".tar.xz")) (sha256 (base32 - "1nd609s0g4sya3r4amhkz3f4dpdmm94vsd2ii76ap665a1nbfrhg")))) + "10kmpr4cby95zwqsl1zwx95d9achli6khq7flv6xmrq30a39xazw")))) (build-system gnu-build-system) (arguments - `(#:phases + `(#:configure-flags '("--with-distributor=Guix") + #:phases (modify-phases %standard-phases (add-after 'unpack 'link-tests-with-qt (lambda _ @@ -2976,24 +2977,22 @@ fullscreen, use F5 or Alt+Enter.") (("(framework_linktest_LDADD|maptest_LDADD) = " prefix) (string-append prefix "$(QT5_LIBS) "))) #t)) - (add-after 'unpack 'remove-reference-to-missing-file - (lambda _ - (substitute* "icons/Makefile.in" - (("\\$\\(INSTALL_DATA\\) \\$\\(srcdir\\)/warzone2100.appdata.xml.*") "")) - #t)) - (add-after 'unpack 'patch-for-qt5.8 + (add-after 'unpack 'fix-ivis-linktest (lambda _ - (substitute* "lib/widget/editbox.cpp" - (("== '\\\\0'") - "== QChar('\\0')")) + (substitute* "tests/ivis_linktest.cpp" + (("iV_DrawTextRotated.*;") + (string-append "iV_DrawTextRotated(\"Press ESC to exit.\", " + "100, 100, 0.0f, font_regular);"))) #t))))) - (native-inputs `(("pkg-config" ,pkg-config) + (native-inputs `(("gettext" ,gettext-minimal) + ("pkg-config" ,pkg-config) ("unzip" ,unzip) ("zip" ,zip))) (inputs `(("fontconfig" ,fontconfig) ("freetype" ,freetype) ("fribidi" ,fribidi) ("glew" ,glew) + ("harfbuzz" ,harfbuzz) ("libtheora" ,libtheora) ("libvorbis" ,libvorbis) ("libxrandr" ,libxrandr) @@ -3002,7 +3001,6 @@ fullscreen, use F5 or Alt+Enter.") ("qtbase" ,qtbase) ("qtscript" ,qtscript) ("openssl" ,openssl) - ("quesoglc" ,quesoglc) ("sdl2" ,sdl2))) (home-page "http://wz2100.net") (synopsis "3D Real-time strategy and real-time tactics game") -- cgit v1.2.3