Commit dc1ff25d authored by Valentin Reis's avatar Valentin Reis
Browse files

Various updates.

parent a47ce071
Pipeline #5171 passed with stage
in 1 minute and 33 seconds
......@@ -2,8 +2,8 @@
"fetch": {
"args": {
"fetchSubmodules": false,
"rev": "08587313e09f6d50a7e3ef7df8c20c82bf703268",
"sha256": "1y77zx3icz44571a94cgiq3z4xhin77ikjdv70mrc96h84lhpd1p",
"rev": "7a44c22b61fc321e368c8b93018dd48329f42da6",
"sha256": "1kfwbibrk4vlp7y5h60wz6ffn2v45qzk8hz7mrca8py0zcjl3g0d",
"url": "https://xgitlab.cels.anl.gov/argo/argopkgs.git"
},
"fn": "fetchgit"
......
......@@ -3,7 +3,7 @@
variable x index 1
variable y index 1
variable z index 1
variable t index 100
variable t index 1000
variable xx equal 20*$x
variable yy equal 20*$y
......
......@@ -159,7 +159,9 @@ main = sh $ do
, "source .profile; source .bash_profile; SUDO=$(which sudo) nix-shell --keep SUDO --pure --allow-new-privileges --option build-extra-sandbox-paths $(which sudo | xargs dirname) "
<> lineToText drv
<> " --run "
<> "\"" <> cmd <> "\""
<> "\""
<> cmd
<> "\""
]
empty
mapM_
......@@ -174,7 +176,7 @@ main = sh $ do
[ "-t"
, unpack host
, unpack
( "source .profile; source .bash_profile; SUDO=$(which sudo) nix-shell --keep SUDO --pure --allow-new-privileges --option build-extra-sandbox-paths $(which sudo | xargs dirname) "
("source .profile; source .bash_profile; SUDO=$(which sudo) nix-shell --keep SUDO --pure --allow-new-privileges --option build-extra-sandbox-paths $(which sudo | xargs dirname) "
<> lineToText drv
)
]
......@@ -183,7 +185,10 @@ main = sh $ do
argumentsBuilder :: StackArgs -> [String]
argumentsBuilder StackArgs {..} =
["-A", if enableApps then "expe" else "test"] ++ concat
[ ["--arg", longform <> "-src", encodeString p]
[ [ "--arg"
, longform <> "-src"
, unpack $ filterSource (pack $ encodeString p)
]
| (longform, p) <- overrides
]
......
......@@ -5,6 +5,7 @@ module Nixexpr where
import Data.Text ( Text)
import NeatInterpolation
-- Bunch of disgusting nix code for source overrides and environments.
nixExpression :: Text
nixExpression =
[text|
......@@ -64,3 +65,13 @@ nixExpression =
);
}
|]
-- Small bunch of disgusting nix code for source filtering.
filterSource :: Text -> Text
filterSource p = [text|
(builtins.filterSource (path: type:
(baseNameOf path != ".hdevtools.sock") &&
(baseNameOf path != ".ghc.environment.x86_64-linux-8.4.4") &&
(baseNameOf path != "_output") &&
(baseNameOf path != "result") &&
(baseNameOf path != "dist")) $p ) |]
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