pinning fix

45cd62da · Valentin Reis · 85622d75 · 45cd62da · 45cd62da
Commit 45cd62da authored Jul 27, 2018 by Valentin Reis
Hide whitespace changes
Inline Side-by-side

Showing with 13 additions and 4 deletions

pin.nix pin.nix +4 -2

pkgs/default.nix pkgs/default.nix +9 -2

No files found.
--- a/pin.nix
+++ b/pin.nix
-jsonpath :
+{
+  hostPkgs ? import <nixpkgs> {},
+  jsonpath
+}:
  let
-    hostPkgs = import <nixpkgs> {};
    pinnedVersion = hostPkgs.lib.importJSON jsonpath;
    pinnedPkgs = hostPkgs.fetchgit {
      inherit (pinnedVersion) url rev sha256;

--- a/pkgs/default.nix
+++ b/pkgs/default.nix
 {
-  pkgs         ? import ../pin.nix ../nixpkgs-18.03.json,
-  datamovepkgs ? import ../pin.nix ../datamove.json,
+  hostPkgs ? import <nixpkgs> {},
+  pkgs         ? import ../pin.nix {
+    inherit hostPkgs;
+    jsonpath =../nixpkgs-18.03.json;
+  },
+  datamovepkgs ? import ../pin.nix {
+    inherit hostPkgs;
+    jsonpath=../datamove.json;
+  },
  packagepins ? import ./pins.nix {inherit (pkgs) stdenv fetchgit fetchgitPrivate;}
 }:
 let