Commit 0ed21f91 authored by Valentin Reis's avatar Valentin Reis
Browse files

bump nrm

parent c1faf3e1
Pipeline #7516 failed with stages
in 33 minutes and 52 seconds
{ # host package set (unused except for fetching nixpkgs) { # host package set (unused except for fetching nixpkgs)
hostPkgs ? import <nixpkgs> {} hostPkgs ? import <nixpkgs> {}
, # versioned nixpkgs # versioned nixpkgs
pkgs ? import (hostPkgs.nix-update-source.fetch ./pkgs.json).src {} , pkgs ? import (hostPkgs.nix-update-source.fetch ./pkgs.json).src {}
, bleeding ? import (hostPkgs.nix-update-source.fetch ./bleeding.json).src {}
, # versioned nixpkgs-older version for zmcat
bleeding ? import (hostPkgs.nix-update-source.fetch ./bleeding.json).src {}
, # fetcher alias for the remaining arguments , # fetcher alias for the remaining arguments
fetched ? s: (pkgs.nix-update-source.fetch s).src fetched ? s: (pkgs.nix-update-source.fetch s).src
...@@ -192,6 +190,7 @@ let ...@@ -192,6 +190,7 @@ let
generic-aeson = doJailbreak super.generic-aeson; generic-aeson = doJailbreak super.generic-aeson;
nrm-schema = (self.callCabal2nix "nrm-schema" nrm-schema-src ) {}; nrm-schema = (self.callCabal2nix "nrm-schema" nrm-schema-src ) {};
zmcat = self.callPackage ./zmcat {};
}; };
}; };
...@@ -445,6 +444,9 @@ let ...@@ -445,6 +444,9 @@ let
}); });
testGeneric = doDhrun genericTestName; testGeneric = doDhrun genericTestName;
testBrokenMessage = (doDhrun "run-singularity").overrideAttrs (o:{
buildInputs = o.buildInputs ++ [haskellPackages.zmcat];
});
testSingularity = (doDhrun "run-singularity").overrideAttrs (o:{ testSingularity = (doDhrun "run-singularity").overrideAttrs (o:{
buildPhase = "PATH=$PATH:/tmp/argonix/ " + o.buildPhase; buildPhase = "PATH=$PATH:/tmp/argonix/ " + o.buildPhase;
__noChroot = true; # the test needs OS singularity installation so we disable sanboxing here. __noChroot = true; # the test needs OS singularity installation so we disable sanboxing here.
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
"fetch": { "fetch": {
"args": { "args": {
"fetchSubmodules": false, "fetchSubmodules": false,
"rev": "c7771b4a211db71fc2b4beb885e68bfe490f3967", "rev": "05f30538ee7ecb3ab8c8db7cca9826c480cb8ca4",
"sha256": "08h0vi8a4x7rhc2z156hwdvvfl1n31hdsgz9j2df20gx04hks9s8", "sha256": "11gljn9x1i1xd6jwpwl1g6xdq5n6gcnmlhayz5mcs2mc03vx9njk",
"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