diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2017-09-07 20:31:19 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-07 20:31:19 +0100 |
commit | 56ccd27dee7bd44c9a660274a82d05d92f94c214 (patch) | |
tree | 460347e7027c97c3421fb70d8fc0349a13120c4e /pkgs | |
parent | f66ed3079dc569e483e85fae8b21ff44df288df4 (diff) | |
parent | 6b6ffd5b216553c03e6e650644e3cb2f8539b752 (diff) | |
download | nixlib-56ccd27dee7bd44c9a660274a82d05d92f94c214.tar nixlib-56ccd27dee7bd44c9a660274a82d05d92f94c214.tar.gz nixlib-56ccd27dee7bd44c9a660274a82d05d92f94c214.tar.bz2 nixlib-56ccd27dee7bd44c9a660274a82d05d92f94c214.tar.lz nixlib-56ccd27dee7bd44c9a660274a82d05d92f94c214.tar.xz nixlib-56ccd27dee7bd44c9a660274a82d05d92f94c214.tar.zst nixlib-56ccd27dee7bd44c9a660274a82d05d92f94c214.zip |
Merge pull request #29073 from Mic92/mongodb/2.4.8
mfi-controller: remove
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/libraries/v8/3.14.nix | 28 | ||||
-rw-r--r-- | pkgs/servers/mfi/default.nix | 28 | ||||
-rw-r--r-- | pkgs/servers/nosql/mongodb/2.4.8.nix | 45 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 8 |
4 files changed, 0 insertions, 109 deletions
diff --git a/pkgs/development/libraries/v8/3.14.nix b/pkgs/development/libraries/v8/3.14.nix deleted file mode 100644 index fee0f868ea92..000000000000 --- a/pkgs/development/libraries/v8/3.14.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, callPackage, fetchFromGitHub, python, ... } @ args: -with stdenv.lib; -let - version = "3.14.5.10"; - sha256 = "08vhl84166x13b3cbx8y0g99yqx772zd33gawsa1nxqkyrykql6k"; -in -(callPackage ./generic.nix (args // { - inherit version sha256; -})).overrideDerivation (oldAttrs:{ - patchPhase = [ - oldAttrs.patchPhase - "sed -i 's,#!/usr/bin/python,#!${python}/bin/python,' build/gyp_v8" - ]; - - # http://code.google.com/p/v8/issues/detail?id=2149 - NIX_CFLAGS_COMPILE = concatStringsSep " " [ - oldAttrs.NIX_CFLAGS_COMPILE - "-Wno-unused-local-typedefs" - "-Wno-aggressive-loop-optimizations" - ]; - - src = fetchFromGitHub { - owner = "v8"; - repo = "v8"; - rev = "${version}"; - inherit sha256; - }; -}) diff --git a/pkgs/servers/mfi/default.nix b/pkgs/servers/mfi/default.nix deleted file mode 100644 index e431ca993a90..000000000000 --- a/pkgs/servers/mfi/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchurl, unzip }: - -stdenv.mkDerivation rec { - name = "mfi-controller-${version}"; - version = "2.1.11"; - - src = fetchurl { - url = "https://dl.ubnt.com/mfi/${version}/mFi.unix.zip"; - sha256 = "0b9q6025zf9zjzq8dcmcyai8rslx67g52j41gacxsk9i5dspmw90"; - }; - - buildInputs = [ unzip ]; - - dontBuild = true; - - installPhase = '' - mkdir -p $out - cp -ar conf data dl lib webapps $out - ''; - - meta = with stdenv.lib; { - homepage = http://www.ubnt.com/; - description = "Controller for Ubiquiti mFi devices"; - license = licenses.unfree; - platforms = platforms.unix; - maintainers = with maintainers; [ elitak ]; - }; -} diff --git a/pkgs/servers/nosql/mongodb/2.4.8.nix b/pkgs/servers/nosql/mongodb/2.4.8.nix deleted file mode 100644 index ccd64da3c6a8..000000000000 --- a/pkgs/servers/nosql/mongodb/2.4.8.nix +++ /dev/null @@ -1,45 +0,0 @@ -# This derivation was resurrected from 4c8ec5e12e187347fd97b1a1a9a43eb19e009ed0 -# by elitak for use with the Ubiquiti mFi Controller package, which breaks at -# runtime on mongodb3+ and jre8+. We will need to pull in sufficiently old -# versions of boost and v8 to build this, as well. -{ stdenv, fetchurl, scons, boost155, v8_3_14, gperftools, pcre-cpp, snappy }: -with stdenv.lib; -let - version = "2.4.8"; -in -stdenv.mkDerivation rec { - name = "mongodb-${version}"; - - src = fetchurl { - url = "http://downloads.mongodb.org/src/mongodb-src-r${version}.tar.gz"; - sha256 = "1p6gnharypglfp39halp72fig96fqjhakyy7m76a1prxwpjkqw7x"; - }; - - nativeBuildInputs = [ scons boost155 v8_3_14 gperftools pcre-cpp snappy ]; - - postPatch = '' - substituteInPlace SConstruct \ - --replace "Environment( BUILD_DIR" "Environment( ENV = os.environ, BUILD_DIR" \ - --replace 'CCFLAGS=["-Werror", "-pipe"]' 'CCFLAGS=["-pipe"]' - ''; - - NIX_CFLAGS_COMPILE = "-Wno-unused-local-typedefs"; - - buildPhase = '' - export SCONSFLAGS="-j$NIX_BUILD_CORES" - scons all --use-system-all - ''; - - installPhase = '' - mkdir -p $out/lib - scons install --use-system-all --full --prefix=$out - ''; - - meta = { - description = "A scalable, high-performance, open source NoSQL database"; - homepage = http://www.mongodb.org; - license = licenses.agpl3; - maintainers = with maintainers; [ bluescreen303 elitak ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 316e4aea8a1c..9382dc8974f1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10630,10 +10630,6 @@ with pkgs; gnutls = gnutls; }); - v8_3_14 = callPackage ../development/libraries/v8/3.14.nix { - inherit (python2Packages) python gyp; - }; - v8_3_16_14 = callPackage ../development/libraries/v8/3.16.14.nix { inherit (python2Packages) python gyp; cctools = darwin.cctools; @@ -11336,8 +11332,6 @@ with pkgs; meteor = callPackage ../servers/meteor/default.nix { }; - mfi = callPackage ../servers/mfi { }; - minio = callPackage ../servers/minio { }; # Backwards compatibility. @@ -11479,8 +11473,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - mongodb248 = callPackage ../servers/nosql/mongodb/2.4.8.nix { }; - percona-server56 = callPackage ../servers/sql/percona/5.6.x.nix { }; percona-server = percona-server56; |