diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2017-08-05 17:43:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-05 17:43:16 +0200 |
| commit | e66c85d1962faa99d323eb8980ddbec16dbd98a3 (patch) | |
| tree | 5830b9ecaf35c955936d79b2e44fcad1eccc69a3 | |
| parent | 4e24cc32bc9b7a44015f09c7f0433b2c442dc8b4 (diff) | |
| parent | 28b0a79c040549afa99900780892d36a7ffe992c (diff) | |
| download | nixlib-e66c85d1962faa99d323eb8980ddbec16dbd98a3.tar nixlib-e66c85d1962faa99d323eb8980ddbec16dbd98a3.tar.gz nixlib-e66c85d1962faa99d323eb8980ddbec16dbd98a3.tar.bz2 nixlib-e66c85d1962faa99d323eb8980ddbec16dbd98a3.tar.lz nixlib-e66c85d1962faa99d323eb8980ddbec16dbd98a3.tar.xz nixlib-e66c85d1962faa99d323eb8980ddbec16dbd98a3.tar.zst nixlib-e66c85d1962faa99d323eb8980ddbec16dbd98a3.zip | |
Merge pull request #27955 from holidaycheck/remove-nodejs-7
nodejs: remove version 7_x
| -rw-r--r-- | pkgs/development/web/nodejs/v7.nix | 21 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 11 |
2 files changed, 1 insertions, 31 deletions
diff --git a/pkgs/development/web/nodejs/v7.nix b/pkgs/development/web/nodejs/v7.nix deleted file mode 100644 index 86d4fed8eab0..000000000000 --- a/pkgs/development/web/nodejs/v7.nix +++ /dev/null @@ -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 ]; - }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a56efb3e6742..9275d075af70 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; }; |