Commit 100e12e1 authored by Valentin Reis's avatar Valentin Reis

pinning changes, readme fix

parent 7c03542b
......@@ -2,9 +2,7 @@ jsonpath :
let
hostPkgs = import <nixpkgs> {};
pinnedVersion = hostPkgs.lib.importJSON jsonpath;
pinnedPkgs = hostPkgs.fetchFromGitHub {
owner = "NixOS";
repo = "nixpkgs-channels";
inherit (pinnedVersion) rev sha256;
pinnedPkgs = hostPkgs.fetchgit {
inherit (pinnedVersion) url rev sha256;
};
in import pinnedPkgs {}
{
pkgs ? import ../pin.nix ../nixpkgs-18.03.json,
pins ? import ./pins.nix {inherit (pkgs) stdenv fetchgit fetchgitPrivate;}
pkgs ? import ../pin.nix ../nixpkgs-18.03.json,
datamovepkgs ? import ../pin.nix ../datamove.json,
packagepins ? import ./pins.nix {inherit (pkgs) stdenv fetchgit fetchgitPrivate;}
}:
let
callPackage = pkgs.lib.callPackageWith pkgs;
......@@ -9,12 +10,12 @@ in rec {
nrm-containers = callPackage ./containers {
inherit pythonPackages;
src = pins.containers;
src = packagepins.containers.nix;
};
nrm = callPackage ./nrm {
inherit pythonPackages nrm-containers;
src = pins.nrm;
src = packagepins.nrm.bandit;
};
}
# not buildable unless results are present(uses sudo: launch expes in nix-shell)
......
......@@ -2,10 +2,13 @@
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;
in {
nrm = {
bandit = gitpin ./nrm/bandit.json;
master = gitpin ./nrm/master.json;
};
containers = {
nix = gitpin ./containers/nix.json;
master = gitpin ./containers/master.json;
};
}
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