Unverified Commit dbb70a88 authored by dotlambda's avatar dotlambda Committed by GitHub
Browse files

libmamba: 2.3.2 -> 2.3.3 (#457968)

parents 671b6a3f df561e71

pkgs/by-name/li/libmamba/package.nix

+3 −2
Original line number Diff line number Diff line
@@ -21,13 +21,13 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "libmamba";

  version = "2.3.2";

  version = "2.3.3";



  src = fetchFromGitHub {

    owner = "mamba-org";

    repo = "mamba";

    tag = finalAttrs.version;

    hash = "sha256-344CRyIIrIFrDFbdxdGH7iOidoDhfovd3EySXlOF+4M=";

    hash = "sha256-a1lumBYNEvKVu92JmnhvUvZFsRXy+n1bu6jKOg4pDM0=";

  };



  nativeBuildInputs = [
@@ -58,6 +58,7 @@ stdenv.mkDerivation (finalAttrs: { 
  passthru.updateScript = nix-update-script { };



  meta = {

    changelog = "https://github.com/mamba-org/mamba/blob/${finalAttrs.src.tag}/CHANGELOG.md";

    description = "Library for the fast Cross-Platform Package Manager";

    homepage = "https://github.com/mamba-org/mamba";

    license = lib.licenses.bsd3;

pkgs/development/python-modules/libmambapy/default.nix

+9 −40
Original line number Diff line number Diff line
@@ -6,8 +6,7 @@ 
  ninja,

  libmamba,

  pybind11,

  setuptools,

  scikit-build,

  scikit-build-core,

  fmt,

  spdlog,

  tl-expected,
@@ -18,25 +17,24 @@ 
  curl,

  zstd,

  bzip2,

  wheel,

}:



buildPythonPackage {

buildPythonPackage rec {

  pname = "libmambapy";

  pyproject = true;



  inherit (libmamba) version src;



  nativeBuildInputs = [

  sourceRoot = "${src.name}/libmambapy";



  build-system = [

    cmake

    ninja

    pybind11

    scikit-build-core

  ];



  env = {

    NIX_CFLAGS_COMPILE = toString [

      "-Wno-error=deprecated-declarations"

    ];

  };

  dontUseCmakeConfigure = true;



  buildInputs = [

    (libmamba.override { python3 = python; })
@@ -52,42 +50,13 @@ buildPythonPackage { 
    libsolv

  ];



  dependencies = [

    scikit-build

    pybind11

  ];



  build-system = [

    setuptools

    wheel

  ];



  # patch needed to fix setuptools errors

  # see these for reference

  # https://stackoverflow.com/questions/72294299/multiple-top-level-packages-discovered-in-a-flat-layout

  # https://github.com/pypa/setuptools/issues/3197#issuecomment-1078770109

  postPatch = ''

    substituteInPlace libmambapy/setup.py --replace-warn  "setuptools.setup()" "setuptools.setup(py_modules=[])"

  '';



  cmakeFlags = [

    "-GNinja"

    (lib.cmakeBool "BUILD_LIBMAMBAPY" true)

  ];



  buildPhase = ''

    ninjaBuildPhase

    cp -r libmambapy ../libmambapy

    cd ../libmambapy

    pypaBuildPhase

  '';



  pythonImportsCheck = [

    "libmambapy"

    "libmambapy.bindings"

  ];



  meta = {

    changelog = "https://github.com/mamba-org/mamba/blob/${src.tag}/libmambapy/CHANGELOG.md";

    description = "Python library for the fast Cross-Platform Package Manager";

    homepage = "https://github.com/mamba-org/mamba";

    license = lib.licenses.bsd3;