From 803d2d9f35005f10eb43e4568b7f0444d3f9d6aa Mon Sep 17 00:00:00 2001 From: =?utf8?q?Isma=C3=ABl=20Bouya?= Date: Wed, 8 May 2019 11:36:57 +0200 Subject: [PATCH] Move node-env file to a generic location --- {pkgs/crypto/iota-cli-app => lib}/node-env.nix | 0 libs.nix | 2 ++ overlays/environments/immae-eu.nix | 1 + pkgs/crypto/iota-cli-app/default.nix | 2 +- 4 files changed, 4 insertions(+), 1 deletion(-) rename {pkgs/crypto/iota-cli-app => lib}/node-env.nix (100%) diff --git a/pkgs/crypto/iota-cli-app/node-env.nix b/lib/node-env.nix similarity index 100% rename from pkgs/crypto/iota-cli-app/node-env.nix rename to lib/node-env.nix diff --git a/libs.nix b/libs.nix index 630b139..eb00311 100644 --- 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; 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 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 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 @@ { 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 { -- 2.41.0