Merge pull request #292721 from r-ryantm/auto-update/lzip

lzip: 1.24 -> 1.24.1
This commit is contained in:
Weijia Wang 2024-03-06 21:30:29 +01:00 committed by GitHub
commit 2db89cb619
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 18 deletions

View file

@ -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 = [

View file

@ -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