]> git.immae.eu Git - perso/Immae/Config/Nix.git/commitdiff
Move node-env file to a generic location
authorIsmaël Bouya <ismael.bouya@normalesup.org>
Wed, 8 May 2019 09:36:57 +0000 (11:36 +0200)
committerIsmaël Bouya <ismael.bouya@normalesup.org>
Wed, 8 May 2019 09:36:57 +0000 (11:36 +0200)
lib/node-env.nix [moved from pkgs/crypto/iota-cli-app/node-env.nix with 100% similarity]
libs.nix
overlays/environments/immae-eu.nix
pkgs/crypto/iota-cli-app/default.nix

index 630b139c2c60238ab81e6d6042e00c5be92f7101..eb00311c987c5d37960d1bad3722cf85871434c2 100644 (file)
--- a/libs.nix
+++ b/libs.nix
@@ -12,6 +12,8 @@ rec {
   in
     (callPackage src {}) // { inherit src; };
 
+  nodeEnv = import ./lib/node-env.nix;
+
   fetchedGithub = path:
     let
       json = lib.importJSON path;
index b5350486433128d57570edb77ac3b1f29b9cbe94..1f27e7cae5f885200d5d1ad96b01b61abad27d4c 100644 (file)
@@ -66,6 +66,7 @@ let
     mylibs.yarn2nixPackage.yarn2nix
     nixops nix-prefetch-scripts nix-generate-from-cpan
     nix-zsh-completions bundix nodePackages.bower2nix
+    nodePackages.node2nix
     # (nixos {}).nixos-generate-config
     # (nixos {}).nixos-install
     # (nixos {}).nixos-enter
index f0b5fed07699bac085ee0d70df159ab9b9cb2723..1a9d3ed7dc2df94e44739505fc98f9c1cb39777e 100644 (file)
@@ -1,6 +1,6 @@
 { stdenv, mylibs, fetchurl, fetchgit, callPackage, nodePackages, nodejs-8_x }:
 let
-  nodeEnv = callPackage ./node-env.nix { nodejs = nodejs-8_x; };
+  nodeEnv = callPackage mylibs.nodeEnv { nodejs = nodejs-8_x; };
   # built using node2nix -8 -l package-lock.json
   # and changing "./." to "src"
   packageEnv = import ./node-packages.nix {