Update dependencies

This commit is contained in:
Charlotte Van Petegem 2023-06-28 09:22:11 +02:00
parent 7dbc85630d
commit 62d323d741
No known key found for this signature in database
GPG key ID: 019E764B7184435A
5 changed files with 25 additions and 76 deletions

View file

@ -1,20 +0,0 @@
diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix
index a4b6f6c164f32..102313ddbdfcb 100644
--- a/pkgs/tools/security/eid-mw/default.nix
+++ b/pkgs/tools/security/eid-mw/default.nix
@@ -21,13 +21,13 @@
stdenv.mkDerivation rec {
pname = "eid-mw";
# NOTE: Don't just blindly update to the latest version/tag. Releases are always for a specific OS.
- version = "5.1.10";
+ version = "5.1.11";
src = fetchFromGitHub {
owner = "Fedict";
repo = "eid-mw";
rev = "v${version}";
- hash = "sha256-2Xru/s7KawZlIxON5nO679P+L3okofE054WDfRsE3ZI=";
+ hash = "sha256-70UjfkH+rx1Q+2XEuAByoDsP5ZelyuGXaHdkjTe/sCY=";
};
nativeBuildInputs = [ autoreconfHook autoconf-archive pkg-config makeWrapper ];

View file

@ -1,30 +0,0 @@
diff --git a/pkgs/development/libraries/libnatpmp/default.nix b/pkgs/development/libraries/libnatpmp/default.nix
index 8841de12f9a4b..b41b086bf1c39 100644
--- a/pkgs/development/libraries/libnatpmp/default.nix
+++ b/pkgs/development/libraries/libnatpmp/default.nix
@@ -9,6 +9,7 @@ stdenv.mkDerivation rec {
hash = "sha256-BoTtLIQGQ351GaG9IOqDeA24cbOjpddSMRuj6Inb/HA=";
};
+ patches = [ ./headers.patch ];
makeFlags = [
"INSTALLPREFIX=$(out)"
"CC:=$(CC)"
diff --git a/pkgs/development/libraries/libnatpmp/headers.patch b/pkgs/development/libraries/libnatpmp/headers.patch
new file mode 100644
index 0000000000000..1a47bd5146707
--- /dev/null
+++ b/pkgs/development/libraries/libnatpmp/headers.patch
@@ -0,0 +1,12 @@
+diff a/Makefile b/Makefile
+--- a/Makefile
++++ b/Makefile
+@@ -56,7 +56,7 @@ else
+ endif
+ endif
+
+-HEADERS = natpmp.h
++HEADERS = natpmp.h natpmp_declspec.h
+
+ EXECUTABLES = testgetgateway natpmpc-shared natpmpc-static
+