Make pkg an argument of libs.nix

diff --git a/default.nix b/default.nix
index ad9bca7f2a6876ac98063d529db8dffdd513687d..d1bd83078d0a76d94278a295923657c6fd13ae64 100644 (file)
--- a/default.nix
+++ b/default.nix
@@ -1,5 +1,5 @@
-with import ./libs.nix;
 with import <immaeNixpkgsNext> {};
+with import ./libs.nix { nixpkgs = import <immaeNixpkgsNext> {}; };
 let
   mypkgs = {};
 

diff --git a/libs.nix b/libs.nix
index 0b5e0c1ab8bdbd41331412d768e2b466fd91ed3c..a9e1e78f01d4f74bd9e177299ea5a3b1d5ed322d 100644 (file)
--- a/libs.nix
+++ b/libs.nix
@@ -1,14 +1,6 @@
-let nixpkgs_unstable = import (builtins.fetchTarball {
-  # FIXME: upgrade to nixpkgs 19 when stable and stick to stable
-  # versions
-  name = "nixos-unstable-2018-12-08";
-  url = https://github.com/nixos/nixpkgs/archive/61c3169a0e17d789c566d5b241bfe309ce4a6275.tar.gz;
-  sha256 = "0qbycg7wkb71v20rchlkafrjfpbk2fnlvvbh3ai9pyfisci5wxvq";
-}) {};
-in
-  with nixpkgs_unstable;
+{ nixpkgs }:
+with nixpkgs;
 rec {
-  inherit nixpkgs_unstable;
   fetchedGithub = path:
     let
       json = lib.importJSON path;

diff --git a/nixops/eldiron.nix b/nixops/eldiron.nix
index 21d3390a8dac88d77cb9ea27ba374b05398fb5ee..4726d08ef831bccec5ddb5cfe58e90339853c3c5 100644 (file)
--- a/nixops/eldiron.nix
+++ b/nixops/eldiron.nix
@@ -9,7 +9,7 @@
     with mylibs;
   {
     _module.args = {
-      mylibs = import ../libs.nix;
+      mylibs = import ../libs.nix { nixpkgs = pkgs; };
       mypkgs = import ../default.nix;
       myconfig = {
         inherit privateFiles;