From 5968299b950220a1493e29040ed3862d6a1d6b51 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sat, 5 Oct 2024 16:31:58 +0100
Subject: [PATCH] nix-plugin-pijul.tests: fix the eval
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Without the change the eval fails as:

    $ nix build --no-link -f. nix-plugin-pijul.tests
    error:
       … while calling the 'derivationStrict' builtin
         at <nix/derivation-internal.nix>:34:12:
           33|
           34|   strict = derivationStrict drvAttrs;
             |            ^
           35|

       … while evaluating derivation 'localRepoCheck-nix-2.25.0pre20240920_ca3fc169'
         whose name attribute is located at pkgs/stdenv/generic/make-derivation.nix:336:7

       … while evaluating attribute 'buildCommand' of derivation 'localRepoCheck-nix-2.25.0pre20240920_ca3fc169'
         at pkgs/build-support/trivial-builders/default.nix:59:17:
           58|         enableParallelBuilding = true;
           59|         inherit buildCommand name;
             |                 ^
           60|         passAsFile = [ "buildCommand" ]

       (stack trace truncated; use '--show-trace' to show the full, detailed trace)

       error: function 'anonymous lambda' called with unexpected argument 'nix'
       at pkgs/by-name/ni/nix-plugin-pijul/package.nix:1:1:
            1| {
             | ^
            2|   lib,
       Did you mean lib?
---
 pkgs/by-name/ni/nix-plugin-pijul/package.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ni/nix-plugin-pijul/package.nix b/pkgs/by-name/ni/nix-plugin-pijul/package.nix
index 52538d48878c..b9b7f62f01ba 100644
--- a/pkgs/by-name/ni/nix-plugin-pijul/package.nix
+++ b/pkgs/by-name/ni/nix-plugin-pijul/package.nix
@@ -11,9 +11,11 @@
   runCommand,
   pijul,
   nixVersions,
+  nixOverride ? null,
   nix-plugin-pijul,
 }:
-stdenv.mkDerivation (finalAttrs: {
+let nix = if nixOverride != null then nixOverride else nixVersions.nix_2_18;
+in stdenv.mkDerivation (finalAttrs: {
   pname = "nix-plugin-pijul";
   version = "0.1.4";
 
@@ -30,12 +32,12 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     boost
     howard-hinnant-date
-    nixVersions.nix_2_18
+    nix
   ];
 
   passthru.tests = let
-    localRepoCheck = nix:
-      runCommand "localRepoCheck-${nix.name}"
+    localRepoCheck = nixOverride:
+      runCommand "localRepoCheck-${nixOverride.name}"
       {
         nativeBuildInputs = [
           pijul
@@ -56,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
 
         output=$(
           nix \
-            --option plugin-files ${nix-plugin-pijul.override {inherit nix;}}/lib/nix/plugins/pijul.so \
+            --option plugin-files ${nix-plugin-pijul.override {inherit nixOverride;}}/lib/nix/plugins/pijul.so \
             --extra-experimental-features 'nix-command flakes' \
             eval --impure --raw --expr "builtins.readFile ((builtins.fetchTree \"pijul+file://$PWD\") + \"/foo\")"
         )