bumps various utilities and adds a test for cmd cwd propagation.

dhrun/all-tests.dh

@@ -24,11 +24,28 @@ in  { run =
             , verbose =
                 True
             , cmdwants =
-                [] :List Text
+                [] : List Text
+            , cmdavoids =
+                [ "Traceback" ]
+            , timeout =
+                [ 600 ] : Optional Natural
+            }
+        )
+    , pwd =
+        lib.makeBase
+        (   lib.emptyMakeBaseArg "pwd" basicManifest cn
+          ⫽ { args =
+                [] : List Text
+            , verbose =
+                True
+            , cmdwants =
+                [ "toto" ] : List Text
             , cmdavoids =
                 [ "Traceback" ]
             , timeout =
                 [ 600 ] : Optional Natural
+            , runwd =
+                [ "toto" ] : Optional Text
             }
         )
     , hello =

dhrun/lib.dh

@@ -79,6 +79,8 @@ let MakeBaseArg =
           List Text
       , powercap :
           Powercap
+      , runwd :
+          Optional Text
       }
 
 let emptyMakeBaseArg =
@@ -107,6 +109,8 @@ let emptyMakeBaseArg =
               [] : List Text
           , powercap =
               < NoCap = {=} | Cap : Text >
+          , runwd =
+              [] : Optional Text
           }
         : MakeBaseArg
 
@@ -146,6 +150,8 @@ let makeBase =
                             "/tmp/argo_nodeos_config"
                         }
                       ]
+                  , otherwd =
+                      [] : Optional Text
                   }
               , let b =
                       basicCommand
@@ -170,8 +176,12 @@ let makeBase =
                           # args.args
                       , passvars =
                           b.passvars # args.passvars
+                      , vars =
+                          args.vars
                       , timeout =
                           args.timeout
+                      , otherwd =
+                          args.runwd
                       }
               ]
           , verbose =
@@ -269,6 +279,8 @@ let appTest =
                 args.passvars
             , timeout =
                 args.timeout
+            , runwd =
+                [] : Optional Text
             , powercap =
                 args.powercap
             }

lib/utils.nix

 let
-  f = { mkDerivation, stdenv
+  f1 = { mkDerivation, stdenv
       , cabal-install
       , apply-refact
       , hdevtools
       , hindent
-      , haskell-tools-refactor
       , fswatch
       , hlint
       , protolude
       , shake
-      , brittany
-      , panpipe
       , ghcid
       , typed-process
       , unix
@@ -24,13 +21,11 @@ let
             apply-refact
             hdevtools
             hindent
-            haskell-tools-refactor
             fswatch
             hlint
             protolude
             shake
-            brittany
-            panpipe
+            #panpipe
             ghcid
             typed-process
             unix
@@ -39,6 +34,21 @@ let
         license = stdenv.lib.licenses.mit;
       };
 
+  f2 = { mkDerivation, stdenv
+      , brittany
+      , haskell-tools-refactor
+      }:
+      mkDerivation {
+        pname = "dummy";
+        version = "";
+        src = "";
+        libraryHaskellDepends = [
+            brittany
+            haskell-tools-refactor
+        ];
+        description = "";
+        license = stdenv.lib.licenses.mit;
+      };
 in
 rec {
   filter = path:
@@ -57,22 +67,14 @@ rec {
     p.htop
   ];
 
-  getPostEnv = pkgs: super: package : super.shellFor {
-    packages = p: [
-      package
-      (pkgs.haskellPackages.callPackage f {})
-    ];
-    withHoogle = true;
-    buildInputs = devInputs pkgs ++ [package];
-  };
-
-  getHackEnv = pkgs: super: package : super.shellFor {
+  getHackEnv = pkgs1: pkgs2: super: package : super.shellFor {
     packages = p: [
       package
-      (pkgs.haskellPackages.callPackage f {})
+      (pkgs1.haskellPackages.callPackage f1 {})
+      (pkgs2.haskellPackages.callPackage f2 {})
     ];
     withHoogle = true;
-    buildInputs = devInputs pkgs ++ package.buildInputs;
+    buildInputs = devInputs pkgs1 ++ package.buildInputs;
   };
 
   cabalDevLoader = self: path: set:

pkgs/default.nix

@@ -37,6 +37,9 @@
 
 , #whether to graft apps on libnrm.
   graftLibnrm      ? false
+
+, #name for the generic test builder
+  genericTestName  ? "run"
 }:
 let
   callPackage = pkgs.lib.callPackageWith (pkgs // argopkgs);
@@ -134,6 +137,13 @@ let
     bleedingHaskellPackages = bleeding.haskellPackages.override {
       overrides = self: super: with bleeding.haskell.lib;
       rec {
+        #panpipe        = (bleeding.haskell.lib.doJailbreak super.panpipe);
+        #spdx           = (bleeding.haskell.lib.doJailbreak super.spdx);
+        #monad-mock     = (bleeding.haskell.lib.doJailbreak super.monad-mock);
+        #generic-pretty = doJailbreak super.generic-pretty;
+
+        multistate  = doJailbreak super.multistate;
+        #hspec       = doJailbreak super.hspec;
         dhrun       = (self.callCabal2nix "dhrun"       dhrun-src ) {};
       };
     };
@@ -390,6 +400,7 @@ let
     in
     doDhrun dhrunscript;
 
+    testGeneric     = doDhrunKey genericTestName;
     testHello       = doDhrunKey "hello";
     testRun         = doDhrunKey "run";
     testListen      = doDhrunKey "listen";
@@ -430,6 +441,8 @@ let
         cp -r o/* $out
       '';
     });
+
+    bld = bleeding;
   };
 
 

pkgs/dhrun/pin.json

@@ -2,8 +2,8 @@
   "fetch": {
     "args": {
       "fetchSubmodules": false,
-      "rev": "3a4d24a7e360e7a012deeb01180c4a4e7ab3e491",
-      "sha256": "1kindv8nks9gh3s54fy6dz1gnv7bxllmzpsbymfyj1jflwz9fvdf",
+      "rev": "c879d9d0cd0a67b852f011faf90fd17b0fb61aa1",
+      "sha256": "16516kxr31ywnsbhsvwc4cknyc29jq4sg6v86yrjq7wh25bwsxjg",
       "url": "https://xgitlab.cels.anl.gov/argo/dhrun.git"
     },
     "fn": "fetchgit"

pkgs/nrm/pin.json

@@ -2,8 +2,8 @@
   "fetch": {
     "args": {
       "fetchSubmodules": false,
-      "rev": "94dec2cd3709ba5205934d8af04508f2b8aeba70",
-      "sha256": "0nqsf1dlmwyh0px1283a1xl38ncbj06wycqm9mhwb6dfh4s77al6",
+      "rev": "753c0048f999255ca42dce10e18e71c109af7ed7",
+      "sha256": "01wngv506nx43h6jjrbzg7axwpnfn7920nn9dajm7das0mbfv9bx",
       "url": "https://xgitlab.cels.anl.gov/argo/nrm.git"
     },
     "fn": "fetchgit"