Commit 7d4fdce1 authored by Valentin Reis's avatar Valentin Reis

version updates for argo power experiments.

parent af3fb03a
{
"url": "https://github.com/nixos/nixpkgs-channels.git",
"rev": "80738ed9dc0ce48d7796baed5364eef8072c794d",
"date": "2018-11-17T11:18:10+01:00",
"sha256": "0anmvr6b47gbbyl9v2fn86mfkcwgpbd5lf0yf3drgm8pbv57c1dc",
"fetchSubmodules": true
}
#!/usr/bin/env bash
nix-prefetch-git https://github.com/nixos/nixpkgs-channels.git refs/heads/nixos-18.03 > nixpkgs-18.03.json
nix-prefetch-git https://github.com/oar-team/kapack.git refs/heads/master > kapack.json
nix-prefetch-git https://github.com/nixos/nixpkgs-channels.git refs/heads/nixos-unstable > nixpkgs-unstable.json
{
"url": "https://xgitlab.cels.anl.gov/argo/containers.git",
"rev": "4fde2b8c65fb82e296bc82ecbbd4cdaff409cf85",
"date": "2017-12-20T10:04:24-06:00",
"sha256": "0rznc9r4s8slxh3m6s9l8r347lcn73rb1agk6llfb9x2a3xfsxjf",
"rev": "baf8d886baac3a1a377efc8170e258129c9dc670",
"date": "2018-10-08T17:57:17-05:00",
"sha256": "1wnlq2ar7g3zyqq5lq84fr26v9naklirx6dxs0mj2y3ga2faik4v",
"fetchSubmodules": true
}
{
"url": "https://xgitlab.cels.anl.gov/argo/containers.git",
"rev": "9be6830772f4f5d6b612660a4988e6cba02429bc",
"date": "2018-02-19T21:23:12+01:00",
"sha256": "1iqw6106ax3l5231bgp1myr99q58hp4nl4v2q4nnrmbllfh2vzhi",
"fetchSubmodules": true
}
#!/usr/bin/env bash
nix-prefetch-git https://xgitlab.cels.anl.gov/argo/containers.git refs/heads/master > master.json
nix-prefetch-git https://xgitlab.cels.anl.gov/argo/containers.git refs/heads/master > default.json
nix-prefetch-git https://xgitlab.cels.anl.gov/argo/containers.git refs/heads/nix > nix.json
{
hostPkgs ? import <nixpkgs> {},
system ? builtins.currentSystem,
pkgs ? import ../pin.nix { inherit hostPkgs; jsonpath=../nixpkgs-18.03.json; depset = {inherit system;}; },
pkgs ? import ../pin.nix { inherit hostPkgs; jsonpath=../nixpkgs-unstable.json; depset = {inherit system;}; },
kapack ? import ../pin.nix { hostPkgs = pkgs ; jsonpath=../kapack.json; depset = {hostPkgs=pkgs;};},
supportedSystems ? [ "x86_64-linux" "i686-linux" ]
}:
......@@ -32,7 +32,7 @@ let
pythonPackages = pkgs.python27Packages;
argopkgs = rec {
pyzmq = pythonPackages.pyzmq.override { zeromq3 = pkgs.zeromq; };
#pyzmq = pythonPackages.pyzmq.override { zeromq3 = pkgs.zeromq; };
#NRM components
tools = rec {
......@@ -45,9 +45,9 @@ let
configureFlags = "--enable-pmpi";
buildInputs = oldAttrs.buildInputs ++ [ pkgs.mpich2 ];
});
containers = cpDefaultPin ./containers { inherit pythonPackages; inherit pyzmq; };
containers = cpDefaultPin ./containers { inherit pythonPackages; };
containers-bandit = cpAlternatePin ./containers { inherit pythonPackages; } "bandit";
nrm = cpDefaultPin ./nrm { inherit pythonPackages; inherit pyzmq; nrm-containers = containers; };
nrm = cpDefaultPin ./nrm { inherit pythonPackages; nrm-containers = containers; };
nrm-bandit = cpAlternatePin ./nrm { inherit pythonPackages; nrm-containers=containers-bandit; } "bandit";
};
......
{ src, stdenv, pythonPackages, pyzmq, hwloc, nrm-containers }:
{ src, stdenv, pythonPackages, hwloc, linuxPackages, nrm-containers }:
pythonPackages.buildPythonPackage {
inherit src;
name = "nrm";
propagatedBuildInputs = [ pythonPackages.six pythonPackages.numpy pythonPackages.tornado pyzmq hwloc pythonPackages.docopt nrm-containers];
propagatedBuildInputs = [ pythonPackages.six pythonPackages.numpy pythonPackages.tornado pythonPackages.pyzmq hwloc linuxPackages.perf pythonPackages.docopt nrm-containers];
buildInputs = with pythonPackages;[ pytest];
testPhase = '' pytest '';
}
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