diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-12-13 12:01:48 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-13 12:01:48 +0000 |
| commit | 688991ba84af0bf9518e5f0a3c2c471474a358e0 (patch) | |
| tree | 51f80f7ddfb4a5312566d68a579ef6a141f9e5f3 /pkgs/tools | |
| parent | f5eed8de6a723c61ed1c40a967632bcf78f935b2 (diff) | |
| parent | 022a4231437548b719eb9e5b8bae1a7f6117fa93 (diff) | |
| download | nixlib-688991ba84af0bf9518e5f0a3c2c471474a358e0.tar nixlib-688991ba84af0bf9518e5f0a3c2c471474a358e0.tar.gz nixlib-688991ba84af0bf9518e5f0a3c2c471474a358e0.tar.bz2 nixlib-688991ba84af0bf9518e5f0a3c2c471474a358e0.tar.lz nixlib-688991ba84af0bf9518e5f0a3c2c471474a358e0.tar.xz nixlib-688991ba84af0bf9518e5f0a3c2c471474a358e0.tar.zst nixlib-688991ba84af0bf9518e5f0a3c2c471474a358e0.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/tools')
3 files changed, 42 insertions, 2 deletions
diff --git a/pkgs/tools/filesystems/android-file-transfer/default.nix b/pkgs/tools/filesystems/android-file-transfer/default.nix index b355b0eb6864..b5fe1a4e85ea 100644 --- a/pkgs/tools/filesystems/android-file-transfer/default.nix +++ b/pkgs/tools/filesystems/android-file-transfer/default.nix @@ -12,13 +12,13 @@ mkDerivation rec { pname = "android-file-transfer"; - version = "4.2"; + version = "4.3"; src = fetchFromGitHub { owner = "whoozle"; repo = "android-file-transfer-linux"; rev = "v${version}"; - sha256 = "125rq8ji83nw6chfw43i0h9c38hjqh1qjibb0gnf9wrigar9zc8b"; + sha256 = "sha256-UOARMtOnG6tekmOsIWRZbl2y32mR0kPD6w7IHRG8VsU="; }; patches = [ ./darwin-dont-vendor-dependencies.patch ]; diff --git a/pkgs/tools/networking/openvpn/auth-ldap-fix-conftest.patch b/pkgs/tools/networking/openvpn/auth-ldap-fix-conftest.patch new file mode 100644 index 000000000000..c571fda5d3c1 --- /dev/null +++ b/pkgs/tools/networking/openvpn/auth-ldap-fix-conftest.patch @@ -0,0 +1,36 @@ +diff --git a/aclocal.m4 b/aclocal.m4 +index e5b7dbf..01cecf1 100644 +--- a/aclocal.m4 ++++ b/aclocal.m4 +@@ -73,6 +73,7 @@ AC_DEFUN([OD_OBJC_RUNTIME],[ + AC_LANG_PROGRAM([ + #include <objc/objc.h> + #include <objc/Object.h> ++ #include <stdio.h> + ], [ + Object *obj = @<:@Object alloc@:>@; + puts(@<:@obj name@:>@); +@@ -94,6 +95,7 @@ AC_DEFUN([OD_OBJC_RUNTIME],[ + AC_LANG_PROGRAM([ + #include <objc/objc.h> + #include <objc/Object.h> ++ #include <stdio.h> + ], [ + Object *obj = @<:@Object alloc@:>@; + puts(@<:@obj name@:>@); +@@ -131,6 +133,7 @@ AC_DEFUN([OD_OBJC_RUNTIME],[ + AC_LANG_PROGRAM([ + #include <objc/objc.h> + #include <objc/objc-api.h> ++ #include <stdio.h> + ], [ + id class = objc_lookUpClass("Object"); + id obj = @<:@class alloc@:>@; +@@ -162,6 +165,7 @@ AC_DEFUN([OD_OBJC_RUNTIME],[ + #else + #include <objc/objc-api.h> + #endif ++ #include <stdio.h> + ], [ + #ifdef __GNU_LIBOBJC_ + Class class = objc_lookUpClass("Object"); diff --git a/pkgs/tools/networking/openvpn/openvpn-auth-ldap.nix b/pkgs/tools/networking/openvpn/openvpn-auth-ldap.nix index 70dacddafc37..df93dacb4711 100644 --- a/pkgs/tools/networking/openvpn/openvpn-auth-ldap.nix +++ b/pkgs/tools/networking/openvpn/openvpn-auth-ldap.nix @@ -20,6 +20,10 @@ stdenv.mkDerivation rec { sha256 = "1j30sygj8nm8wjqxzpb7pfzr3dxqxggswzxd7z5yk7y04c0yp1hb"; }; + patches = [ + ./auth-ldap-fix-conftest.patch + ]; + nativeBuildInputs = [ autoreconfHook gnustep.base |