diff --git a/pkgs/applications/audio/groovebasin/default.nix b/pkgs/applications/audio/groovebasin/default.nix index 0bbf2baf1055..7eb2e85f7bed 100644 --- a/pkgs/applications/audio/groovebasin/default.nix +++ b/pkgs/applications/audio/groovebasin/default.nix @@ -62,5 +62,8 @@ in nodePackages.buildNodePackage rec { Groove Basin supports Last.fm scrobbling. ''; + # groovebasin was built with nodejs 0.10 which reached end of LTS + # in October 216, it doesn't built with nodejs 4.x + broken = true; }; } diff --git a/pkgs/development/compilers/opa/default.nix b/pkgs/development/compilers/opa/default.nix index 2e691dc749d5..a69694778442 100644 --- a/pkgs/development/compilers/opa/default.nix +++ b/pkgs/development/compilers/opa/default.nix @@ -63,5 +63,8 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.kkallio ]; platforms = with stdenv.lib.platforms; linux; + # opa was built with nodejs 0.10 which reached end of LTS + # in October 216, it doesn't built with nodejs 4.x + broken = true; }; } diff --git a/pkgs/development/web/nodejs/v0_10.nix b/pkgs/development/web/nodejs/v0_10.nix deleted file mode 100644 index cdb73e19232a..000000000000 --- a/pkgs/development/web/nodejs/v0_10.nix +++ /dev/null @@ -1,75 +0,0 @@ -{ stdenv, lib, fetchurl, openssl, python2, zlib, v8, utillinux, http-parser, c-ares -, pkgconfig, runCommand, which, libtool - -# apple frameworks -, CoreServices, ApplicationServices, Carbon, Foundation -}: - -let - version = "0.10.42"; - - # !!! Should we also do shared libuv? - deps = { - inherit openssl zlib; - - # disabled system v8 because v8 3.14 no longer receives security fixes - # we fall back to nodejs' internal v8 copy which receives backports for now - # inherit v8 - } // (stdenv.lib.optionalAttrs (!stdenv.isDarwin) { - inherit http-parser; - }) - // ({ cares = c-ares; }); - - sharedConfigureFlags = name: let drv = builtins.getAttr name deps; in [ - "--shared-${name}" - "--shared-${name}-includes=${lib.getDev drv}/include" - "--shared-${name}-libpath=${lib.getLib drv}/lib" - ]; - - inherit (stdenv.lib) concatMap optional optionals maintainers licenses platforms; -in stdenv.mkDerivation { - name = "nodejs-${version}"; - - src = fetchurl { - url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz"; - sha256 = "01g19mq8b3b828f59x7bv79973w5sw4133ll1dxml37qk0vdbhgb"; - }; - - configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps) ++ - stdenv.lib.optional stdenv.isDarwin "--without-dtrace"; - - prePatch = '' - patchShebangs . - sed -i 's/raise.*No Xcode or CLT version detected.*/version = "7.0.0"/' deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py - sed -i 's/raise.*No Xcode or CLT version detected.*/version = "7.0.0"/' tools/gyp/pylib/gyp/xcode_emulation.py - ''; - - patches = stdenv.lib.optionals stdenv.isDarwin [ ./default-arch.patch ./no-xcode.patch ]; - - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' - (cd tools/gyp; patch -Np1 -i ${../../python-modules/gyp/no-darwin-cflags.patch}) - ''; - - buildInputs = [ python2 which ] - ++ (optional stdenv.isLinux utillinux) - ++ optionals stdenv.isDarwin [ pkgconfig openssl libtool CoreServices ApplicationServices Foundation ]; - propagatedBuildInputs = optionals stdenv.isDarwin [ Carbon ]; - setupHook = ./setup-hook.sh; - - enableParallelBuilding = true; - - postFixup = '' - pushd $out/lib/node_modules/npm/node_modules/node-gyp - patch -p2 < ${./no-xcode.patch} - popd - ''; - - passthru.interpreterName = "nodejs-0.10"; - - meta = { - description = "Event-driven I/O framework for the V8 JavaScript engine"; - homepage = http://nodejs.org; - license = licenses.mit; - platforms = platforms.linux ++ platforms.darwin; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9ad9515b98b0..62727cf83b12 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2413,11 +2413,6 @@ in ninka = callPackage ../development/tools/misc/ninka { }; - nodejs-0_10 = callPackage ../development/web/nodejs/v0_10.nix { - libtool = darwin.cctools; - inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices Carbon Foundation; - }; - nodejs-4_x = callPackage ../development/web/nodejs/v4.nix { libtool = darwin.cctools; }; @@ -2426,10 +2421,7 @@ in libtool = darwin.cctools; }; - nodejs = if stdenv.system == "armv5tel-linux" then - nodejs-0_10 - else - nodejs-4_x; + nodejs = nodejs-4_x; nodePackages_6_x = callPackage ../development/node-packages/default-v6.nix { nodejs = pkgs.nodejs-6_x; @@ -2439,14 +2431,7 @@ in nodejs = pkgs.nodejs-4_x; }; - nodePackages_0_10 = callPackage ../development/node-packages/default-v0_10.nix { - nodejs = pkgs.nodejs-0_10; - }; - - nodePackages = if stdenv.system == "armv5tel-linux" then - nodePackages_0_10 - else - nodePackages_4_x; + nodePackages = nodePackages_4_x; # Can be used as a user shell nologin = shadow; @@ -5092,7 +5077,7 @@ in inherit (ocamlPackages) ocaml-top; opa = callPackage ../development/compilers/opa { - nodejs = nodejs-0_10; + nodejs = nodejs-4_x; }; inherit (ocaml-ng.ocamlPackages_4_01_0) opam_1_0_0; @@ -10002,7 +9987,7 @@ in grafana = callPackage ../servers/monitoring/grafana { }; - groovebasin = callPackage ../applications/audio/groovebasin { nodejs = nodejs-0_10; }; + groovebasin = callPackage ../applications/audio/groovebasin { nodejs = nodejs-4_x; }; haka = callPackage ../tools/security/haka { };