aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2019-03-10 01:01:17 +0100
committerIsmaël Bouya <ismael.bouya@normalesup.org>2019-03-10 01:01:17 +0100
commit596e62a678366c83ea8204316c45e91e1d90b0d8 (patch)
tree26792f69084f8abc8828f5c4f9fca800e120ca4e
parentfcf18de4a44fcc496837fbb6eedcc01e5f6eb680 (diff)
downloadNix-596e62a678366c83ea8204316c45e91e1d90b0d8.tar.gz
Nix-596e62a678366c83ea8204316c45e91e1d90b0d8.tar.zst
Nix-596e62a678366c83ea8204316c45e91e1d90b0d8.zip
Make pkg an argument of libs.nix
-rw-r--r--default.nix2
-rw-r--r--libs.nix12
-rw-r--r--nixops/eldiron.nix2
3 files changed, 4 insertions, 12 deletions
diff --git a/default.nix b/default.nix
index ad9bca7..d1bd830 100644
--- a/default.nix
+++ b/default.nix
@@ -1,5 +1,5 @@
1with import ./libs.nix;
2with import <immaeNixpkgsNext> {}; 1with import <immaeNixpkgsNext> {};
2with import ./libs.nix { nixpkgs = import <immaeNixpkgsNext> {}; };
3let 3let
4 mypkgs = {}; 4 mypkgs = {};
5 5
diff --git a/libs.nix b/libs.nix
index 0b5e0c1..a9e1e78 100644
--- a/libs.nix
+++ b/libs.nix
@@ -1,14 +1,6 @@
1let nixpkgs_unstable = import (builtins.fetchTarball { 1{ nixpkgs }:
2 # FIXME: upgrade to nixpkgs 19 when stable and stick to stable 2with nixpkgs;
3 # versions
4 name = "nixos-unstable-2018-12-08";
5 url = https://github.com/nixos/nixpkgs/archive/61c3169a0e17d789c566d5b241bfe309ce4a6275.tar.gz;
6 sha256 = "0qbycg7wkb71v20rchlkafrjfpbk2fnlvvbh3ai9pyfisci5wxvq";
7}) {};
8in
9 with nixpkgs_unstable;
10rec { 3rec {
11 inherit nixpkgs_unstable;
12 fetchedGithub = path: 4 fetchedGithub = path:
13 let 5 let
14 json = lib.importJSON path; 6 json = lib.importJSON path;
diff --git a/nixops/eldiron.nix b/nixops/eldiron.nix
index 21d3390..4726d08 100644
--- a/nixops/eldiron.nix
+++ b/nixops/eldiron.nix
@@ -9,7 +9,7 @@
9 with mylibs; 9 with mylibs;
10 { 10 {
11 _module.args = { 11 _module.args = {
12 mylibs = import ../libs.nix; 12 mylibs = import ../libs.nix { nixpkgs = pkgs; };
13 mypkgs = import ../default.nix; 13 mypkgs = import ../default.nix;
14 myconfig = { 14 myconfig = {
15 inherit privateFiles; 15 inherit privateFiles;