summaryrefslogtreecommitdiffstats
path: root/pkgs/tools/compression
diff options
context:
space:
mode:
authorR. Ryantm <ryantm-bot@ryantm.com>2024-03-02 04:41:51 +0000
committerWeijia Wang <9713184+wegank@users.noreply.github.com>2024-03-02 14:10:11 +0100
commit0712b9fe0a0b23a19a24df0c8147dd50ba0a8d91 (patch)
tree46e338991f5d6c3a044776cc3e509ab88b246d5e /pkgs/tools/compression
parentdbc93a12161bff01eba5902fbba6d539dd6c7b0c (diff)
lzip: 1.24 -> 1.24.1
Diffstat (limited to 'pkgs/tools/compression')
-rw-r--r--pkgs/tools/compression/lzip/default.nix7
-rw-r--r--pkgs/tools/compression/lzip/mingw-mkdir-one-argument.patch13
2 files changed, 2 insertions, 18 deletions
diff --git a/pkgs/tools/compression/lzip/default.nix b/pkgs/tools/compression/lzip/default.nix
index cbf789d1bbf1..82052bab6e3d 100644
--- a/pkgs/tools/compression/lzip/default.nix
+++ b/pkgs/tools/compression/lzip/default.nix
@@ -7,19 +7,16 @@
stdenv.mkDerivation rec {
pname = "lzip";
- version = "1.24";
+ version = "1.24.1";
outputs = [ "out" "man" "info" ];
src = fetchurl {
url = "mirror://savannah/lzip/${pname}-${version}.tar.gz";
- sha256 = "sha256-1CZZIpsQ4GbutugetnPN2JO2cuUS0mcZwtlZdVVspWw=";
+ hash = "sha256-MMnLagYF9HnElsN262KaSLChaW0WfjweCQxd76SBsWI=";
};
patches = lib.optionals stdenv.hostPlatform.isMinGW [
./mingw-install-exe-file.patch
- # https://lists.nongnu.org/archive/html/lzip-bug/2024-02/msg00015.html
- # patch provided by upstream, to be removed in the next release
- ./mingw-mkdir-one-argument.patch
];
configureFlags = [
diff --git a/pkgs/tools/compression/lzip/mingw-mkdir-one-argument.patch b/pkgs/tools/compression/lzip/mingw-mkdir-one-argument.patch
deleted file mode 100644
index efa0d8e3a067..000000000000
--- a/pkgs/tools/compression/lzip/mingw-mkdir-one-argument.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- lzip-1.24/main.cc 2024-01-26 00:08:47.000000000 +0100
-+++ lzip-1.24.1/src/main.cc 2024-02-06 16:04:00.000000000 +0100
-@@ -42,8 +42,10 @@
- #if defined __MSVCRT__ || defined __OS2__ || defined __DJGPP__
- #include <io.h>
- #if defined __MSVCRT__
-+#include <direct.h>
- #define fchmod(x,y) 0
- #define fchown(x,y,z) 0
-+#define mkdir(name,mode) _mkdir(name)
- #define strtoull std::strtoul
- #define SIGHUP SIGTERM
- #define S_ISSOCK(x) 0