diff options
| author | Vladimír Čunát <v@cunat.cz> | 2023-11-16 22:06:22 +0100 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2023-11-16 22:06:22 +0100 |
| commit | a7a8f8253db3f32cc15baf527d36ef7171425eba (patch) | |
| tree | 5de25f1c82e7892f6aec7b3e5ddb718ff0c50df2 /pkgs/applications/version-management | |
| parent | f31242fcfd14e870eb6898fc8849bc4dee883054 (diff) | |
| parent | 391aafc3d6b17ed5517795eb8b9c41ed7c6082e3 (diff) | |
| download | nixlib-a7a8f8253db3f32cc15baf527d36ef7171425eba.tar nixlib-a7a8f8253db3f32cc15baf527d36ef7171425eba.tar.gz nixlib-a7a8f8253db3f32cc15baf527d36ef7171425eba.tar.bz2 nixlib-a7a8f8253db3f32cc15baf527d36ef7171425eba.tar.lz nixlib-a7a8f8253db3f32cc15baf527d36ef7171425eba.tar.xz nixlib-a7a8f8253db3f32cc15baf527d36ef7171425eba.tar.zst nixlib-a7a8f8253db3f32cc15baf527d36ef7171425eba.zip | |
Merge #263535: staging-next 2023-10-26
Diffstat (limited to 'pkgs/applications/version-management')
3 files changed, 12 insertions, 2 deletions
diff --git a/pkgs/applications/version-management/cvs-fast-export/default.nix b/pkgs/applications/version-management/cvs-fast-export/default.nix index d6727d327ce5..4c99078ab275 100644 --- a/pkgs/applications/version-management/cvs-fast-export/default.nix +++ b/pkgs/applications/version-management/cvs-fast-export/default.nix @@ -27,6 +27,10 @@ stdenv.mkDerivation rec { ) ''; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-implicit-function-declaration"; + }; + postInstall = '' wrapProgram $out/bin/cvssync --prefix PATH : ${lib.makeBinPath [ rsync ]} wrapProgram $out/bin/cvsconvert --prefix PATH : $out/bin:${lib.makeBinPath [ diff --git a/pkgs/applications/version-management/cvs/default.nix b/pkgs/applications/version-management/cvs/default.nix index 9f039c4ab004..4ee553c6c4be 100644 --- a/pkgs/applications/version-management/cvs/default.nix +++ b/pkgs/applications/version-management/cvs/default.nix @@ -40,6 +40,10 @@ stdenv.mkDerivation rec { "AR=${stdenv.cc.targetPrefix}ar" ]; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-implicit-function-declaration"; + }; + doCheck = false; # fails 1 of 1 tests meta = with lib; { diff --git a/pkgs/applications/version-management/hub/default.nix b/pkgs/applications/version-management/hub/default.nix index 0ed9d70c4623..4486c71605da 100644 --- a/pkgs/applications/version-management/hub/default.nix +++ b/pkgs/applications/version-management/hub/default.nix @@ -23,13 +23,15 @@ buildGoModule rec { patches = [ # Fix `fish` completions + # https://github.com/github/hub/pull/3036 (fetchpatch { - url = "https://github.com/github/hub/pull/3036.patch"; + url = "https://github.com/github/hub/commit/439b7699e79471fc789929bcdea2f30bd719963e.patch"; hash = "sha256-pR/OkGa2ICR4n1pLNx8E2UTtLeDwFtXxeeTB94KFjC4="; }) # Fix `bash` completions + # https://github.com/github/hub/pull/2948 (fetchpatch { - url = "https://github.com/github/hub/pull/2948.patch"; + url = "https://github.com/github/hub/commit/64b291006f208fc7db1d5be96ff7db5535f1d853.patch"; hash = "sha256-jGFFIvSKEIpTQY0Wz63cqciUk25MzPHv5Z1ox8l7wmo="; }) ]; |