Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
argo
argopkgs
Commits
88267a10
Commit
88267a10
authored
May 02, 2019
by
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
Changes
6
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
dhrun/all-tests.dh
View file @
88267a10
...
...
@@ -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
View file @
88267a10
...
...
@@ -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
View file @
88267a10
let
f
=
{
mkDerivation
,
stdenv
f
1
=
{
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
pkgs
1
++
package
.
buildInputs
;
};
cabalDevLoader
=
self
:
path
:
set
:
...
...
pkgs/default.nix
View file @
88267a10
...
...
@@ -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
View file @
88267a10
...
...
@@ -2,8 +2,8 @@
"fetch"
:
{
"args"
:
{
"fetchSubmodules"
:
false
,
"rev"
:
"
3a4d24a7e360e7a012deeb01180c4a4e7ab3e49
1"
,
"sha256"
:
"1
kindv8nks9gh3s54fy6dz1gnv7bxllmzpsbymfyj1jflwz9fvdf
"
,
"rev"
:
"
c879d9d0cd0a67b852f011faf90fd17b0fb61aa
1"
,
"sha256"
:
"1
6516kxr31ywnsbhsvwc4cknyc29jq4sg6v86yrjq7wh25bwsxjg
"
,
"url"
:
"https://xgitlab.cels.anl.gov/argo/dhrun.git"
},
"fn"
:
"fetchgit"
...
...
pkgs/nrm/pin.json
View file @
88267a10
...
...
@@ -2,8 +2,8 @@
"fetch"
:
{
"args"
:
{
"fetchSubmodules"
:
false
,
"rev"
:
"
94dec2cd3709ba5205934d8af04508f2b8aeba70
"
,
"sha256"
:
"0
nqsf1dlmwyh0px1283a1xl38ncbj06wycqm9mhwb6dfh4s77al6
"
,
"rev"
:
"
753c0048f999255ca42dce10e18e71c109af7ed7
"
,
"sha256"
:
"0
1wngv506nx43h6jjrbzg7axwpnfn7920nn9dajm7das0mbfv9bx
"
,
"url"
:
"https://xgitlab.cels.anl.gov/argo/nrm.git"
},
"fn"
:
"fetchgit"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment