Commit 6f2f7465 authored by Valentin Reis's avatar Valentin Reis
Browse files

Refactoring the package structure.

parent 4d1d2e29
{
"url": "https://xgitlab.cels.anl.gov/argo/applications/simple.git",
"rev": "a9bf641fca16aa01409f44b336d14c6c15edf7e2",
"date": "2018-10-31T18:51:02-05:00",
"sha256": "10y92ym3kx45cx43gwhhnj9qgh6mjjql3i5ky21rb45inc3v2j1b",
"rev": "b6ccaaeab909a0479780bdb9d942cb63def3793f",
"date": "2018-11-02T13:47:10-05:00",
"sha256": "0j8c54k5xprpr1lan8kx3d7dxhpfml3510zwmx6y8bnfb619j7xn",
"fetchSubmodules": true
}
{
"url": "https://xgitlab.cels.anl.gov/argo/applications/simple.git",
"rev": "a9bf641fca16aa01409f44b336d14c6c15edf7e2",
"date": "2018-10-31T18:51:02-05:00",
"sha256": "10y92ym3kx45cx43gwhhnj9qgh6mjjql3i5ky21rb45inc3v2j1b",
"rev": "b6ccaaeab909a0479780bdb9d942cb63def3793f",
"date": "2018-11-02T13:47:10-05:00",
"sha256": "0j8c54k5xprpr1lan8kx3d7dxhpfml3510zwmx6y8bnfb619j7xn",
"fetchSubmodules": true
}
{
hostNixpkgs ? <nixpkgs>,
pkgs ? import ../pin.nix {
hostPkgs = import hostNixpkgs {};
jsonpath =../nixpkgs-18.03.json;
},
datamovepkgs ? import ../pin.nix {
hostPkgs = import hostNixpkgs {};
jsonpath=../datamove.json;
},
packagepins ? import ./pins.nix {inherit (pkgs) stdenv fetchgit fetchgitPrivate;}
pkgs ? import ../pin.nix { hostPkgs = import hostNixpkgs {}; jsonpath =../nixpkgs-18.03.json; },
datamovepkgs ? import ../pin.nix { hostPkgs = import hostNixpkgs {}; jsonpath=../datamove.json; },
#packagepins ? import ./pins.nix { inherit (pkgs) stdenv fetchgit fetchgitPrivate;}
}:
let
gitpin = f: pkgs.fetchgit {inherit (pkgs.lib.importJSON f) url sha256 rev fetchSubmodules;};
......@@ -38,7 +32,7 @@ in rec {
libnrm = cpDefaultPin ./libnrm {};
libnrm-pmpi = libnrm.overrideAttrs (oldAttrs: rec {
configureFlags = "--enable-pmpi";
buildInputs = oldAttrs.buildInputs ++ [ mpich2 ];
buildInputs = oldAttrs.buildInputs ++ [ pkgs.mpich2 ];
});
containers = cpDefaultPin ./containers { inherit pythonPackages; };
containers-bandit = cpAlternatePin ./containers { inherit pythonPackages; } "bandit";
......@@ -64,7 +58,6 @@ in rec {
});
in
rec {
raw = builtins.mapAttrs rawApplication paths;
nrm = (builtins.mapAttrs instrumentedApplication paths) // {
dgemm_randomwalk = cpBothAlternatePin applications/simple {inherit intel; inherit (nodelevel) libnrm;} "dgemm_randomwalk";
......
{ stdenv, autoreconfHook, fetchgit, zeromq, gfortran, pkgconfig, mpich2 }:
{ stdenv, src, autoreconfHook, fetchgit, zeromq, gfortran, pkgconfig, mpich2 }:
stdenv.mkDerivation {
inherit src;
name = "libnrm";
src = fetchgit {
url="https://xgitlab.cels.anl.gov/argo/libnrm.git";
sha256="0n4bc29x9ngp7dv5np69bjg4nqbmqn93szpd6czzhs1r89wz0pdh";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ zeromq gfortran ];
}
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