From 5a73e07b1089d7d43d5d97305aa5a843de97002f Mon Sep 17 00:00:00 2001 From: klchen0112 Date: Sat, 26 Jul 2025 23:58:54 +0800 Subject: [PATCH 1/2] libmamba: 2.1.1 -> 2.3.0 --- pkgs/by-name/li/libmamba/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/li/libmamba/package.nix b/pkgs/by-name/li/libmamba/package.nix index 4f8c8cc0c843..e2e360d7ca3b 100644 --- a/pkgs/by-name/li/libmamba/package.nix +++ b/pkgs/by-name/li/libmamba/package.nix @@ -3,7 +3,7 @@ lib, stdenv, cmake, - fmt, + fmt_11, spdlog, tl-expected, nlohmann_json, @@ -21,13 +21,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libmamba"; - version = "2.1.1"; + version = "2.3.0"; src = fetchFromGitHub { owner = "mamba-org"; repo = "mamba"; tag = finalAttrs.version; - hash = "sha256-JBwdfYM7J5R7HZyw5kVXwu4FlZUd2QPrsTaGuXnyAJI="; + hash = "sha256-EwG5pR3nOYffQdK3xIKJztkKLqMi6Hj9fmkihn9pZHE="; }; nativeBuildInputs = [ @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - fmt + fmt_11 spdlog tl-expected nlohmann_json From 113cd6243d55c8738aafa5cf088e5b09e020653f Mon Sep 17 00:00:00 2001 From: klchen0112 Date: Sat, 26 Jul 2025 23:59:03 +0800 Subject: [PATCH 2/2] mamba-cpp: use src and version from libmamba --- pkgs/by-name/ma/mamba-cpp/package.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/ma/mamba-cpp/package.nix b/pkgs/by-name/ma/mamba-cpp/package.nix index 75dbacee94dc..682f6464637b 100644 --- a/pkgs/by-name/ma/mamba-cpp/package.nix +++ b/pkgs/by-name/ma/mamba-cpp/package.nix @@ -1,7 +1,6 @@ { lib, stdenv, - fetchFromGitHub, bzip2, cmake, cli11, @@ -15,16 +14,9 @@ python3, versionCheckHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "mamba-cpp"; - version = "2.1.1"; - - src = fetchFromGitHub { - owner = "mamba-org"; - repo = "mamba"; - tag = version; - hash = "sha256-JBwdfYM7J5R7HZyw5kVXwu4FlZUd2QPrsTaGuXnyAJI="; - }; + inherit (libmamba) version src; nativeBuildInputs = [ cmake ];