diff --git a/pkgs/by-name/li/libmamba/package.nix b/pkgs/by-name/li/libmamba/package.nix index 3b235a23135e..ce83193ca3ec 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 40133e8d7079..aa7329649ce5 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"