commit cef5334b0b3676c41a37cd57847dd77d49fd6871 · pyrox.dev/nixpkgs

+19 -7

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

···

       7
       7
        
         gtest,

     

       8
       8
        
         glm,

     

       9
       9
        
         tbb_2021,

     

       10
       10
       +
         python3Packages,

     

       10
       11
        
       }:

     

       11
       12
        
       

     

       12
       13
        
       stdenv.mkDerivation (finalAttrs: {

     

       13
       14
        
         pname = "manifold";

     

       14
       14
       -
         version = "3.1.1";

     

       15
       15
       +
         version = "3.2.0";

     

       15
       16
        
       

     

       16
       17
        
         src = fetchFromGitHub {

     

       17
       18
        
           owner = "elalish";

     

       18
       19
        
           repo = "manifold";

     

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

     

       20
       20
       -
           hash = "sha256-dCCTjWRjXSyuEDxGI9ZS2UTmLdZVSmDOmHFnhox3N+4=";

     

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

     

       21
       21
       +
           hash = "sha256-tcEjgOU90tYnlZDedHJvnqWFDDtXGx64G80wnWz4lBI=";

     

       21
       22
        
         };

     

       22
       23
        
       

     

       23
       24
        
         nativeBuildInputs = [ cmake ];

     
···

       41
       42
        
           test/manifold_test --gtest_filter=-CrossSection.RoundOffset

     

       42
       43
        
         '';

     

       43
       44
        
       

     

       45
       45
       +
         passthru = {

     

       46
       46
       +
           tbb = tbb_2021;

     

       47
       47
       +
           tests = {

     

       48
       48
       +
             python = python3Packages.manifold3d;

     

       49
       49
       +
           };

     

       50
       50
       +
         };

     

       51
       51
       +
       

     

       44
       52
        
         meta = {

     

       45
       53
        
           description = "Geometry library for topological robustness";

     

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

     

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

     

       47
       56
        
           license = lib.licenses.asl20;

     

       48
       48
       -
           maintainers = with lib.maintainers; [

     

       49
       49
       -
             hzeller

     

       50
       50
       -
             pca006132

     

       51
       51
       -
           ];

     

       57
       57
       +
           maintainers =

     

       58
       58
       +
             with lib.maintainers;

     

       59
       59
       +
             [

     

       60
       60
       +
               hzeller

     

       61
       61
       +
               pca006132

     

       62
       62
       +
             ]

     

       63
       63
       +
             ++ python3Packages.manifold3d.meta.maintainers;

     

       52
       64
        
           platforms = lib.platforms.unix;

     

       53
       65
        
         };

     

       54
       66
        
       })

+8 -12

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

···

       4
       4
        
         python,

     

       5
       5
        
         fetchFromGitHub,

     

       6
       6
        
         scikit-build-core,

     

       7
       7
       +
         manifold,

     

       7
       8
        
         cmake,

     

       8
       9
        
         ninja,

     

       9
       10
        
         nanobind,

     
···

       17
       18
        
       

     

       18
       19
        
       buildPythonPackage rec {

     

       19
       20
        
         pname = "manifold3d";

     

       20
       20
       -
         version = "3.1.1";

     

       21
       21
       +
         inherit (manifold) version src;

     

       21
       22
        
         pyproject = true;

     

       22
       22
       -
       

     

       23
       23
       -
         src = fetchFromGitHub {

     

       24
       24
       -
           owner = "elalish";

     

       25
       25
       -
           repo = "manifold";

     

       26
       26
       -
           tag = "v${version}";

     

       27
       27
       -
           hash = "sha256-dCCTjWRjXSyuEDxGI9ZS2UTmLdZVSmDOmHFnhox3N+4=";

     

       28
       28
       -
         };

     

       29
       23
        
       

     

       30
       24
        
         dontUseCmakeConfigure = true;

     

       31
       25
        
       

     
···

       60
       54
        
         ];

     

       61
       55
        
       

     

       62
       56
        
         meta = {

     

       63
       63
       -
           description = "Geometry library for topological robustness";

     

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

     

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

     

       66
       66
       -
           license = lib.licenses.asl20;

     

       57
       57
       +
           inherit (manifold.meta)

     

       58
       58
       +
             homepage

     

       59
       59
       +
             changelog

     

       60
       60
       +
             description

     

       61
       61
       +
             license

     

       62
       62
       +
             ;

     

       67
       63
        
           maintainers = with lib.maintainers; [

     

       68
       64
        
             pbsds

     

       69
       65
        
             pca006132

+3 -1

pkgs/top-level/python-packages.nix

···

       8780
       8780
        
           callPackage ../development/python-modules/marionette-harness/manifestparser.nix

     

       8781
       8781
        
             { };

     

       8782
       8782
        
       

     

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

     

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

     

       8784
       8784
       +
           inherit (pkgs.manifold.passthru) tbb;

     

       8785
       8785
       +
         };

     

       8784
       8786
        
       

     

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

     

       8786
       8788