Commit 88267a10 authored by Valentin Reis's avatar Valentin Reis
Browse files

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

parent 1a28c20f
Pipeline #7086 passed with stages
in 10 minutes and 2 seconds
...@@ -24,11 +24,28 @@ in { run = ...@@ -24,11 +24,28 @@ in { run =
, verbose = , verbose =
True True
, cmdwants = , 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 = , cmdavoids =
[ "Traceback" ] [ "Traceback" ]
, timeout = , timeout =
[ 600 ] : Optional Natural [ 600 ] : Optional Natural
, runwd =
[ "toto" ] : Optional Text
} }
) )
, hello = , hello =
......
...@@ -79,6 +79,8 @@ let MakeBaseArg = ...@@ -79,6 +79,8 @@ let MakeBaseArg =
List Text List Text
, powercap : , powercap :
Powercap Powercap
, runwd :
Optional Text
} }
let emptyMakeBaseArg = let emptyMakeBaseArg =
...@@ -107,6 +109,8 @@ let emptyMakeBaseArg = ...@@ -107,6 +109,8 @@ let emptyMakeBaseArg =
[] : List Text [] : List Text
, powercap = , powercap =
< NoCap = {=} | Cap : Text > < NoCap = {=} | Cap : Text >
, runwd =
[] : Optional Text
} }
: MakeBaseArg : MakeBaseArg
...@@ -146,6 +150,8 @@ let makeBase = ...@@ -146,6 +150,8 @@ let makeBase =
"/tmp/argo_nodeos_config" "/tmp/argo_nodeos_config"
} }
] ]
, otherwd =
[] : Optional Text
} }
, let b = , let b =
basicCommand basicCommand
...@@ -170,8 +176,12 @@ let makeBase = ...@@ -170,8 +176,12 @@ let makeBase =
# args.args # args.args
, passvars = , passvars =
b.passvars # args.passvars b.passvars # args.passvars
, vars =
args.vars
, timeout = , timeout =
args.timeout args.timeout
, otherwd =
args.runwd
} }
] ]
, verbose = , verbose =
...@@ -269,6 +279,8 @@ let appTest = ...@@ -269,6 +279,8 @@ let appTest =
args.passvars args.passvars
, timeout = , timeout =
args.timeout args.timeout
, runwd =
[] : Optional Text
, powercap = , powercap =
args.powercap args.powercap
} }
......
let let
f = { mkDerivation, stdenv f1 = { mkDerivation, stdenv
, cabal-install , cabal-install
, apply-refact , apply-refact
, hdevtools , hdevtools
, hindent , hindent
, haskell-tools-refactor
, fswatch , fswatch
, hlint , hlint
, protolude , protolude
, shake , shake
, brittany
, panpipe
, ghcid , ghcid
, typed-process , typed-process
, unix , unix
...@@ -24,13 +21,11 @@ let ...@@ -24,13 +21,11 @@ let
apply-refact apply-refact
hdevtools hdevtools
hindent hindent
haskell-tools-refactor
fswatch fswatch
hlint hlint
protolude protolude
shake shake
brittany #panpipe
panpipe
ghcid ghcid
typed-process typed-process
unix unix
...@@ -39,6 +34,21 @@ let ...@@ -39,6 +34,21 @@ let
license = stdenv.lib.licenses.mit; 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 in
rec { rec {
filter = path: filter = path:
...@@ -57,22 +67,14 @@ rec { ...@@ -57,22 +67,14 @@ rec {
p.htop p.htop
]; ];
getPostEnv = pkgs: super: package : super.shellFor { getHackEnv = pkgs1: pkgs2: super: package : super.shellFor {
packages = p: [
package
(pkgs.haskellPackages.callPackage f {})
];
withHoogle = true;
buildInputs = devInputs pkgs ++ [package];
};
getHackEnv = pkgs: super: package : super.shellFor {
packages = p: [ packages = p: [
package package
(pkgs.haskellPackages.callPackage f {}) (pkgs1.haskellPackages.callPackage f1 {})
(pkgs2.haskellPackages.callPackage f2 {})
]; ];
withHoogle = true; withHoogle = true;
buildInputs = devInputs pkgs ++ package.buildInputs; buildInputs = devInputs pkgs1 ++ package.buildInputs;
}; };
cabalDevLoader = self: path: set: cabalDevLoader = self: path: set:
......
...@@ -37,6 +37,9 @@ ...@@ -37,6 +37,9 @@
, #whether to graft apps on libnrm. , #whether to graft apps on libnrm.
graftLibnrm ? false graftLibnrm ? false
, #name for the generic test builder
genericTestName ? "run"
}: }:
let let
callPackage = pkgs.lib.callPackageWith (pkgs // argopkgs); callPackage = pkgs.lib.callPackageWith (pkgs // argopkgs);
...@@ -134,6 +137,13 @@ let ...@@ -134,6 +137,13 @@ let
bleedingHaskellPackages = bleeding.haskellPackages.override { bleedingHaskellPackages = bleeding.haskellPackages.override {
overrides = self: super: with bleeding.haskell.lib; overrides = self: super: with bleeding.haskell.lib;
rec { 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 ) {}; dhrun = (self.callCabal2nix "dhrun" dhrun-src ) {};
}; };
}; };
...@@ -390,6 +400,7 @@ let ...@@ -390,6 +400,7 @@ let
in in
doDhrun dhrunscript; doDhrun dhrunscript;
testGeneric = doDhrunKey genericTestName;
testHello = doDhrunKey "hello"; testHello = doDhrunKey "hello";
testRun = doDhrunKey "run"; testRun = doDhrunKey "run";
testListen = doDhrunKey "listen"; testListen = doDhrunKey "listen";
...@@ -430,6 +441,8 @@ let ...@@ -430,6 +441,8 @@ let
cp -r o/* $out cp -r o/* $out
''; '';
}); });
bld = bleeding;
}; };
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
"fetch": { "fetch": {
"args": { "args": {
"fetchSubmodules": false, "fetchSubmodules": false,
"rev": "3a4d24a7e360e7a012deeb01180c4a4e7ab3e491", "rev": "c879d9d0cd0a67b852f011faf90fd17b0fb61aa1",
"sha256": "1kindv8nks9gh3s54fy6dz1gnv7bxllmzpsbymfyj1jflwz9fvdf", "sha256": "16516kxr31ywnsbhsvwc4cknyc29jq4sg6v86yrjq7wh25bwsxjg",
"url": "https://xgitlab.cels.anl.gov/argo/dhrun.git" "url": "https://xgitlab.cels.anl.gov/argo/dhrun.git"
}, },
"fn": "fetchgit" "fn": "fetchgit"
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
"fetch": { "fetch": {
"args": { "args": {
"fetchSubmodules": false, "fetchSubmodules": false,
"rev": "94dec2cd3709ba5205934d8af04508f2b8aeba70", "rev": "753c0048f999255ca42dce10e18e71c109af7ed7",
"sha256": "0nqsf1dlmwyh0px1283a1xl38ncbj06wycqm9mhwb6dfh4s77al6", "sha256": "01wngv506nx43h6jjrbzg7axwpnfn7920nn9dajm7das0mbfv9bx",
"url": "https://xgitlab.cels.anl.gov/argo/nrm.git" "url": "https://xgitlab.cels.anl.gov/argo/nrm.git"
}, },
"fn": "fetchgit" "fn": "fetchgit"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment