colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2024-03-30 06:01:24 +00:00 committed by GitHub
commit 8d04ddbea5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/tools/compression/xz/default.nix
View File

@ -11,10 +11,13 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "xz"; pname = "xz";
version = "5.4.6"; version = "5.4.6"; # Beware of CVE-2024-3094 and related risks!!!
src = fetchurl { src = fetchurl {
url = with finalAttrs; "https://github.com/tukaani-project/xz/releases/download/v${version}/xz-${version}.tar.bz2"; url = with finalAttrs;
# The original URL has been taken down.
# "https://github.com/tukaani-project/xz/releases/download/v${version}/xz-${version}.tar.bz2";
"mirror://sourceforge/lzmautils/xz-${version}.tar.bz2";
sha256 = "sha256-kThRsnTo4dMXgeyUnxwj6NvPDs9uc6JDbcIXad0+b0k="; sha256 = "sha256-kThRsnTo4dMXgeyUnxwj6NvPDs9uc6JDbcIXad0+b0k=";
}; };

10
pkgs/tools/security/pinentry/mac.nix
View File

@ -5,6 +5,7 @@
, libassuan , libassuan
, libgpg-error , libgpg-error
, libiconv , libiconv
, makeBinaryWrapper
, texinfo , texinfo
, common-updater-scripts , common-updater-scripts
, writers , writers
@ -37,14 +38,17 @@ stdenv.mkDerivation rec {
(allow process-exec (literal "/usr/libexec/PlistBuddy")) (allow process-exec (literal "/usr/libexec/PlistBuddy"))
''; '';
nativeBuildInputs = [ autoreconfHook texinfo ]; nativeBuildInputs = [ autoreconfHook makeBinaryWrapper texinfo ];
buildInputs = [ libassuan libgpg-error libiconv Cocoa ]; buildInputs = [ libassuan libgpg-error libiconv Cocoa ];
configureFlags = [ "--enable-maintainer-mode" "--disable-ncurses" ]; configureFlags = [ "--enable-maintainer-mode" "--disable-ncurses" ];
installPhase = '' installPhase = ''
mkdir -p $out/Applications mkdir -p $out/Applications $out/bin
mv macosx/pinentry-mac.app $out/Applications mv macosx/pinentry-mac.app $out/Applications
# Compatibility with `lib.getExe`
makeWrapper $out/Applications/pinentry-mac.app/Contents/MacOS/pinentry-mac $out/bin/pinentry-mac
''; '';
enableParallelBuilding = true; enableParallelBuilding = true;
@ -85,6 +89,6 @@ stdenv.mkDerivation rec {
license = lib.licenses.gpl2Plus; license = lib.licenses.gpl2Plus;
homepage = "https://github.com/GPGTools/pinentry-mac"; homepage = "https://github.com/GPGTools/pinentry-mac";
platforms = lib.platforms.darwin; platforms = lib.platforms.darwin;
mainProgram = passthru.binaryPath; mainProgram = "pinentry-mac";
}; };
} }