From 58e0732fb33cdf8215f77740ccd16ae117259aae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 3 Dec 2024 22:26:55 +0100 Subject: [PATCH 1/2] hwinfo: split lib from bin output bin currently depends on perl, which is a big dependency for `nixos-facter` --- pkgs/by-name/hw/hwinfo/package.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/by-name/hw/hwinfo/package.nix b/pkgs/by-name/hw/hwinfo/package.nix index cfb940d66cd1..15a20ebd10a8 100644 --- a/pkgs/by-name/hw/hwinfo/package.nix +++ b/pkgs/by-name/hw/hwinfo/package.nix @@ -69,6 +69,13 @@ stdenv.mkDerivation (finalAttrs: { patchShebangs src/ids/convert_hd ''; + outputs = [ + "bin" + "dev" + "lib" + "out" + ]; + # The pci/usb ids in hwinfo are ancient. We can get a more up-to-date list simply by copying from systemd preBuild = '' # since we don't have .git, we cannot run this. @@ -94,6 +101,13 @@ stdenv.mkDerivation (finalAttrs: { ]; installFlags = [ "DESTDIR=$(out)" ]; + enableParallelBuilding = false; # broken parallel dependencies + + postInstall = '' + moveToOutput bin "$bin" + moveToOutput lib "$lib" + ''; + passthru = { tests = { version = testers.testVersion { package = finalAttrs.finalPackage; }; From 2813a19a27bf98499ec592ac2c35cf9131f9bf32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 3 Dec 2024 22:27:31 +0100 Subject: [PATCH 2/2] nixos-facter: 0.2.0 -> 0.3.0 --- pkgs/by-name/ni/nixos-facter/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ni/nixos-facter/package.nix b/pkgs/by-name/ni/nixos-facter/package.nix index c9d2f1d5171e..0fc7167c9b55 100644 --- a/pkgs/by-name/ni/nixos-facter/package.nix +++ b/pkgs/by-name/ni/nixos-facter/package.nix @@ -24,13 +24,13 @@ let in buildGoModule rec { pname = "nixos-facter"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "numtide"; repo = "nixos-facter"; rev = "v${version}"; - hash = "sha256-Rird32KB+V1xGBZvrEaPDPOhl5YMClIljOLcFO/0vOU="; + hash = "sha256-T7x9xU/Tr2BKfrHQHrP6Mm6rNUWYASjEPzHIKgyS7aE="; }; vendorHash = "sha256-qDzd+aq08PN9kl1YkvNLGvWaFVh7xFXJhGdx/ELwYGY=";