diff --git a/pkgs/tools/package-management/nixui/generate.sh b/pkgs/tools/package-management/nixui/generate.sh index e3a7d9f69e4..c7a93a71673 100755 --- a/pkgs/tools/package-management/nixui/generate.sh +++ b/pkgs/tools/package-management/nixui/generate.sh @@ -1,3 +1,4 @@ -#!/bin/sh -e +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p nodePackages.node2nix -node2nix -i pkg.json -c nixui.nix -e ../../../development/node-packages/node-env.nix --no-copy-node-env +exec node2nix -6 -i pkg.json -c nixui.nix -e ../../../development/node-packages/node-env.nix --no-copy-node-env diff --git a/pkgs/tools/package-management/nixui/nixui.nix b/pkgs/tools/package-management/nixui/nixui.nix index ee4dab5ad64..ade19b52162 100644 --- a/pkgs/tools/package-management/nixui/nixui.nix +++ b/pkgs/tools/package-management/nixui/nixui.nix @@ -1,8 +1,8 @@ -# This file has been generated by node2nix 1.2.0. Do not edit! +# This file has been generated by node2nix 1.5.1. Do not edit! {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-4_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}: let nodeEnv = import ../../../development/node-packages/node-env.nix { diff --git a/pkgs/tools/package-management/nixui/node-packages.nix b/pkgs/tools/package-management/nixui/node-packages.nix index cdb2df80804..4973223c0ac 100644 --- a/pkgs/tools/package-management/nixui/node-packages.nix +++ b/pkgs/tools/package-management/nixui/node-packages.nix @@ -1,36 +1,9 @@ -# This file has been generated by node2nix 1.2.0. Do not edit! +# This file has been generated by node2nix 1.5.1. Do not edit! {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: let sources = { - "isnumber-1.0.0" = { - name = "isnumber"; - packageName = "isnumber"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/isnumber/-/isnumber-1.0.0.tgz"; - sha1 = "0e3f9759b581d99dd85086f0ec2a74909cfadd01"; - }; - }; - "nedb-1.0.2" = { - name = "nedb"; - packageName = "nedb"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/nedb/-/nedb-1.0.2.tgz"; - sha1 = "309f10ba29f2002f74a92fb870b8a53ba2131593"; - }; - }; - "underscore-1.8.3" = { - name = "underscore"; - packageName = "underscore"; - version = "1.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz"; - sha1 = "4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022"; - }; - }; "async-0.2.10" = { name = "async"; packageName = "async"; @@ -40,15 +13,6 @@ let sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1"; }; }; - "underscore-1.4.4" = { - name = "underscore"; - packageName = "underscore"; - version = "1.4.4"; - src = fetchurl { - url = "https://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz"; - sha1 = "61a6a32010622afa07963bf325203cf12239d604"; - }; - }; "binary-search-tree-0.2.4" = { name = "binary-search-tree"; packageName = "binary-search-tree"; @@ -58,6 +22,15 @@ let sha1 = "14fe106366a59ca8efb68c0ae30c36aaff0cd510"; }; }; + "isnumber-1.0.0" = { + name = "isnumber"; + packageName = "isnumber"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/isnumber/-/isnumber-1.0.0.tgz"; + sha1 = "0e3f9759b581d99dd85086f0ec2a74909cfadd01"; + }; + }; "mkdirp-0.3.5" = { name = "mkdirp"; packageName = "mkdirp"; @@ -67,6 +40,33 @@ let sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7"; }; }; + "nedb-1.0.2" = { + name = "nedb"; + packageName = "nedb"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/nedb/-/nedb-1.0.2.tgz"; + sha1 = "309f10ba29f2002f74a92fb870b8a53ba2131593"; + }; + }; + "underscore-1.4.4" = { + name = "underscore"; + packageName = "underscore"; + version = "1.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz"; + sha1 = "61a6a32010622afa07963bf325203cf12239d604"; + }; + }; + "underscore-1.8.3" = { + name = "underscore"; + packageName = "underscore"; + version = "1.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz"; + sha1 = "4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022"; + }; + }; }; in { @@ -80,13 +80,13 @@ in sha256 = "2a2b1dcd9201e306242688c6c86f520ac47ef5de841ae0d7ea6ae8ff2889c3ab"; }; dependencies = [ + sources."async-0.2.10" + sources."binary-search-tree-0.2.4" sources."isnumber-1.0.0" + sources."mkdirp-0.3.5" (sources."nedb-1.0.2" // { dependencies = [ - sources."async-0.2.10" sources."underscore-1.4.4" - sources."binary-search-tree-0.2.4" - sources."mkdirp-0.3.5" ]; }) sources."underscore-1.8.3" @@ -98,5 +98,6 @@ in license = "Apache-2.0"; }; production = true; + bypassCache = false; }; } \ No newline at end of file