Unverified Commit cef5334b authored by Peder Bergebakken Sundt's avatar Peder Bergebakken Sundt Committed by GitHub
Browse files

manifold: 3.1.1 -> 3.2.0 (#425590)

parents c8410779 acd5e460

pkgs/by-name/ma/manifold/package.nix

+19 −7
Original line number Diff line number Diff line
@@ -7,17 +7,18 @@ 
  gtest,

  glm,

  tbb_2021,

  python3Packages,

}:



stdenv.mkDerivation (finalAttrs: {

  pname = "manifold";

  version = "3.1.1";

  version = "3.2.0";



  src = fetchFromGitHub {

    owner = "elalish";

    repo = "manifold";

    rev = "v${finalAttrs.version}";

    hash = "sha256-dCCTjWRjXSyuEDxGI9ZS2UTmLdZVSmDOmHFnhox3N+4=";

    tag = "v${finalAttrs.version}";

    hash = "sha256-tcEjgOU90tYnlZDedHJvnqWFDDtXGx64G80wnWz4lBI=";

  };



  nativeBuildInputs = [ cmake ];
@@ -41,14 +42,25 @@ stdenv.mkDerivation (finalAttrs: { 
    test/manifold_test --gtest_filter=-CrossSection.RoundOffset

  '';



  passthru = {

    tbb = tbb_2021;

    tests = {

      python = python3Packages.manifold3d;

    };

  };



  meta = {

    description = "Geometry library for topological robustness";

    homepage = "https://github.com/elalish/manifold";

    changelog = "https://github.com/elalish/manifold/releases/tag/${finalAttrs.src.tag}";

    license = lib.licenses.asl20;

    maintainers = with lib.maintainers; [

    maintainers =

      with lib.maintainers;

      [

        hzeller

        pca006132

    ];

      ]

      ++ python3Packages.manifold3d.meta.maintainers;

    platforms = lib.platforms.unix;

  };

})

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

+8 −12
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
  python,

  fetchFromGitHub,

  scikit-build-core,

  manifold,

  cmake,

  ninja,

  nanobind,
@@ -17,16 +18,9 @@ 


buildPythonPackage rec {

  pname = "manifold3d";

  version = "3.1.1";

  inherit (manifold) version src;

  pyproject = true;



  src = fetchFromGitHub {

    owner = "elalish";

    repo = "manifold";

    tag = "v${version}";

    hash = "sha256-dCCTjWRjXSyuEDxGI9ZS2UTmLdZVSmDOmHFnhox3N+4=";

  };



  dontUseCmakeConfigure = true;



  build-system = [
@@ -60,10 +54,12 @@ buildPythonPackage rec { 
  ];



  meta = {

    description = "Geometry library for topological robustness";

    homepage = "https://github.com/elalish/manifold";

    changelog = "https://github.com/elalish/manifold/releases/tag/${src.tag}";

    license = lib.licenses.asl20;

    inherit (manifold.meta)

      homepage

      changelog

      description

      license

      ;

    maintainers = with lib.maintainers; [

      pbsds

      pca006132

pkgs/top-level/python-packages.nix

+3 −1
Original line number Diff line number Diff line
@@ -8780,7 +8780,9 @@ self: super: with self; { 
    callPackage ../development/python-modules/marionette-harness/manifestparser.nix

      { };













  manifold3d = callPackage ../development/python-modules/manifold3d { };













  manifold3d = callPackage ../development/python-modules/manifold3d {













    inherit (pkgs.manifold.passthru) tbb;













  };





























  manim = callPackage ../development/python-modules/manim { };