From 84077e13db2fee23afd7176f622012ba232bd9ca Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 8 Apr 2023 16:00:23 +0000 Subject: [PATCH 1/2] pkg: 1.19.0 -> 1.19.1 --- pkgs/tools/package-management/pkg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/pkg/default.nix b/pkgs/tools/package-management/pkg/default.nix index 232e3e5add2b..9ae44d0435ac 100644 --- a/pkgs/tools/package-management/pkg/default.nix +++ b/pkgs/tools/package-management/pkg/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "pkg"; - version = "1.19.0"; + version = "1.19.1"; src = fetchFromGitHub { owner = "freebsd"; repo = "pkg"; rev = finalAttrs.version; - sha256 = "W66g8kVvaPJSyOZcgyDcUBrWQQ5YDkRqofSWfIsjd+k="; + sha256 = "WHR2evPn4Y0wzGwVUEuYPrDDnuPSsYHr4xIofAHeTJk="; }; setOutputFlags = false; From 2dbdc56a46547e6c257828d5e69048f41ebe4a66 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 8 Apr 2023 16:00:41 +0000 Subject: [PATCH 2/2] pkg: don't use vendored libelf --- pkgs/tools/package-management/pkg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/pkg/default.nix b/pkgs/tools/package-management/pkg/default.nix index 9ae44d0435ac..5a67e00363b8 100644 --- a/pkgs/tools/package-management/pkg/default.nix +++ b/pkgs/tools/package-management/pkg/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, m4, pkg-config, tcl -, bzip2, libarchive, libbsd, xz, openssl, zlib +, bzip2, elfutils, libarchive, libbsd, xz, openssl, zlib }: stdenv.mkDerivation (finalAttrs: { @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { separateDebugInfo = true; nativeBuildInputs = [ m4 pkg-config tcl ]; - buildInputs = [ bzip2 libarchive xz openssl zlib ] + buildInputs = [ bzip2 elfutils libarchive openssl xz zlib ] ++ lib.optional stdenv.isLinux libbsd; enableParallelBuilding = true;