From 28b0a79c040549afa99900780892d36a7ffe992c Mon Sep 17 00:00:00 2001 From: Mathias Schreck Date: Sat, 5 Aug 2017 13:17:50 +0200 Subject: [PATCH] nodejs: remove version 7_x nodejs v7 reached its end of life in June 2017. --- pkgs/development/web/nodejs/v7.nix | 21 --------------------- pkgs/top-level/all-packages.nix | 11 +---------- 2 files changed, 1 insertion(+), 31 deletions(-) delete mode 100644 pkgs/development/web/nodejs/v7.nix diff --git a/pkgs/development/web/nodejs/v7.nix b/pkgs/development/web/nodejs/v7.nix deleted file mode 100644 index 86d4fed8eab..00000000000 --- 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 bd030f917ae..27948043471 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1052,7 +1052,7 @@ with pkgs; glock = callPackage ../development/tools/glock { }; glslviewer = callPackage ../development/tools/glslviewer { }; - + gmic = callPackage ../tools/graphics/gmic { }; goa = callPackage ../development/tools/goa { }; @@ -2901,15 +2901,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; };