Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gnupg24: add freepg patches #368275

Draft
wants to merge 4 commits into
base: staging
Choose a base branch
from
+129 −63
Draft

gnupg24: add freepg patches #368275

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ba3f84d
gnupg: format with nixfmt
itepastra Oct 30, 2024
4441cba
gnupg: 2.4.5 -> 2.4.7
itepastra Oct 30, 2024
447c3ce
gnupg24: add freepg patches
stigtsp Dec 26, 2024
570332a
libgcrypt: 1.10.3 -> 1.11.0
stigtsp Dec 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
gnupg: 2.4.5 -> 2.4.7
  • Loading branch information
@itepastra @stigtsp
itepastra authored and stigtsp committed Dec 26, 2024
commit 4441cba66d689e547aa62edffa2e83fe1c7de374
11 changes: 4 additions & 7 deletions pkgs/tools/security/gnupg/24.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ assert guiSupport -> !enableMinimal;

stdenv.mkDerivation rec {
pname = "gnupg";
version = "2.4.5";
version = "2.4.7";

src = fetchurl {
url = "mirror://gnupg/gnupg/${pname}-${version}.tar.bz2";
hash = "sha256-9o99ddBssWNcM2002ESvl0NsP2TqFLy3yGl4L5b0Qnc=";
hash = "sha256-eyRwbk2n4OOwbKBoIxAnQB8jgQLEHJCWMTSdzDuF60Y=";
};

depsBuildBuild = [ buildPackages.stdenv.cc ];
Expand Down Expand Up @@ -86,6 +86,8 @@ stdenv.mkDerivation rec {
sed -i 's,"libpcsclite\.so[^"]*","${lib.getLib pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c
'';

NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-Wno-implicit-function-declaration";

configureFlags =
[
"--sysconfdir=/etc"
Expand Down Expand Up @@ -120,11 +122,6 @@ stdenv.mkDerivation rec {
if [[ "$(basename $f)" == "gpg-wks-client" ]]; then continue; fi
ln -s $f $out/bin/$(basename $f)
done

for f in $out/libexec/; do
if [[ "$(basename $f)" == "gpg-wks-client" ]]; then continue; fi
ln -s $f $out/bin/$(basename $f)
done
'';

enableParallelBuilding = true;
Expand Down