Commit 054a367a authored by Valentin Reis's avatar Valentin Reis

.

parent a9354f17
{
"url": "https://github.com/freuk/datamovepkgs.git",
"rev": "88bd45a0dcf639db9975abe15f102f3f3670c45b",
"date": "2018-07-23T19:38:41+02:00",
"sha256": "0s7w4d4gjffkivdpf8ygvqgpaf5hrbnx431sb7d68yjs8a7gpsnj",
"fetchSubmodules": true
}
{
"url": "https://github.com/nixos/nixpkgs-channels.git",
"rev": "d6c6c7fcec6dbd2b8ab14f0b35d56c7733872baa",
"date": "2018-07-20T16:40:00+02:00",
"sha256": "1bq59575b58lmh5w8bh7pwp17c3p2nm651bz1i3q224c4zsj9294",
"fetchSubmodules": true
}
jsonpath :
let
hostPkgs = import <nixpkgs> {};
pinnedVersion = hostPkgs.lib.importJSON jsonpath;
pinnedPkgs = hostPkgs.fetchFromGitHub {
owner = "NixOS";
repo = "nixpkgs-channels";
inherit (pinnedVersion) rev sha256;
};
in import pinnedPkgs {}
#!/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/freuk/datamovepkgs.git refs/heads/master > datamovepkgs.json
## Argo Nix expressions
### Pkgs
Clone the repository.
List available packages using:
```
nix-env -qaP -f /path/to/datamove-nix
```
#### Development
Add your package in a folder at the root and create a nix expression in it,
preferably `default.nix`. Add your package to the root datamove-nix/default.nix.
The global pinned nixpkgs version can be updated with ./pin.sh, which updates the json
file at the root of the package set. This should be done carefully, as it might break
some user packages.
{ src, stdenv, fetchurl, pythonPackages, writeText, autoreconfHook }:
stdenv.mkDerivation rec {
inherit src;
name = "nrm-containers";
patches = [ ./setuid.patch ];
nativeBuildInputs = [autoreconfHook];
}
{
"url": "https://xgitlab.cels.anl.gov/argo/containers.git",
"rev": "4fde2b8c65fb82e296bc82ecbbd4cdaff409cf85",
"date": "2017-12-20T10:04:24-06:00",
"sha256": "0rznc9r4s8slxh3m6s9l8r347lcn73rb1agk6llfb9x2a3xfsxjf",
"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/nix > nix.json
diff --git a/src/Makefile.am b/src/Makefile.am
index 7202c9c..006aa25 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,7 +24,3 @@ argo_nodeos_config_SOURCES = argo_nodeos_config.cpp config_reader.cpp node_set
nodeos_exceptions.hpp\
resource_ownership.hpp
thirdparty/jsonxx/jsonxx.cc thirdparty/jsonxx/jsonxx.h
-
-# suid
-install-exec-hook:
- chmod u+s $(DESTDIR)$(bindir)/argo_nodeos_config$(EXEEXT)
{
pkgs ? import ../pin.nix ../nixpkgs-18.03.json,
pins ? import ./pins.nix {inherit (pkgs) stdenv fetchgit fetchgitPrivate;}
}:
let
callPackage = pkgs.lib.callPackageWith pkgs;
in rec {
pythonPackages = pkgs.python27Packages;
nrm-containers = callPackage ./containers {
inherit pythonPackages;
src = pins.containers;
};
nrm = callPackage ./nrm {
inherit pythonPackages nrm-containers;
src = pins.nrm;
};
}
# not buildable unless results are present(uses sudo: launch expes in nix-shell)
#appli-enforce = callPackage src/experiments/default.nix
#{ inherit nrm nrm-containers zymake app target;
#application= app;
#samplesize = samplesize-enforce;
#result_type = "enforce";};
## not buildable unless results are present(uses sudo: launch expes in nix-shell)
#appli-bandit = callPackage src/experiments/default.nix
#{ inherit nrm nrm-containers zymake app target;
#application= app;
#samplesize = samplesize-bandit;
#result_type = "bandit";};
#app-analysis-enforce = callPackage src/analysis/default.nix
#{ inherit zymake;
#input-enforce=appli-enforce;
#analysis_type = "enforce";
#target = "dummy";
#};
#app-analysis-bandit = callPackage src/analysis/default.nix
#{ inherit zymake;
#analysis_type = "bandit";
#input-bandit = appli-bandit;
#input-enforce = appli-enforce;
#target = "dummy";
#};
#dev = let
#conf = pkgs.writeText "hound.conf" ''
#{ "max-concurrent-indexers" : 2,
#"dbpath" : "${builtins.toPath ./.}/hound",
#"repos" : {
#"nrm" : { "url" : "file://${builtins.toPath ./nrm}" },
#"containers" : { "url" : "file://${builtins.toPath ./containers}" } } }
#'';
#in pkgs.stdenv.mkDerivation {
##not buildable
#name="nrm-experimental-environment";
#buildInputs = [nrm pkgs.hound];
#shellHook = "${pkgs.hound}/bin/houndd -conf ${conf} &";
#};
#inherit pkgs;
{
"url": "git@gitlab.inria.fr:vreis/nrm.git",
"rev": "4c195e4ef936c7be88cfb8d82428e19a6dbf3b10",
"date": "2018-02-25T17:56:41+01:00",
"sha256": "1bylp2lxarbgr5rhg959bs6s3zqq8vvnxa9p6qkzfqg9yzvirv6g",
"fetchSubmodules": true
}
{ src, stdenv, pythonPackages, hwloc, nrm-containers }:
pythonPackages.buildPythonPackage {
inherit src;
name = "nrm";
propagatedBuildInputs = with pythonPackages;[ six numpy tornado pyzmq hwloc docopt nrm-containers];
buildInputs = with pythonPackages;[ pytest];
testPhase = '' pytest '';
}
{
"url": "https://xgitlab.cels.anl.gov/argo/nrm.git",
"rev": "a2274c7f00f0f5ba23875409edb37f2fc80b7d42",
"date": "2018-07-17T12:36:11-05:00",
"sha256": "01xrmzv2nq46hgc65m58y5nrcsv51qp9azrhs9p2c6krkyjqvnxb",
"fetchSubmodules": true
}
#!/usr/bin/env bash
nix-prefetch-git https://xgitlab.cels.anl.gov/argo/nrm.git refs/heads/master > master.json
nix-prefetch-git git@gitlab.inria.fr:vreis/nrm.git refs/heads/bandit > bandit.json
{stdenv, fetchgit, fetchgitPrivate}:
let
gitpin = f: fetchgit {inherit (stdenv.lib.importJSON f) url sha256;};
gitpinpriv = f: fetchgitPrivate {inherit (stdenv.lib.importJSON f) url sha256;};
in
let frehk = gitpinpriv ./frehk/src.json;
in {
nrm = gitpin ./nrm/bandit.json;
containers = gitpin ./containers/nix.json;
inherit gitpin gitpinpriv;
}
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