From d1543c4cb9934e3bff0e6a0279424334b8e876c6 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Tue, 26 Nov 2024 19:12:22 +0800 Subject: [PATCH 1/3] libmamba: 1.5.8 -> 2.0.4 --- pkgs/by-name/li/libmamba/package.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/li/libmamba/package.nix b/pkgs/by-name/li/libmamba/package.nix index 435d15c34a5dc..3b235a23135ec 100644 --- a/pkgs/by-name/li/libmamba/package.nix +++ b/pkgs/by-name/li/libmamba/package.nix @@ -14,22 +14,26 @@ curl, libarchive, zstd, + nix-update-script, bzip2, python3Packages, }: -stdenv.mkDerivation rec { + +stdenv.mkDerivation (finalAttrs:{ pname = "libmamba"; - version = "1.5.8"; + version = "2.0.4"; src = fetchFromGitHub { owner = "mamba-org"; repo = "mamba"; - rev = "libmamba-${version}"; - hash = "sha256-sxZDlMFoMLq2EAzwBVO++xvU1C30JoIoZXEX/sqkXS0="; + rev = "libmamba-${finalAttrs.version}"; + hash = "sha256-UzuWQOFvp6KFDwcjjiwl0ek7pLuPvOijksUxp+hk/NU="; }; + nativeBuildInputs = [ cmake python3Packages.python ]; + buildInputs = [ fmt spdlog @@ -50,6 +54,8 @@ stdenv.mkDerivation rec { (lib.cmakeBool "BUILD_SHARED" true) ]; + passthru.updateScript = nix-update-script { }; + meta = { description = "Library for the fast Cross-Platform Package Manager"; homepage = "https://github.com/mamba-org/mamba"; @@ -57,4 +63,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = [ lib.maintainers.ericthemagician ]; }; -} +}) From 5cc0adf8ef8b2fcf9a1804a3194eabe0d7b12cf9 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Tue, 26 Nov 2024 19:04:04 +0800 Subject: [PATCH 2/3] python312Packages.libmambapy: fix build --- pkgs/by-name/li/libmamba/package.nix | 3 +- .../python-modules/libmambapy/default.nix | 31 +++++++++++-------- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/li/libmamba/package.nix b/pkgs/by-name/li/libmamba/package.nix index 3b235a23135ec..ce83193ca3ecf 100644 --- a/pkgs/by-name/li/libmamba/package.nix +++ b/pkgs/by-name/li/libmamba/package.nix @@ -19,9 +19,10 @@ python3Packages, }: -stdenv.mkDerivation (finalAttrs:{ +stdenv.mkDerivation (finalAttrs: { pname = "libmamba"; version = "2.0.4"; + src = fetchFromGitHub { owner = "mamba-org"; repo = "mamba"; diff --git a/pkgs/development/python-modules/libmambapy/default.nix b/pkgs/development/python-modules/libmambapy/default.nix index 40133e8d70791..aa7329649ce5a 100644 --- a/pkgs/development/python-modules/libmambapy/default.nix +++ b/pkgs/development/python-modules/libmambapy/default.nix @@ -8,6 +8,7 @@ libmamba, pybind11, setuptools, + scikit-build, fmt, spdlog, tl-expected, @@ -20,36 +21,41 @@ bzip2, wheel, }: + buildPythonPackage rec { pname = "libmambapy"; - version = "2024.09.25"; pyproject = true; - src = fetchFromGitHub { - owner = "mamba-org"; - repo = "mamba"; - rev = "refs/tags/${version}"; - hash = "sha256-65XyIlIiUxLGoj11p9fNjauknlVyHPmaTK3LxY+XRV4="; - }; + inherit (libmamba) version src; nativeBuildInputs = [ cmake ninja ]; + env = { + NIX_CFLAGS_COMPILE = toString [ + "-Wno-error=deprecated-declarations" + ]; + }; + buildInputs = [ (libmamba.override { python3Packages = pythonPackages; }) - pybind11 - fmt + curl + zstd + bzip2 spdlog + fmt tl-expected nlohmann_json yaml-cpp reproc libsolv - curl - zstd - bzip2 + ]; + + dependencies = [ + scikit-build + pybind11 ]; build-system = [ @@ -77,7 +83,6 @@ buildPythonPackage rec { pypaBuildPhase ''; - pythonImportsCheck = [ "libmambapy" "libmambapy.bindings" From ef1796b54ccf332e5857012497df6ffceecba337 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Sun, 8 Dec 2024 15:35:59 +0800 Subject: [PATCH 3/3] python312Packages.conda-libmamba-solver: 24.9.0 -> 24.11.1 --- .../python-modules/conda-libmamba-solver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/conda-libmamba-solver/default.nix b/pkgs/development/python-modules/conda-libmamba-solver/default.nix index eb4a1515e026f..ba54cf93a76c7 100644 --- a/pkgs/development/python-modules/conda-libmamba-solver/default.nix +++ b/pkgs/development/python-modules/conda-libmamba-solver/default.nix @@ -9,7 +9,7 @@ }: buildPythonPackage rec { pname = "conda-libmamba-solver"; - version = "24.9.0"; + version = "24.11.1"; pyproject = true; src = fetchFromGitHub { @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "conda"; repo = "conda-libmamba-solver"; rev = "refs/tags/${version}"; - hash = "sha256-hHuuRMx9PQ3mMdxpSRTtg81xeq2XLmxhz1/gtnq54qg="; + hash = "sha256-lIpMzm3wjkugMDwqmVFXDKVJyX/SdzFG5jelZRys8PQ="; };