From ba6d653707c56e658394926553c0cbd1efbda4a5 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Fri, 23 Dec 2022 06:58:23 +0100
Subject: mongodb: default to mongodb-6_0

---
 pkgs/top-level/all-packages.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9b260e9ac45a..76a09e6d827e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24408,8 +24408,7 @@ with pkgs;
   mariadb = mariadb_106;
   mariadb-embedded = mariadb.override { withEmbedded = true; };
 
-  mongodb = hiPrio mongodb-3_4;
-
+  mongodb = hiPrio mongodb-6_0;
   mongodb-3_4 = callPackage ../servers/nosql/mongodb/v3_4.nix {
     sasl = cyrus_sasl;
     boost = boost160;
-- 
cgit 1.4.1


From 06ce75d72429de2fba0fa2c2b2e3011c5ece5654 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Fri, 23 Dec 2022 06:59:02 +0100
Subject: mongodb-3_4, mongodb-3_6: drop

---
 nixos/tests/mongodb.nix             |  4 ----
 pkgs/servers/nosql/mongodb/v3_4.nix | 16 ----------------
 pkgs/servers/nosql/mongodb/v3_6.nix | 22 ----------------------
 pkgs/top-level/aliases.nix          |  2 ++
 pkgs/top-level/all-packages.nix     | 13 -------------
 5 files changed, 2 insertions(+), 55 deletions(-)
 delete mode 100644 pkgs/servers/nosql/mongodb/v3_4.nix
 delete mode 100644 pkgs/servers/nosql/mongodb/v3_6.nix

(limited to 'pkgs')

diff --git a/nixos/tests/mongodb.nix b/nixos/tests/mongodb.nix
index edd074f5163c..67347541dd66 100644
--- a/nixos/tests/mongodb.nix
+++ b/nixos/tests/mongodb.nix
@@ -33,8 +33,6 @@ import ./make-test-python.nix ({ pkgs, ... }:
     nodes = {
       node = {...}: {
         environment.systemPackages = with pkgs; [
-          mongodb-3_4
-          mongodb-3_6
           mongodb-4_0
           mongodb-4_2
           mongodb-4_4
@@ -46,8 +44,6 @@ import ./make-test-python.nix ({ pkgs, ... }:
     testScript = ''
       node.start()
     ''
-      + runMongoDBTest pkgs.mongodb-3_4
-      + runMongoDBTest pkgs.mongodb-3_6
       + runMongoDBTest pkgs.mongodb-4_0
       + runMongoDBTest pkgs.mongodb-4_2
       + runMongoDBTest pkgs.mongodb-4_4
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 3102d08edf13..ef0c0d4b2abf 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -951,6 +951,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 76a09e6d827e..3e1af23214b3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24409,19 +24409,6 @@ with pkgs;
   mariadb-embedded = mariadb.override { withEmbedded = true; };
 
   mongodb = hiPrio mongodb-6_0;
-  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-4_0 = callPackage ../servers/nosql/mongodb/v4_0.nix {
     sasl = cyrus_sasl;
-- 
cgit 1.4.1