Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
argopkgs
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
argo
argopkgs
Commits
0ed21f91
Commit
0ed21f91
authored
May 30, 2019
by
Valentin Reis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bump nrm
parent
c1faf3e1
Pipeline
#7516
failed with stages
in 33 minutes and 52 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
7 deletions
+9
-7
pkgs/default.nix
pkgs/default.nix
+7
-5
pkgs/nrm/pin.json
pkgs/nrm/pin.json
+2
-2
No files found.
pkgs/default.nix
View file @
0ed21f91
{
# host package set (unused except for fetching nixpkgs)
hostPkgs
?
import
<
nixpkgs
>
{}
,
# versioned nixpkgs
pkgs
?
import
(
hostPkgs
.
nix-update-source
.
fetch
./pkgs.json
)
.
src
{}
,
# versioned nixpkgs-older version for zmcat
bleeding
?
import
(
hostPkgs
.
nix-update-source
.
fetch
./bleeding.json
)
.
src
{}
# versioned nixpkgs
,
pkgs
?
import
(
hostPkgs
.
nix-update-source
.
fetch
./pkgs.json
)
.
src
{}
,
bleeding
?
import
(
hostPkgs
.
nix-update-source
.
fetch
./bleeding.json
)
.
src
{}
,
# fetcher alias for the remaining arguments
fetched
?
s
:
(
pkgs
.
nix-update-source
.
fetch
s
)
.
src
...
...
@@ -192,6 +190,7 @@ let
generic-aeson
=
doJailbreak
super
.
generic-aeson
;
nrm-schema
=
(
self
.
callCabal2nix
"nrm-schema"
nrm-schema-src
)
{};
zmcat
=
self
.
callPackage
./zmcat
{};
};
};
...
...
@@ -445,6 +444,9 @@ let
});
testGeneric
=
doDhrun
genericTestName
;
testBrokenMessage
=
(
doDhrun
"run-singularity"
)
.
overrideAttrs
(
o
:{
buildInputs
=
o
.
buildInputs
++
[
haskellPackages
.
zmcat
];
});
testSingularity
=
(
doDhrun
"run-singularity"
)
.
overrideAttrs
(
o
:{
buildPhase
=
"PATH=$PATH:/tmp/argonix/ "
+
o
.
buildPhase
;
__noChroot
=
true
;
# the test needs OS singularity installation so we disable sanboxing here.
...
...
pkgs/nrm/pin.json
View file @
0ed21f91
...
...
@@ -2,8 +2,8 @@
"fetch"
:
{
"args"
:
{
"fetchSubmodules"
:
false
,
"rev"
:
"
c7771b4a211db71fc2b4beb885e68bfe490f3967
"
,
"sha256"
:
"
08h0vi8a4x7rhc2z156hwdvvfl1n31hdsgz9j2df20gx04hks9s8
"
,
"rev"
:
"
05f30538ee7ecb3ab8c8db7cca9826c480cb8ca4
"
,
"sha256"
:
"
11gljn9x1i1xd6jwpwl1g6xdq5n6gcnmlhayz5mcs2mc03vx9njk
"
,
"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