From a6828daccc0a6cc18c2ab5068e30494f34d4f52b Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Tue, 20 Aug 2013 11:57:14 +0200 Subject: [PATCH] Force npm2nix not to use the 1.0.0 prerelease of swig --- pkgs/top-level/node-packages-generated.nix | 24 ++++++++++++++++------ pkgs/top-level/node-packages.json | 2 +- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index 6c343f08e53..750d413cbb8 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -8164,18 +8164,17 @@ } { name = "swig"; - spec = "*"; - version = "1.0.0-pre2"; + spec = "0.14.x"; + version = "0.14.0"; topLevel = true; dependencies = [ - { name = "uglify-js"; spec = "~2.3"; } - { name = "optimist"; spec = "~0.6.0"; } + { name = "underscore"; spec = ">=1.1.7"; } ]; peerDependencies = [ ]; patchLatest = false; - sha1 = "e1ee52591921aab9ca8763fc351131a1d08400f5"; - tarball = "http://registry.npmjs.org/swig/-/swig-1.0.0-pre2.tgz"; + sha1 = "544bfb3bd837608873eed6a72c672a28cb1f1b3f"; + tarball = "http://registry.npmjs.org/swig/-/swig-0.14.0.tgz"; } { name = "sylvester"; @@ -8607,6 +8606,19 @@ sha1 = "61a6a32010622afa07963bf325203cf12239d604"; tarball = "http://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz"; } + { + name = "underscore"; + spec = ">=1.1.7"; + version = "1.5.1"; + topLevel = false; + dependencies = [ + ]; + peerDependencies = [ + ]; + patchLatest = false; + sha1 = "d2bde817d176ffade894ab71458e682a14b86dc9"; + tarball = "http://registry.npmjs.org/underscore/-/underscore-1.5.1.tgz"; + } { name = "underscore"; spec = ">=1.4.3"; diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json index 231a8b52fc1..974dc9f74bb 100644 --- a/pkgs/top-level/node-packages.json +++ b/pkgs/top-level/node-packages.json @@ -14,7 +14,7 @@ , "smartdc" , "optparse" , "jsontool" -, "swig" +, { "swig": "0.14.x" } , "coffee-script" , "escape-html" , "buffertools"