diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-05-08 11:36:57 +0200 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-05-08 11:36:57 +0200 |
commit | 803d2d9f35005f10eb43e4568b7f0444d3f9d6aa (patch) | |
tree | 233956ffac3ac475de60d74e2e08211d180640cb | |
parent | 3d409f87695d58f3744996b3ecd99ad5095b5783 (diff) | |
download | Nix-803d2d9f35005f10eb43e4568b7f0444d3f9d6aa.tar.gz Nix-803d2d9f35005f10eb43e4568b7f0444d3f9d6aa.tar.zst Nix-803d2d9f35005f10eb43e4568b7f0444d3f9d6aa.zip |
Move node-env file to a generic location
-rw-r--r-- | lib/node-env.nix (renamed from pkgs/crypto/iota-cli-app/node-env.nix) | 0 | ||||
-rw-r--r-- | libs.nix | 2 | ||||
-rw-r--r-- | overlays/environments/immae-eu.nix | 1 | ||||
-rw-r--r-- | pkgs/crypto/iota-cli-app/default.nix | 2 |
4 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/crypto/iota-cli-app/node-env.nix b/lib/node-env.nix index 720e0cc..720e0cc 100644 --- a/pkgs/crypto/iota-cli-app/node-env.nix +++ b/lib/node-env.nix | |||
@@ -12,6 +12,8 @@ rec { | |||
12 | in | 12 | in |
13 | (callPackage src {}) // { inherit src; }; | 13 | (callPackage src {}) // { inherit src; }; |
14 | 14 | ||
15 | nodeEnv = import ./lib/node-env.nix; | ||
16 | |||
15 | fetchedGithub = path: | 17 | fetchedGithub = path: |
16 | let | 18 | let |
17 | json = lib.importJSON path; | 19 | json = lib.importJSON path; |
diff --git a/overlays/environments/immae-eu.nix b/overlays/environments/immae-eu.nix index b535048..1f27e7c 100644 --- a/overlays/environments/immae-eu.nix +++ b/overlays/environments/immae-eu.nix | |||
@@ -66,6 +66,7 @@ let | |||
66 | mylibs.yarn2nixPackage.yarn2nix | 66 | mylibs.yarn2nixPackage.yarn2nix |
67 | nixops nix-prefetch-scripts nix-generate-from-cpan | 67 | nixops nix-prefetch-scripts nix-generate-from-cpan |
68 | nix-zsh-completions bundix nodePackages.bower2nix | 68 | nix-zsh-completions bundix nodePackages.bower2nix |
69 | nodePackages.node2nix | ||
69 | # (nixos {}).nixos-generate-config | 70 | # (nixos {}).nixos-generate-config |
70 | # (nixos {}).nixos-install | 71 | # (nixos {}).nixos-install |
71 | # (nixos {}).nixos-enter | 72 | # (nixos {}).nixos-enter |
diff --git a/pkgs/crypto/iota-cli-app/default.nix b/pkgs/crypto/iota-cli-app/default.nix index f0b5fed..1a9d3ed 100644 --- a/pkgs/crypto/iota-cli-app/default.nix +++ b/pkgs/crypto/iota-cli-app/default.nix | |||
@@ -1,6 +1,6 @@ | |||
1 | { stdenv, mylibs, fetchurl, fetchgit, callPackage, nodePackages, nodejs-8_x }: | 1 | { stdenv, mylibs, fetchurl, fetchgit, callPackage, nodePackages, nodejs-8_x }: |
2 | let | 2 | let |
3 | nodeEnv = callPackage ./node-env.nix { nodejs = nodejs-8_x; }; | 3 | nodeEnv = callPackage mylibs.nodeEnv { nodejs = nodejs-8_x; }; |
4 | # built using node2nix -8 -l package-lock.json | 4 | # built using node2nix -8 -l package-lock.json |
5 | # and changing "./." to "src" | 5 | # and changing "./." to "src" |
6 | packageEnv = import ./node-packages.nix { | 6 | packageEnv = import ./node-packages.nix { |