From 3ec8c0ca942409da6ce06c38f6d8b6ccfc2a943a Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sat, 7 Sep 2019 15:35:14 -0700 Subject: gnu: diffoscope: Update to 123. * gnu/packages/package-management (diffoscope): Update to 123. [arguments]: Update phase writable-test-data to include tests directory. Add phase remove-ocaml-test. --- gnu/packages/package-management.scm | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'gnu/packages/package-management.scm') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 100c148fda..1cc2d3f6a0 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -546,7 +546,7 @@ (define-public rpm (license license:gpl2+))) (define-public diffoscope - (let ((version "122")) + (let ((version "123")) (package (name "diffoscope") (version version) @@ -558,7 +558,7 @@ (define-public diffoscope (file-name (git-file-name name version)) (sha256 (base32 - "1pwddknk8qyv88ba63why8vbnlc14b47434lv4ijx49m7ya3zfvg")))) + "11bxms5rkhi0v4pxx29v4qgvhp3fmf0fkzci6gn5xcv4fl1zy4wj")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases @@ -575,6 +575,13 @@ (define-public diffoscope (lambda _ (delete-file "tests/comparators/test_berkeley_db.py") #t)) + ;; Test is dynamically generated and may have false + ;; negatives with different ocaml versions. Further + ;; background in: https://bugs.debian.org/939386 + (add-after 'unpack 'remove-ocaml-test + (lambda _ + (delete-file "tests/comparators/test_ocaml.py") + #t)) (add-after 'unpack 'embed-tool-references (lambda* (#:key inputs #:allow-other-keys) (substitute* "diffoscope/comparators/utils/compare.py" @@ -594,10 +601,9 @@ (define-public diffoscope #t)) (add-before 'check 'writable-test-data (lambda _ - ;; tests/comparators/test_elf.py needs write access to - ;; test data - (make-file-writable - "tests/data/ignore_readelf_errors_expected_diff") + ;; tests may need needs write access to tests + ;; directory + (for-each make-file-writable (find-files "tests")) #t)) (add-before 'check 'delete-failing-test (lambda _ -- cgit v1.2.3 From 3dd20da0cbdd8b273b5b76b6b8f95aed28c8d0e9 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Fri, 6 Sep 2019 10:52:50 -0700 Subject: gnu: diffoscope: Enable additional tests. * gnu/packages/package-management (diffoscope) [native-inputs]: Add additional packages used for tests. --- gnu/packages/package-management.scm | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) (limited to 'gnu/packages/package-management.scm') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 1cc2d3f6a0..560684e458 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -620,7 +620,25 @@ (define-public diffoscope ("xxd" ,xxd))) ;; Below are modules used for tests. (native-inputs `(("python-pytest" ,python-pytest) - ("python-chardet" ,python-chardet))) + ("python-chardet" ,python-chardet) + ;; test suite skips tests when tool is missing + ("bdb" ,bdb) + ("binutils" ,binutils) + ("bzip2" ,bzip2) + ("colord" ,colord) + ("cpio" ,cpio) + ("e2fsprogs" ,e2fsprogs) + ("gettext" ,gettext-minimal) + ("gnumeric" ,gnumeric) + ("gnupg" ,gnupg) + ("libarchive" ,libarchive) + ("lz4" ,lz4) + ("openssh" ,openssh) + ("rpm" ,rpm) + ("sqlite" ,sqlite) + ("squashfs-tools" ,squashfs-tools) + ("xxd" ,xxd) + ("xz" ,xz))) (home-page "https://diffoscope.org/") (synopsis "Compare files, archives, and directories in depth") (description -- cgit v1.2.3 From 37ecf2d905e6afc555150ffe51095415a0d27b89 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sat, 7 Sep 2019 17:04:39 -0700 Subject: gnu: diffoscope: Enable even more tests. * gnu/packages/package-management (diffoscope)[native-inputs]: Add additional dependencies for tests. [use-module]: Add corresponding package modules. --- gnu/packages/package-management.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu/packages/package-management.scm') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 560684e458..579a2001d8 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -31,6 +31,7 @@ (define-module (gnu packages package-management) #:use-module (gnu packages) #:use-module (gnu packages acl) + #:use-module (gnu packages admin) #:use-module (gnu packages attr) #:use-module (gnu packages avahi) #:use-module (gnu packages autotools) @@ -39,6 +40,7 @@ (define-module (gnu packages package-management) #:use-module (gnu packages bdw-gc) #:use-module (gnu packages bison) #:use-module (gnu packages bootstrap) ;for 'bootstrap-guile-origin' + #:use-module (gnu packages cdrom) #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages cpio) @@ -48,6 +50,7 @@ (define-module (gnu packages package-management) #:use-module (gnu packages docbook) #:use-module (gnu packages file) #:use-module (gnu packages gettext) + #:use-module (gnu packages ghostscript) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages gnupg) @@ -55,12 +58,20 @@ (define-module (gnu packages package-management) #:use-module (gnu packages gtk) #:use-module (gnu packages guile) #:use-module (gnu packages guile-xyz) + #:use-module (gnu packages haskell) + #:use-module (gnu packages image) + #:use-module (gnu packages imagemagick) + #:use-module (gnu packages java) + #:use-module (gnu packages libreoffice) #:use-module (gnu packages linux) #:use-module (gnu packages lisp) + #:use-module (gnu packages llvm) #:use-module (gnu packages man) + #:use-module (gnu packages mono) #:use-module (gnu packages nettle) #:use-module (gnu packages nss) #:use-module (gnu packages patchutils) + #:use-module (gnu packages pdf) #:use-module (gnu packages perl) #:use-module (gnu packages perl-check) #:use-module (gnu packages pkg-config) @@ -72,8 +83,10 @@ (define-module (gnu packages package-management) #:use-module (gnu packages sqlite) #:use-module (gnu packages ssh) #:use-module (gnu packages texinfo) + #:use-module (gnu packages textutils) #:use-module (gnu packages time) #:use-module (gnu packages tls) + #:use-module (gnu packages video) #:use-module (gnu packages vim) #:use-module (gnu packages virtualization) #:use-module (gnu packages web) @@ -625,18 +638,31 @@ (define-public diffoscope ("bdb" ,bdb) ("binutils" ,binutils) ("bzip2" ,bzip2) + ("cdrtools" ,cdrtools) ("colord" ,colord) ("cpio" ,cpio) + ("docx2txt" ,docx2txt) ("e2fsprogs" ,e2fsprogs) + ("ffmpeg" ,ffmpeg) ("gettext" ,gettext-minimal) + ("ghc" ,ghc) + ("ghostscript" ,ghostscript) + ("giflib:bin" ,giflib "bin") ("gnumeric" ,gnumeric) ("gnupg" ,gnupg) + ("imagemagick" ,imagemagick) ("libarchive" ,libarchive) + ("llvm" ,llvm) ("lz4" ,lz4) + ("mono" ,mono) + ;; no unversioned openjdk available + ("openjdk:jdk" ,openjdk12 "jdk") ("openssh" ,openssh) + ("poppler" ,poppler) ("rpm" ,rpm) ("sqlite" ,sqlite) ("squashfs-tools" ,squashfs-tools) + ("tcpdump" ,tcpdump) ("xxd" ,xxd) ("xz" ,xz))) (home-page "https://diffoscope.org/") -- cgit v1.2.3 From d54ca1cd4d77a945ad07dba34a69c23a3e57b3f1 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Fri, 6 Sep 2019 16:48:40 -0700 Subject: gnu: Add sng. * gnu/packages/images (sng): New variable. * gnu/packages/package-management (diffoscope)[native-inputs]: Add sng. --- gnu/packages/image.scm | 39 +++++++++++++++++++++++++++++++++++++ gnu/packages/package-management.scm | 1 + 2 files changed, 40 insertions(+) (limited to 'gnu/packages/package-management.scm') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 433e59c207..2a9ee990be 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1836,3 +1836,42 @@ (define-public slurp to the standard output. It works well together with grim.") ;; MIT license. (license license:expat))) + +(define-public sng + (package + (name "sng") + (version "1.1.0") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/sng/sng-" + version ".tar.gz")) + (sha256 + (base32 "06a6ydvx9xb3vxvrzdrg3hq0rjwwj9ibr7fyyxjxq6qx1j3mb70i")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'check 'link-pngsuite + ;; tests expect pngsuite in source dir + (lambda* (#:key inputs #:allow-other-keys) + (symlink (assoc-ref inputs "pngsuite") "pngsuite") + #t))) + #:configure-flags + (list (string-append "--with-rgbtxt=" + (assoc-ref %build-inputs "xorg-rgb") + "/share/X11/rgb.txt")))) + (inputs `(("xorg-rgb" ,xorg-rgb) + ("libpng" ,libpng))) + (native-inputs `(("pngsuite" ,pngsuite))) + (home-page "http://sng.sourceforge.net") + (synopsis "Markup language for representing PNG contents") + (description "SNG (Scriptable Network Graphics) is a minilanguage designed +specifically to represent the entire contents of a PNG (Portable Network +Graphics) file in an editable form. Thus, SNGs representing elaborate +graphics images and ancillary chunk data can be readily generated or modified +using only text tools. + +SNG is implemented by a compiler/decompiler called sng that +losslessly translates between SNG and PNG.") + (license license:zlib))) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 579a2001d8..b9eabfb55c 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -660,6 +660,7 @@ (define-public diffoscope ("openssh" ,openssh) ("poppler" ,poppler) ("rpm" ,rpm) + ("sng" ,sng) ("sqlite" ,sqlite) ("squashfs-tools" ,squashfs-tools) ("tcpdump" ,tcpdump) -- cgit v1.2.3 From bc5aa386675cb39aaf034d73af406c3ddffb4cb0 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Thu, 5 Sep 2019 16:12:08 -0700 Subject: gnu: Add odt2txt. * gnu/packages/textutils (odt2txt): New variable. * gnu/packages/package-management (diffoscope)[native-inputs]: Add odt2txt. [use-modules]: Remove accidentally added libreoffice package module. --- gnu/packages/package-management.scm | 2 +- gnu/packages/textutils.scm | 38 +++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 1 deletion(-) (limited to 'gnu/packages/package-management.scm') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index b9eabfb55c..b712bd7ec9 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -62,7 +62,6 @@ (define-module (gnu packages package-management) #:use-module (gnu packages image) #:use-module (gnu packages imagemagick) #:use-module (gnu packages java) - #:use-module (gnu packages libreoffice) #:use-module (gnu packages linux) #:use-module (gnu packages lisp) #:use-module (gnu packages llvm) @@ -655,6 +654,7 @@ (define-public diffoscope ("llvm" ,llvm) ("lz4" ,lz4) ("mono" ,mono) + ("odt2txt" ,odt2txt) ;; no unversioned openjdk available ("openjdk:jdk" ,openjdk12 "jdk") ("openssh" ,openssh) diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index 388f164428..2da31973f4 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -879,6 +879,44 @@ (define-public docx2txt (home-page "http://docx2txt.sourceforge.net") (license license:gpl3+))) +(define-public odt2txt + (package + (name "odt2txt") + (version "0.5") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/dstosberg/odt2txt/") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0im3kzvhxkjlx57w6h13mc9584c74ma1dyymgvpq2y61av3gc35v")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; no make check + #:make-flags (list "CC=gcc" + (string-append "DESTDIR=" (assoc-ref %outputs "out"))) + #:phases + (modify-phases %standard-phases + ;; no configure script + (delete 'configure)))) + (inputs + `(("zlib" ,zlib))) + (home-page "https://github.com/dstosberg/odt2txt/") + (synopsis "Converter from OpenDocument Text to plain text") + (description "odt2txt is a command-line tool which extracts the text out +of OpenDocument Texts, as produced by OpenOffice.org, KOffice, StarOffice and +others. + +odt2txt can also extract text from some file formats similar to OpenDocument +Text, such as OpenOffice.org XML (*.sxw), which was used by OpenOffice.org +version 1.x and older StarOffice versions. To a lesser extent, odt2txt may be +useful to extract content from OpenDocument spreadsheets (*.ods) and +OpenDocument presentations (*.odp).") + (license license:gpl2))) + (define-public opencc (package (name "opencc") -- cgit v1.2.3 From 74781c65f3d5294ea7da12366bf0fd22b08b381b Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 8 Sep 2019 14:04:50 +0200 Subject: gnu: guix: Update to cc98b00. * gnu/packages/package-management.scm (guix): Update to cc98b00. (guix-daemon)[arguments]: Remove 'install' phase; add 'change-default-guix' phase. --- gnu/packages/package-management.scm | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) (limited to 'gnu/packages/package-management.scm') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index b712bd7ec9..32836331f6 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -123,8 +123,8 @@ (define-public guix ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.0.1") - (commit "c902458863d1d341ffd74970b75e69c2bb848183") - (revision 4)) + (commit "cc98b00857e29074de96a6ed60e325cdfffaea1a") + (revision 5)) (package (name "guix") @@ -140,7 +140,7 @@ (define-public guix (commit commit))) (sha256 (base32 - "0w93qjgy9n0qqyij12s7hm7fl4wb6h99bmfril4cqf4ynckpdvbb")) + "0r5v4a0lyvn97gvp1q6algpw91k77r36vlnxx8w4s0c6r767b6z3")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments @@ -355,6 +355,19 @@ (define-public guix-daemon #f) ((#:phases phases '%standard-phases) `(modify-phases ,phases + (add-after 'unpack 'change-default-guix + (lambda _ + ;; We need to tell 'guix-daemon' which 'guix' command to use. + ;; Here we use a questionable hack where we hard-code root's + ;; current guix, which could be wrong (XXX). Note that scripts + ;; like 'guix perform-download' do not run as root so we assume + ;; that they have access to /var/guix/profiles/per-user/root. + (substitute* "nix/libstore/globals.cc" + (("guixProgram = (.*)nixBinDir + \"/guix\"" _ before) + (string-append "guixProgram = " before + "/var/guix/profiles/per-user/root\ +/current-guix/bin/guix"))) + #t)) (replace 'build (lambda _ (invoke "make" "nix/libstore/schema.sql.hh") @@ -364,19 +377,7 @@ (define-public guix-daemon (delete 'copy-bootstrap-guile) (replace 'install (lambda* (#:key outputs #:allow-other-keys) - (invoke "make" "install-binPROGRAMS" - "install-nodist_pkglibexecSCRIPTS") - - ;; We need to tell 'guix-daemon' which 'guix' command to use. - ;; Here we use a questionable hack where we hard-code root's - ;; current guix, which could be wrong (XXX). Note that scripts - ;; like 'guix perform-download' do not run as root so we assume - ;; that they have access to /var/guix/profiles/per-user/root. - (let ((out (assoc-ref outputs "out"))) - (substitute* (find-files (string-append out "/libexec")) - (("exec \".*/bin/guix\"") - "exec \"${GUIX:-/var/guix/profiles/per-user/root/current-guix/bin/guix}\"")) - #t))) + (invoke "make" "install-binPROGRAMS"))) (delete 'wrap-program))))))) (define-public guile2.0-guix -- cgit v1.2.3 From ba7bd6c62ddaab4d5623fb149b47579e13a9e5f5 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 8 Sep 2019 01:56:53 -0700 Subject: gnu: Add pgpdump. * gnu/packages/gnupg (pgpdump): New variable. * gnu/packages/package-management (diffoscope)[native-inputs]: Add pgpdump. --- gnu/packages/gnupg.scm | 28 ++++++++++++++++++++++++++++ gnu/packages/package-management.scm | 1 + 2 files changed, 29 insertions(+) (limited to 'gnu/packages/package-management.scm') diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 0d619c6a1d..bc1e3c8720 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -907,6 +907,34 @@ (define-public paperkey them to transform your existing public key into a secret key.") (license license:gpl2+))) +(define-public pgpdump + (package + (name "pgpdump") + (version "0.33") + (source + (origin + (method url-fetch) + (uri (string-append "https://www.mew.org/~kazu/proj/pgpdump/pgpdump-" + version ".tar.gz")) + (sha256 + (base32 "1j001jra2m89n6cys3n0hs574bipjdzfxhzpnd4jfyv95mqwl7n4")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; no make check + #:configure-flags (list "--prefix=/") + #:make-flags (list "CC=gcc" + (string-append "DESTDIR=" (assoc-ref %outputs "out"))))) + (inputs + `(("zlib" ,zlib))) + (home-page "https://www.mew.org/~kazu/proj/pgpdump/en/") + (synopsis "PGP packet visualizer") + (description "pgpdump displays the sequence of OpenPGP or PGP version 2 +packets from a file. + +The output of this command is similar to GnuPG's list packets command, +however, pgpdump produces more detailed and easier to understand output.") + (license license:bsd-3))) + (define-public gpa (package (name "gpa") diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 32836331f6..0d1830c164 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -659,6 +659,7 @@ (define-public diffoscope ;; no unversioned openjdk available ("openjdk:jdk" ,openjdk12 "jdk") ("openssh" ,openssh) + ("pgpdump" ,pgpdump) ("poppler" ,poppler) ("rpm" ,rpm) ("sng" ,sng) -- cgit v1.2.3 From 30696ea2b27747e047589527572ef39e60555047 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 8 Sep 2019 13:40:01 -0700 Subject: gnu: diffoscope: Add zip and unzip for test suite. * gnu/packages/package-management (diffoscope)[native-inputs]: Add zip, unzip. --- gnu/packages/package-management.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu/packages/package-management.scm') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 0d1830c164..18e8a3853f 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -666,8 +666,10 @@ (define-public diffoscope ("sqlite" ,sqlite) ("squashfs-tools" ,squashfs-tools) ("tcpdump" ,tcpdump) + ("unzip" ,unzip) ("xxd" ,xxd) - ("xz" ,xz))) + ("xz" ,xz) + ("zip" ,(@ (gnu packages compression) zip)))) (home-page "https://diffoscope.org/") (synopsis "Compare files, archives, and directories in depth") (description -- cgit v1.2.3 From 9e8e252026f558933bdd9cfc26a75d13954b3e8e Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 17 Sep 2019 10:14:27 +0200 Subject: gnu: guix: Update to 1h2qlbb. Fixes . Reported by Mikhail Kryshen . * gnu/packages/package-management.scm (guix): Update to 1h2qlbb. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/package-management.scm') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 18e8a3853f..a56c738e78 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -123,8 +123,8 @@ (define-public guix ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.0.1") - (commit "cc98b00857e29074de96a6ed60e325cdfffaea1a") - (revision 5)) + (commit "0ed97e69805253656df929a6ad678016aa81f08a") + (revision 6)) (package (name "guix") @@ -140,7 +140,7 @@ (define-public guix (commit commit))) (sha256 (base32 - "0r5v4a0lyvn97gvp1q6algpw91k77r36vlnxx8w4s0c6r767b6z3")) + "1h2qlbbdqi72jslx17gp2cak5494nbm8j44rz57lnplnfcn6iwaw")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3