JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #27955 from holidaycheck/remove-nodejs-7

Browse Source 
nodejs: remove version 7_x
This commit is contained in:
Daiderd Jordan 2017-08-05 17:43:16 +02:00 committed by GitHub
commit e66c85d196
2 changed files with 1 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/development/web/nodejs/v7.nix
View File

@ -1,21 +0,0 @@
{ stdenv, fetchurl, openssl, python2, zlib, libuv, v8, utillinux, http-parser
, pkgconfig, runCommand, which, libtool, fetchpatch
, callPackage
, darwin ? null
, enableNpm ? true
}@args:
let
nodejs = import ./nodejs.nix args;
baseName = if enableNpm then "nodejs" else "nodejs-slim";
in
stdenv.mkDerivation (nodejs // rec {
version = "7.10.1";
name = "${baseName}-${version}";
src = fetchurl {
url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz";
sha256 = "654db852149a1cc59ece68ec573b0486907e8febe8353cee097dd29ea5a56cfa";
};
patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ];
})

11
pkgs/top-level/all-packages.nix
View File

@ -1054,7 +1054,7 @@ with pkgs;
glock = callPackage ../development/tools/glock { };
glslviewer = callPackage ../development/tools/glslviewer { };
gmic = callPackage ../tools/graphics/gmic { };
goa = callPackage ../development/tools/goa { };
@ -2904,15 +2904,6 @@ with pkgs;
enableNpm = false;
};
nodejs-7_x = callPackage ../development/web/nodejs/v7.nix {
libtool = darwin.cctools;
};
nodejs-slim-7_x = callPackage ../development/web/nodejs/v7.nix {
libtool = darwin.cctools;
enableNpm = false;
};
nodejs-8_x = callPackage ../development/web/nodejs/v8.nix {
libtool = darwin.cctools;
};