From 4f89a5f1ff73bb6cb195f8806393b4d08c1f690f Mon Sep 17 00:00:00 2001 From: Ludovico Piero Date: Thu, 27 Jun 2024 16:32:04 +0900 Subject: [PATCH 1/4] mongodb-compass: 1.43.0 -> 1.43.2 Release Notes: https://www.mongodb.com/docs/compass/current/release-notes/ Signed-off-by: Ludovico Piero --- pkgs/tools/misc/mongodb-compass/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/mongodb-compass/default.nix b/pkgs/tools/misc/mongodb-compass/default.nix index 00dce959fb63..c4bc1dd1e782 100644 --- a/pkgs/tools/misc/mongodb-compass/default.nix +++ b/pkgs/tools/misc/mongodb-compass/default.nix @@ -33,7 +33,7 @@ xorg, }: let - version = "1.43.0"; + version = "1.43.2"; rpath = lib.makeLibraryPath [ alsa-lib @@ -82,7 +82,7 @@ let if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://downloads.mongodb.com/compass/mongodb-compass_${version}_amd64.deb"; - sha256 = "sha256-hzPhF0NGwv+Lm+q5SoS8qv10UmuKf4RarGMkEeCxp9w="; + hash = "sha256-idOFt60MlspB8Bm9HbLAhd/F1zhkHSVmdTxvCsgjGvk="; } else throw "MongoDB compass is not supported on ${stdenv.hostPlatform.system}"; From 5649f06dfc3c98c49ecbbc4fb466443f90ad3e89 Mon Sep 17 00:00:00 2001 From: Ludovico Piero Date: Thu, 27 Jun 2024 16:33:36 +0900 Subject: [PATCH 2/4] mongodb-compass: format with nixfmt Signed-off-by: Ludovico Piero --- pkgs/tools/misc/mongodb-compass/default.nix | 75 +++++++++++---------- 1 file changed, 40 insertions(+), 35 deletions(-) diff --git a/pkgs/tools/misc/mongodb-compass/default.nix b/pkgs/tools/misc/mongodb-compass/default.nix index c4bc1dd1e782..415da948876c 100644 --- a/pkgs/tools/misc/mongodb-compass/default.nix +++ b/pkgs/tools/misc/mongodb-compass/default.nix @@ -1,35 +1,35 @@ { -alsa-lib, -at-spi2-atk, -at-spi2-core, -atk, -cairo, -cups, -curl, -dbus, -dpkg, -expat, -fetchurl, -fontconfig, -freetype, -gdk-pixbuf, -glib, -gtk3, -lib, -libdrm, -libnotify, -libsecret, -libuuid, -libxcb, -libxkbcommon, -mesa, -nspr, -nss, -pango, -stdenv, -systemd, -wrapGAppsHook3, -xorg, + alsa-lib, + at-spi2-atk, + at-spi2-core, + atk, + cairo, + cups, + curl, + dbus, + dpkg, + expat, + fetchurl, + fontconfig, + freetype, + gdk-pixbuf, + glib, + gtk3, + lib, + libdrm, + libnotify, + libsecret, + libuuid, + libxcb, + libxkbcommon, + mesa, + nspr, + nss, + pango, + stdenv, + systemd, + wrapGAppsHook3, + xorg, }: let @@ -86,16 +86,21 @@ let } else throw "MongoDB compass is not supported on ${stdenv.hostPlatform.system}"; - # NOTE While MongoDB Compass is available to darwin, I do not have resources to test it - # Feel free to make a PR adding support if desired + # NOTE While MongoDB Compass is available to darwin, I do not have resources to test it + # Feel free to make a PR adding support if desired -in stdenv.mkDerivation { +in +stdenv.mkDerivation { pname = "mongodb-compass"; inherit version; inherit src; - buildInputs = [ dpkg wrapGAppsHook3 gtk3 ]; + buildInputs = [ + dpkg + wrapGAppsHook3 + gtk3 + ]; dontUnpack = true; buildCommand = '' From 8d01e011e14ee6bd9b54cef0409656bac88c38fb Mon Sep 17 00:00:00 2001 From: Ludovico Piero Date: Thu, 27 Jun 2024 16:34:07 +0900 Subject: [PATCH 3/4] mongodb-compass: remove `meta = with lib;` Signed-off-by: Ludovico Piero --- pkgs/tools/misc/mongodb-compass/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/mongodb-compass/default.nix b/pkgs/tools/misc/mongodb-compass/default.nix index 415da948876c..fe11f1ef5644 100644 --- a/pkgs/tools/misc/mongodb-compass/default.nix +++ b/pkgs/tools/misc/mongodb-compass/default.nix @@ -132,12 +132,12 @@ stdenv.mkDerivation { wrapGAppsHook $out/bin/mongodb-compass ''; - meta = with lib; { + meta = { description = "GUI for MongoDB"; - maintainers = with maintainers; [ bryanasdev000 ]; + maintainers = with lib.maintainers; [ bryanasdev000 ]; homepage = "https://github.com/mongodb-js/compass"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.sspl; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + license = lib.licenses.sspl; platforms = [ "x86_64-linux" ]; mainProgram = "mongodb-compass"; }; From 6a50fdfeff1d42178d0d788e30c13c01148125a1 Mon Sep 17 00:00:00 2001 From: Ludovico Piero Date: Thu, 27 Jun 2024 16:39:06 +0900 Subject: [PATCH 4/4] mongodb-compass: move to pkgs/by-name Signed-off-by: Ludovico Piero --- .../default.nix => by-name/mo/mongodb-compass/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/misc/mongodb-compass/default.nix => by-name/mo/mongodb-compass/package.nix} (100%) diff --git a/pkgs/tools/misc/mongodb-compass/default.nix b/pkgs/by-name/mo/mongodb-compass/package.nix similarity index 100% rename from pkgs/tools/misc/mongodb-compass/default.nix rename to pkgs/by-name/mo/mongodb-compass/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8bf41f8168d3..f940b66d66fc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6290,8 +6290,6 @@ with pkgs; mongoaudit = callPackage ../tools/security/mongoaudit { }; - mongodb-compass = callPackage ../tools/misc/mongodb-compass { }; - mongodb-tools = callPackage ../tools/misc/mongodb-tools { }; moosefs = callPackage ../tools/filesystems/moosefs { };