From b8d7119bc2572f3270c45fb063bb4c46a4ab379c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 25 Jul 2018 18:17:34 +0200 Subject: gnu: libmspack: Update to 0.7. * gnu/packages/compression.scm (libmspack): Update to 0.7. --- 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 2e62cd76ea..238624a4e6 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -642,14 +642,14 @@ (define-public sfarkxtc (define-public libmspack (package (name "libmspack") - (version "0.6") + (version "0.7") (source (origin (method url-fetch) (uri (string-append "http://www.cabextract.org.uk/libmspack/libmspack-" version "alpha.tar.gz")) (sha256 - (base32 "08gr2pcinas6bdqz3k0286g5cnksmcx813skmdwyca6bmj1fxnqy")))) + (base32 "0wi7ydq8vjiq0kfnpkj2d6vll2s49x38bywnsdqphqb0vdn53q1n")))) (build-system gnu-build-system) (home-page "http://www.cabextract.org.uk/libmspack/") (synopsis "Compression tools for some formats used by Microsoft") -- cgit v1.2.3 From 03c16bb59af0b5e7e1acdb3ee599ea782736898a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 25 Jul 2018 18:17:54 +0200 Subject: gnu: libmspack: Don't build static library. * gnu/packages/compression.scm (libmspack)[arguments]: Add #:configure-flags. --- gnu/packages/compression.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu/packages/compression.scm') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 238624a4e6..29b1f54573 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -651,6 +651,8 @@ (define-public libmspack (sha256 (base32 "0wi7ydq8vjiq0kfnpkj2d6vll2s49x38bywnsdqphqb0vdn53q1n")))) (build-system gnu-build-system) + (arguments + `(#:configure-flags '("--disable-static"))) (home-page "http://www.cabextract.org.uk/libmspack/") (synopsis "Compression tools for some formats used by Microsoft") (description -- cgit v1.2.3 From 27b2f34cda6d464fae2db0795fe47d21f1aa45bf Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 25 Jul 2018 18:23:45 +0200 Subject: gnu: Update cabextract.org.uk home pages. * gnu/packages/compression.scm (libmspack, cabextract)[home-page, source]: Use HTTPS. --- gnu/packages/compression.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'gnu/packages/compression.scm') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 29b1f54573..5742d5e189 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -642,18 +642,17 @@ (define-public sfarkxtc (define-public libmspack (package (name "libmspack") + (home-page "https://cabextract.org.uk/libmspack/") (version "0.7") (source (origin (method url-fetch) - (uri (string-append "http://www.cabextract.org.uk/libmspack/libmspack-" - version "alpha.tar.gz")) + (uri (string-append home-page name "-" version "alpha.tar.gz")) (sha256 (base32 "0wi7ydq8vjiq0kfnpkj2d6vll2s49x38bywnsdqphqb0vdn53q1n")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--disable-static"))) - (home-page "http://www.cabextract.org.uk/libmspack/") (synopsis "Compression tools for some formats used by Microsoft") (description "The purpose of libmspack is to provide both compression and @@ -1023,11 +1022,11 @@ (define-public bsdiff (define-public cabextract (package (name "cabextract") + (home-page "https://cabextract.org.uk/") (version "1.6") (source (origin (method url-fetch) - (uri (string-append - "http://cabextract.org.uk/cabextract-" version ".tar.gz")) + (uri (string-append home-page name "-" version ".tar.gz")) (sha256 (base32 "1ysmmz25fjghq7mxb2anyyvr1ljxqxzi4piwjhk0sdamcnsn3rnf")))) @@ -1037,7 +1036,6 @@ (define-public cabextract `(("pkg-config" ,pkg-config))) (inputs `(("libmspack" ,libmspack))) - (home-page "http://www.cabextract.org.uk/") (synopsis "Tool to unpack Cabinet archives") (description "Extracts files out of Microsoft Cabinet (.cab) archives") ;; Some source files specify gpl2+, lgpl2+, however COPYING is gpl3. -- cgit v1.2.3 From e0a98e7bd55a31974311e853f6751b90a4a82198 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 26 Jul 2018 17:28:35 +0200 Subject: gnu: cabextract: Update to 1.7. * gnu/packages/compression.scm (cabextract): Update to 1.7. --- 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 5742d5e189..5745f66650 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1023,13 +1023,13 @@ (define-public cabextract (package (name "cabextract") (home-page "https://cabextract.org.uk/") - (version "1.6") + (version "1.7") (source (origin (method url-fetch) (uri (string-append home-page name "-" version ".tar.gz")) (sha256 (base32 - "1ysmmz25fjghq7mxb2anyyvr1ljxqxzi4piwjhk0sdamcnsn3rnf")))) + "1g86wmb8lkjiv2jarfz979ngbgg7d3si8x5il4g801604v406wi9")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--with-external-libmspack"))) (native-inputs -- cgit v1.2.3 From 92526ade57e0bd23ab4025b8532511ef80df5fba Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 26 Jul 2018 17:30:18 +0200 Subject: gnu: cabextract: Delete bundled libmspack. * gnu/packages/compression.scm (cabextract)[source](modules, snippet): New field. --- gnu/packages/compression.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'gnu/packages/compression.scm') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 5745f66650..1c5e00ec95 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1029,7 +1029,13 @@ (define-public cabextract (uri (string-append home-page name "-" version ".tar.gz")) (sha256 (base32 - "1g86wmb8lkjiv2jarfz979ngbgg7d3si8x5il4g801604v406wi9")))) + "1g86wmb8lkjiv2jarfz979ngbgg7d3si8x5il4g801604v406wi9")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Delete bundled libmspack. + (delete-file-recursively "mspack") + #t)))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--with-external-libmspack"))) (native-inputs -- cgit v1.2.3