Merge pull request #207382 from wegank/mongodb (407160f7) · Commits · nix / nixpkgs

nixos/tests/mongodb.nix

+0 −4

Original line number	Diff line number	Diff line
		@@ -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

deleted100644 → 0

+0 −16

Original line number	Diff line number	Diff line
		{ 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;
		}

deleted100644 → 0

+0 −22

Original line number	Diff line number	Diff line
		{ 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=";
		})
		];
		}

+2 −0

Original line number	Diff line number	Diff line
		@@ -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

+1 −15

Original line number	Diff line number	Diff line
		@@ -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;