about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorSandro <sandro.jaeckel@gmail.com>2022-12-31 23:07:42 +0100
committerGitHub <noreply@github.com>2022-12-31 23:07:42 +0100
commit407160f7003c4200b7fbc8031bbcd94587814ec6 (patch)
tree871775c95efc2fe0fbcb82e0982e856f8cc61f87 /pkgs
parentec75c32673ea0aa149ff6b4fe216087707b56160 (diff)
parent06ce75d72429de2fba0fa2c2b2e3011c5ece5654 (diff)
downloadnixlib-407160f7003c4200b7fbc8031bbcd94587814ec6.tar
nixlib-407160f7003c4200b7fbc8031bbcd94587814ec6.tar.gz
nixlib-407160f7003c4200b7fbc8031bbcd94587814ec6.tar.bz2
nixlib-407160f7003c4200b7fbc8031bbcd94587814ec6.tar.lz
nixlib-407160f7003c4200b7fbc8031bbcd94587814ec6.tar.xz
nixlib-407160f7003c4200b7fbc8031bbcd94587814ec6.tar.zst
nixlib-407160f7003c4200b7fbc8031bbcd94587814ec6.zip
Merge pull request #207382 from wegank/mongodb
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/servers/nosql/mongodb/v3_4.nix16
-rw-r--r--pkgs/servers/nosql/mongodb/v3_6.nix22
-rw-r--r--pkgs/top-level/aliases.nix2
-rw-r--r--pkgs/top-level/all-packages.nix16
4 files changed, 3 insertions, 53 deletions
diff --git a/pkgs/servers/nosql/mongodb/v3_4.nix b/pkgs/servers/nosql/mongodb/v3_4.nix
deleted file mode 100644
index 666a92004b44..000000000000
--- a/pkgs/servers/nosql/mongodb/v3_4.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ callPackage, lib, sasl, boost, Security, CoreFoundation, cctools }:
-
-let
-  buildMongoDB = callPackage ./mongodb.nix {
-    inherit sasl;
-    inherit boost;
-    inherit Security;
-    inherit CoreFoundation;
-    inherit cctools;
-  };
-in buildMongoDB {
-  version = "3.4.24";
-  sha256 = "0j6mvgv0jnsnvgkl8505bl88kbxkba66qijlpi1la0dd5pd1imfr";
-  patches = [ ./forget-build-dependencies-3-4.patch ];
-  license = lib.licenses.agpl3;
-}
diff --git a/pkgs/servers/nosql/mongodb/v3_6.nix b/pkgs/servers/nosql/mongodb/v3_6.nix
deleted file mode 100644
index 9a6379fac440..000000000000
--- a/pkgs/servers/nosql/mongodb/v3_6.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenv, callPackage, fetchpatch, lib, sasl, boost, Security, CoreFoundation, cctools }:
-
-let
-  buildMongoDB = callPackage ./mongodb.nix {
-    inherit sasl;
-    inherit boost;
-    inherit Security;
-    inherit CoreFoundation;
-    inherit cctools;
-  };
-in buildMongoDB {
-  version = "3.6.23";
-  sha256 = "sha256-EJpIerW4zcGJvHfqJ65fG8yNsLRlUnRkvYfC+jkoFJ4=";
-  patches = [ ./forget-build-dependencies.patch ]
-    ++ lib.optionals stdenv.isDarwin [
-      (fetchpatch {
-        name = "fix double link of isNamedError.";
-        url = "https://github.com/mongodb/mongo/commit/9c6751b9765d269b667324bb2efe1ca76a916d20.patch";
-        sha256 = "sha256-4mcafqhBh7039ocEI9d/gXWck51X68PqtWtz4dapwwI=";
-       })
-      ];
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 202d997f11ac..3f7ae1cc2f8e 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -953,6 +953,8 @@ mapAliases ({
   moby = throw "moby has been removed, merged into linuxkit in 2018.  Use linuxkit instead";
   module_init_tools = throw "'module_init_tools' has been renamed to/replaced by 'kmod'"; # Converted to throw 2022-02-22
   monero = monero-cli; # Added 2021-11-28
+  mongodb-3_4 = throw "mongodb-3_4 has been removed, it's end of life since January 2020"; # Added 2022-11-30
+  mongodb-3_6 = throw "mongodb-3_6 has been removed, it's end of life since April 2021"; # Added 2022-11-30
   monodevelop = throw "monodevelop has been removed from nixpkgs"; # Added 2022-01-15
   mopidy-gmusic = throw "mopidy-gmusic has been removed because Google Play Music was discontinued"; # Added 2021-03-07
   mopidy-local-images = throw "mopidy-local-images has been removed as it's unmaintained. Its functionality has been merged into the mopidy-local extension"; # Added 2020-10-18
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 784b0e510926..0a6560404214 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24433,21 +24433,7 @@ with pkgs;
   mariadb = mariadb_106;
   mariadb-embedded = mariadb.override { withEmbedded = true; };
 
-  mongodb = hiPrio mongodb-3_4;
-
-  mongodb-3_4 = callPackage ../servers/nosql/mongodb/v3_4.nix {
-    sasl = cyrus_sasl;
-    boost = boost160;
-    inherit (darwin) cctools;
-    inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
-  };
-
-  mongodb-3_6 = callPackage ../servers/nosql/mongodb/v3_6.nix {
-    sasl = cyrus_sasl;
-    boost = boost160;
-    inherit (darwin) cctools;
-    inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
-  };
+  mongodb = hiPrio mongodb-6_0;
 
   mongodb-4_0 = callPackage ../servers/nosql/mongodb/v4_0.nix {
     sasl = cyrus_sasl;