From f6145bb652a890478f5b756f7350ba401dbfddff Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 12 Feb 2019 13:58:44 +0100 Subject: gnu: lziprecover: Don't use NAME in source URI. * gnu/packages/compression.scm (lziprecover)[source]: Hard-code NAME. --- gnu/packages/compression.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/compression.scm') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index b6f07dfa9a..734ea3288f 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -10,7 +10,7 @@ ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner ;;; Copyright © 2016 Ben Woodcroft ;;; Copyright © 2016 Danny Milosavljevic -;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice +;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2016 David Craven ;;; Copyright © 2016, 2019 Kei Kebreau ;;; Copyright © 2016, 2018 Marius Bakke @@ -543,8 +543,8 @@ archiving. Lzip is a clean implementation of the LZMA algorithm.") (version "1.20") (source (origin (method url-fetch) - (uri (string-append "mirror://savannah/lzip/" name "/" - name "-" version ".tar.gz")) + (uri (string-append "mirror://savannah/lzip/lziprecover/" + "lziprecover-" version ".tar.gz")) (sha256 (base32 "0fpnmdxayvd1ff0rk9606dvr431ji6b1v71km4ww244rih1rmmzz")))) -- cgit v1.2.3 From b099b4a75a2b96dafd31745c3b942a5431f02497 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 12 Feb 2019 13:59:02 +0100 Subject: gnu: lziprecover: Update to 1.21. * gnu/packages/compression.scm (lziprecover): Update to 1.21. --- gnu/packages/compression.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/compression.scm') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 734ea3288f..c841122db5 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -540,14 +540,14 @@ archiving. Lzip is a clean implementation of the LZMA algorithm.") (define-public lziprecover (package (name "lziprecover") - (version "1.20") + (version "1.21") (source (origin (method url-fetch) (uri (string-append "mirror://savannah/lzip/lziprecover/" "lziprecover-" version ".tar.gz")) (sha256 (base32 - "0fpnmdxayvd1ff0rk9606dvr431ji6b1v71km4ww244rih1rmmzz")))) + "094w2z8fz41yaq0gkyr61cl7pb1d7kchpl5dka7rvm3qvbb7ncd2")))) (build-system gnu-build-system) (home-page "https://www.nongnu.org/lzip/lziprecover.html") (synopsis "Recover and decompress data from damaged lzip files") -- cgit v1.2.3 From 894669a787b47e00722f6915d01652414e66188b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 12 Feb 2019 14:05:13 +0100 Subject: gnu: plzip: Don't use NAME in source URI. * gnu/packages/compression.scm (plzip)[source]: Hard-code NAME. --- gnu/packages/compression.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/compression.scm') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index c841122db5..f2676e8673 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1691,8 +1691,8 @@ corrupted input.") (source (origin (method url-fetch) - (uri (string-append "mirror://savannah/lzip/" - name "/" name "-" version ".tar.gz")) + (uri (string-append "mirror://savannah/lzip/plzip/" + "plzip-" version ".tar.gz")) (sha256 (base32 "1dzjp9r7krwpsn224bhcqbzd5aj5b4556sdi9yzl2bzbk3fjrqlm")))) (build-system gnu-build-system) -- cgit v1.2.3 From ff0e1eed327e1266b3fd0942d4073e6351ac9f02 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 12 Feb 2019 14:05:25 +0100 Subject: gnu: plzip: Update to 1.8. * gnu/packages/compression.scm (plzip): Update to 1.8. --- gnu/packages/compression.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/compression.scm') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index f2676e8673..aa95944538 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1687,14 +1687,14 @@ corrupted input.") (define-public plzip (package (name "plzip") - (version "1.7") + (version "1.8") (source (origin (method url-fetch) (uri (string-append "mirror://savannah/lzip/plzip/" "plzip-" version ".tar.gz")) (sha256 - (base32 "1dzjp9r7krwpsn224bhcqbzd5aj5b4556sdi9yzl2bzbk3fjrqlm")))) + (base32 "04indil809qgfmz776imb3dnhkysh7zk28jcv3mw0ahl2lyaxbzd")))) (build-system gnu-build-system) (inputs `(("lzlib" ,lzlib))) -- cgit v1.2.3 From a28cd4770295e945787a9891eb0411bb6225aaa4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 12 Feb 2019 14:13:12 +0100 Subject: gnu: lunzip: Don't use NAME in source URI. * gnu/packages/compression.scm (lunzip)[source]: Hard-code NAME. --- gnu/packages/compression.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/compression.scm') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index aa95944538..0544cf2c64 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1610,8 +1610,8 @@ of archives.") (source (origin (method url-fetch) - (uri (string-append "mirror://savannah/lzip/" - name "/" name "-" version ".tar.gz")) + (uri (string-append "mirror://savannah/lzip/lunzip/" + "lunzip-" version ".tar.gz")) (sha256 (base32 "1iw59br6nsxs7l1p875h8w3vxwr04xfhg5zyal64crvamhxkj5kl")))) (build-system gnu-build-system) -- cgit v1.2.3 From 9f4f085f9b1a87cb0e233a31d66e90d53c2b109b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 12 Feb 2019 14:13:21 +0100 Subject: gnu: lunzip: Update to 1.11. * gnu/packages/compression.scm (lunzip): Update to 1.11. --- gnu/packages/compression.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/compression.scm') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 0544cf2c64..3eec91f895 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1606,14 +1606,14 @@ of archives.") (define-public lunzip (package (name "lunzip") - (version "1.10") + (version "1.11") (source (origin (method url-fetch) (uri (string-append "mirror://savannah/lzip/lunzip/" "lunzip-" version ".tar.gz")) (sha256 - (base32 "1iw59br6nsxs7l1p875h8w3vxwr04xfhg5zyal64crvamhxkj5kl")))) + (base32 "19zq3gmlbia2krq4k4zs1j0xjdv7nsdzqvfb0pyca5n53h2mzb91")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 39e5d3b68d57ec752bd79507119adc3f7fe6ca2a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 12 Feb 2019 14:23:07 +0100 Subject: gnu: clzip: Don't use NAME in source URI. * gnu/packages/compression.scm (clzip)[source]: Hard-code NAME. --- gnu/packages/compression.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/compression.scm') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 3eec91f895..8112784b80 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1637,8 +1637,8 @@ Lunzip is intended to be fully compatible with the regular lzip package.") (source (origin (method url-fetch) - (uri (string-append "mirror://savannah/lzip/" - name "/" name "-" version ".tar.gz")) + (uri (string-append "mirror://savannah/lzip/clzip/" + "clzip-" version ".tar.gz")) (sha256 (base32 "03xcmhl3dya4jrwmsqh09ikimpb36fr3vkh2bwfzz1sbcns0cdg3")))) (build-system gnu-build-system) -- cgit v1.2.3 From 11b1c71d2e30fe71cba5e7bf99a07dd6603fee48 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 12 Feb 2019 14:23:19 +0100 Subject: gnu: clzip: Update to 1.11. * gnu/packages/compression.scm (clzip): Update to 1.11. --- gnu/packages/compression.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/compression.scm') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 8112784b80..2a403c9545 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1633,14 +1633,14 @@ Lunzip is intended to be fully compatible with the regular lzip package.") (define-public clzip (package (name "clzip") - (version "1.10") + (version "1.11") (source (origin (method url-fetch) (uri (string-append "mirror://savannah/lzip/clzip/" "clzip-" version ".tar.gz")) (sha256 - (base32 "03xcmhl3dya4jrwmsqh09ikimpb36fr3vkh2bwfzz1sbcns0cdg3")))) + (base32 "1h14dmc9fi10gcdpdpbgq1bwvcxvivppilj64pf720x8mw915mfr")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 76b2f08468cf513d364dd614d3d817a63d8dc1a6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 12 Feb 2019 14:30:30 +0100 Subject: gnu: lzlib: Don't use NAME in source URI. * gnu/packages/compression.scm (lzlib)[source]: Hard-code NAME. --- gnu/packages/compression.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/compression.scm') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 2a403c9545..af5c311982 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1663,8 +1663,8 @@ Clzip is intended to be fully compatible with the regular lzip package.") (source (origin (method url-fetch) - (uri (string-append "mirror://savannah/lzip/" - name "/" name "-" version ".tar.gz")) + (uri (string-append "mirror://savannah/lzip/lzlib/" + "lzlib-" version ".tar.gz")) (sha256 (base32 "0hqhnj2lzqacdbmmnpy91lsm1rd9zlngs1q6s9pyahsv1a0bfshx")))) (build-system gnu-build-system) -- cgit v1.2.3 From 2990422377f4ae09d000d68d22699e3ac65a57af Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 12 Feb 2019 14:30:37 +0100 Subject: gnu: lzlib: Update to 1.11. * gnu/packages/compression.scm (lzlib): Update to 1.11. --- gnu/packages/compression.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/compression.scm') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index af5c311982..e5b5d9f3ce 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1659,14 +1659,14 @@ Clzip is intended to be fully compatible with the regular lzip package.") (define-public lzlib (package (name "lzlib") - (version "1.10") + (version "1.11") (source (origin (method url-fetch) (uri (string-append "mirror://savannah/lzip/lzlib/" "lzlib-" version ".tar.gz")) (sha256 - (base32 "0hqhnj2lzqacdbmmnpy91lsm1rd9zlngs1q6s9pyahsv1a0bfshx")))) + (base32 "0djdj4sg33rzi4k84cygvnp09bfsv6i8wy2k7i67rayib63myp3c")))) (build-system gnu-build-system) ;; The included minilzip binary is only ~16 smaller than the ‘real’ lzip. ;; It's used during the test suite, but don't be tempted to install it. -- cgit v1.2.3 From 571a01d8faded5098916d8d35544b323846d4080 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 12 Feb 2019 14:45:25 +0100 Subject: gnu: lzlib: Remove minilzip comment. It lacks lzip's dependency on libstdc++.so and libm.so and may have its uses. * gnu/packages/compression.scm (lzlib): Don't judge. --- gnu/packages/compression.scm | 2 -- 1 file changed, 2 deletions(-) (limited to 'gnu/packages/compression.scm') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index e5b5d9f3ce..0c57f1c27b 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1668,8 +1668,6 @@ Clzip is intended to be fully compatible with the regular lzip package.") (sha256 (base32 "0djdj4sg33rzi4k84cygvnp09bfsv6i8wy2k7i67rayib63myp3c")))) (build-system gnu-build-system) - ;; The included minilzip binary is only ~16 smaller than the ‘real’ lzip. - ;; It's used during the test suite, but don't be tempted to install it. (arguments `(#:configure-flags (list "CC=gcc" -- cgit v1.2.3 From 6cf48e8c201cc161cc2196502167ab23ad20c16a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 15 Feb 2019 16:24:30 +0100 Subject: gnu: unshield: Update to 1.4.3. * gnu/packages/compression.scm (unshield): Update to 1.4.3. [inputs]: Add unshield-baldurs_gate_patch_v1_1_4315_international.zip. [arguments]: Use it. --- gnu/packages/compression.scm | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) (limited to 'gnu/packages/compression.scm') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 0c57f1c27b..4f4d71e469 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1261,7 +1261,7 @@ or junctions, and always follows hard links.") (define-public unshield (package (name "unshield") - (version "1.4.2") + (version "1.4.3") (source (origin (method url-fetch) (uri (string-append "http://github.com/twogood/unshield/archive/" @@ -1269,25 +1269,36 @@ or junctions, and always follows hard links.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0x7ps644yp5dka2zhb8w0ifqmw3d255jafpzfwv8xbcpgq6fmm2x")))) + "1avv5c11jbmzwizq10pwvlh1dmyna8ccvpgacv95h4gbq26rg35a")))) (build-system cmake-build-system) (inputs `(("zlib" ,zlib) ("openssl" ,openssl) - ;; test data that is otherwise downloaded with curl + ;; Test data that is otherwise downloaded with curl. ("unshield-avigomanager11b22.zip" ,(origin (method url-fetch) - (uri (string-append "https://www.dropbox.com/s/8r4b6752swe3nhu/" - "unshield-avigomanager11b22.zip?dl=1")) + (uri (string-append + "https://www.dropbox.com/s/8r4b6752swe3nhu/" + "unshield-avigomanager11b22.zip?dl=1")) (sha256 (base32 "0fwq7lih04if68wpwpsk5wjqyvh32db76a41sq6gbx4dn1lc3ddn")) (file-name "unshield-avigomanager11b22.zip"))) + ("unshield-baldurs_gate_patch_v1_1_4315_international.zip" + ,(origin + (method url-fetch) + (uri (string-append + "https://www.dropbox.com/s/9ruil8oi6amjbbk/" + "unshield-baldurs_gate_patch_v1_1_4315_international.zip?dl=1")) + (sha256 + (base32 "0spaxf6dardlhqxz3ys09fzamj007q3nfyw4xng6gh3qp9780maj")) + (file-name "unshield-baldurs_gate_patch_v1_1_4315_international.zip"))) ("unshield-the-feeble-files-spanish.zip" ,(origin (method url-fetch) - (uri (string-append "https://www.dropbox.com/s/1ng0z9kfxc7eb1e/" - "unshield-the-feeble-files-spanish.zip?dl=1")) + (uri (string-append + "https://www.dropbox.com/s/1ng0z9kfxc7eb1e/" + "unshield-the-feeble-files-spanish.zip?dl=1")) (sha256 (base32 "1k5cw6vnpja8yjlnhx5124xrw9i8s1l539hfdqqrqz3l5gn0bnyd")) (file-name "unshield-the-feeble-files-spanish.zip"))))) @@ -1303,6 +1314,7 @@ or junctions, and always follows hard links.") (copy-file (assoc-ref inputs i) (string-append "test/v0/" i))) '("unshield-avigomanager11b22.zip" + "unshield-baldurs_gate_patch_v1_1_4315_international.zip" "unshield-the-feeble-files-spanish.zip")) (substitute* (find-files "test/" "/*\\.sh") ;; Tests expect the unshield binary in a specific @@ -1315,7 +1327,12 @@ or junctions, and always follows hard links.") (substitute* "test/v0/avigomanager.sh" (("test.zip") (string-append (getcwd) - "/test/v0/unshield-avigomanager11b22.zip"))) + "/test/v0/unshield-avigomanager11b22.zip"))) + (substitute* "test/v0/baldurs_gate_patch_v1_1_4315_international.sh" + (("test.zip") + (string-append + (getcwd) + "/test/v0/unshield-baldurs_gate_patch_v1_1_4315_international.zip"))) (substitute* "test/v0/the-feeble-files-spanish.sh" (("test.zip") (string-append (getcwd) -- cgit v1.2.3