From 642ca139d0b8f2ec7fd7b4b37b410987d3213567 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 24 Nov 2023 08:22:13 +0100 Subject: [PATCH 1/2] nix-unit: add missing wrapper --- pkgs/nix-unit/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/nix-unit/default.nix b/pkgs/nix-unit/default.nix index 388c03657..2d57a57c4 100644 --- a/pkgs/nix-unit/default.nix +++ b/pkgs/nix-unit/default.nix @@ -9,6 +9,7 @@ , ninja , cmake , clang-tools +, difftastic }: stdenv.mkDerivation { @@ -33,6 +34,10 @@ stdenv.mkDerivation { cmake ] ++ (lib.optional stdenv.cc.isClang [ clang-tools ]); + postInstall = '' + wrapProgram "$out/bin/nix-unit" --prefix PATH : ${difftastic}/bin + ''; + meta = { description = "Nix unit test runner"; homepage = "https://github.com/adisbladis/nix-unit"; From b0086f598fa510dd518175a80e251bc28e0a4d10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 24 Nov 2023 08:26:38 +0100 Subject: [PATCH 2/2] nix-unit: pin nix version This will always break and this way we can delay how often we update it. --- pkgs/nix-unit/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/nix-unit/default.nix b/pkgs/nix-unit/default.nix index 2d57a57c4..13cb3abe2 100644 --- a/pkgs/nix-unit/default.nix +++ b/pkgs/nix-unit/default.nix @@ -10,6 +10,7 @@ , cmake , clang-tools , difftastic +, makeWrapper }: stdenv.mkDerivation { @@ -23,7 +24,7 @@ stdenv.mkDerivation { }; buildInputs = [ nlohmann_json - nixVersions.stable + nixVersions.nix_2_18 boost ]; nativeBuildInputs = [ @@ -32,6 +33,7 @@ stdenv.mkDerivation { ninja # nlohmann_json can be only discovered via cmake files cmake + makeWrapper ] ++ (lib.optional stdenv.cc.isClang [ clang-tools ]); postInstall = ''