commit 7c1068b08c64fe37f9e14ede545a7e98c6a6a4bf · pyrox.dev/nixpkgs

+1 -1

pkgs/development/tools/poetry2nix/poetry2nix/default.nix

···

       5
       5
        
       }:

     

       6
       6
        
       let

     

       7
       7
        
         # Poetry2nix version

     

       8
       8
       -
         version = "1.28.0";

     

       8
       8
       +
         version = "1.29.0";

     

       9
       9
        
       

     

       10
       10
        
         inherit (poetryLib) isCompatible readTOML moduleName;

     

       11
       11

+31 -35

pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix

···

       3
       3
        
       , makeSetupHook

     

       4
       4
        
       , wheel

     

       5
       5
        
       , pip

     

       6
       6
       +
       , pkgs

     

       6
       7
        
       }:

     

       7
       8
        
       let

     

       8
       9
        
         callPackage = python.pythonForBuild.pkgs.callPackage;

     

       9
       10
        
         pythonInterpreter = python.pythonForBuild.interpreter;

     

       10
       11
        
         pythonSitePackages = python.sitePackages;

     

       12
       12
       +
       

     

       13
       13
       +
         nonOverlayedPython = pkgs.python3.pythonForBuild.withPackages (ps: [ ps.tomlkit ]);

     

       14
       14
       +
         makeRemoveSpecialDependenciesHook = { fields, kind }:

     

       15
       15
       +
           nonOverlayedPython.pkgs.callPackage

     

       16
       16
       +
             (

     

       17
       17
       +
               {}:

     

       18
       18
       +
               makeSetupHook

     

       19
       19
       +
                 {

     

       20
       20
       +
                   name = "remove-path-dependencies.sh";

     

       21
       21
       +
                   deps = [ ];

     

       22
       22
       +
                   substitutions = {

     

       23
       23
       +
                     # NOTE: We have to use a non-overlayed Python here because otherwise we run into an infinite recursion

     

       24
       24
       +
                     # because building of tomlkit and its dependencies also use these hooks.

     

       25
       25
       +
                     pythonPath = nonOverlayedPython.pkgs.makePythonPath [ nonOverlayedPython ];

     

       26
       26
       +
                     pythonInterpreter = nonOverlayedPython.interpreter;

     

       27
       27
       +
                     pyprojectPatchScript = "${./pyproject-without-special-deps.py}";

     

       28
       28
       +
                     fields = fields;

     

       29
       29
       +
                     kind = kind;

     

       30
       30
       +
                   };

     

       31
       31
       +
                 } ./remove-special-dependencies.sh

     

       32
       32
       +
             )

     

       33
       33
       +
             { };

     

       11
       34
        
       in

     

       12
       35
        
       {

     

       36
       36
       +
         removePathDependenciesHook = makeRemoveSpecialDependenciesHook {

     

       37
       37
       +
           fields = [ "path" ];

     

       38
       38
       +
           kind = "path";

     

       39
       39
       +
         };

     

       13
       40
        
       

     

       14
       14
       -
         removePathDependenciesHook = callPackage

     

       15
       15
       -
           (

     

       16
       16
       -
             {}:

     

       17
       17
       -
             makeSetupHook

     

       18
       18
       -
               {

     

       19
       19
       -
                 name = "remove-path-dependencies.sh";

     

       20
       20
       -
                 deps = [ ];

     

       21
       21
       -
                 substitutions = {

     

       22
       22
       -
                   inherit pythonInterpreter;

     

       23
       23
       -
                   yj = "${buildPackages.yj}/bin/yj";

     

       24
       24
       -
                   pyprojectPatchScript = "${./pyproject-without-special-deps.py}";

     

       25
       25
       -
                   fields = [ "path" ];

     

       26
       26
       -
                   kind = "path";

     

       27
       27
       -
                 };

     

       28
       28
       -
               } ./remove-special-dependencies.sh

     

       29
       29
       -
           )

     

       30
       30
       -
           { };

     

       41
       41
       +
         removeGitDependenciesHook = makeRemoveSpecialDependenciesHook {

     

       42
       42
       +
           fields = [ "git" "branch" "rev" "tag" ];

     

       43
       43
       +
           kind = "git";

     

       44
       44
       +
         };

     

       31
       45
        
       

     

       32
       32
       -
         removeGitDependenciesHook = callPackage

     

       33
       33
       -
           ({}:

     

       34
       34
       -
             makeSetupHook

     

       35
       35
       -
               {

     

       36
       36
       -
                 name = "remove-git-dependencies.sh";

     

       37
       37
       -
                 deps = [ ];

     

       38
       38
       -
                 substitutions = {

     

       39
       39
       -
                   inherit pythonInterpreter;

     

       40
       40
       -
                   yj = "${buildPackages.yj}/bin/yj";

     

       41
       41
       -
                   pyprojectPatchScript = "${./pyproject-without-special-deps.py}";

     

       42
       42
       -
                   fields = [ "git" "branch" "rev" "tag" ];

     

       43
       43
       -
                   kind = "git";

     

       44
       44
       -
                 };

     

       45
       45
       -
               } ./remove-special-dependencies.sh

     

       46
       46
       -
           )

     

       47
       47
       -
           { };

     

       48
       46
        
       

     

       49
       47
        
         pipBuildHook = callPackage

     

       50
       48
        
           (

     
···

       89
       87
        
               } ./wheel-unpack-hook.sh

     

       90
       88
        
           )

     

       91
       89
        
           { };

     

       92
       92
       -
       

     

       93
       93
       -
       

     

       94
       90
        
       }

+8 -12

pkgs/development/tools/poetry2nix/poetry2nix/hooks/pyproject-without-special-deps.py

···

       1
       1
        
       #!/usr/bin/env python

     

       2
       2
       -
       # Patch out special dependencies (git and path) from a pyproject.json file

     

       2
       2
       +
       # Patch out special dependencies (git and path) from a pyproject.toml file

     

       3
       3
        
       

     

       4
       4
        
       import argparse

     

       5
       5
       -
       import json

     

       6
       5
        
       import sys

     

       7
       6
        
       

     

       7
       7
       +
       import tomlkit

     

       8
       8
       +
       

     

       8
       9
        
       

     

       9
       10
        
       def main(input, output, fields_to_remove):

     

       10
       10
       -
           data = json.load(input)

     

       11
       11
       +
           data = tomlkit.loads(input.read())

     

       11
       12
        
       

     

       12
       13
        
           try:

     

       13
       14
        
               deps = data["tool"]["poetry"]["dependencies"]

     
···

       22
       23
        
                       if any_removed:

     

       23
       24
        
                           dep["version"] = "*"

     

       24
       25
        
       

     

       25
       25
       -
           # Set ensure_ascii to False because TOML is valid UTF-8 so text that can't

     

       26
       26
       -
           # be represented in ASCII is perfectly legitimate

     

       27
       27
       -
           # HACK: Setting ensure_asscii to False breaks Python2 for some dependencies (like cachy==0.3.0)

     

       28
       28
       -
           json.dump(

     

       29
       29
       -
               data, output, separators=(",", ":"), ensure_ascii=sys.version_info.major < 3

     

       30
       30
       -
           )

     

       26
       26
       +
           output.write(tomlkit.dumps(data))

     

       31
       27
        
       

     

       32
       28
        
       

     

       33
       29
        
       if __name__ == "__main__":

     
···

       37
       33
        
               "--input",

     

       38
       34
        
               type=argparse.FileType("r"),

     

       39
       35
        
               default=sys.stdin,

     

       40
       40
       -
               help="Location from which to read input JSON",

     

       36
       36
       +
               help="Location from which to read input TOML",

     

       41
       37
        
           )

     

       42
       38
        
           p.add_argument(

     

       43
       39
        
               "-o",

     

       44
       40
        
               "--output",

     

       45
       41
        
               type=argparse.FileType("w"),

     

       46
       42
        
               default=sys.stdout,

     

       47
       47
       -
               help="Location to write output JSON",

     

       43
       43
       +
               help="Location to write output TOML",

     

       48
       44
        
           )

     

       49
       45
        
           p.add_argument(

     

       50
       46
        
               "-f",

     

       51
       47
        
               "--fields-to-remove",

     

       52
       48
        
               nargs="+",

     

       53
       53
       -
               help="The fields to remove from the dependency's JSON",

     

       49
       49
       +
               help="The fields to remove from the dependency's TOML",

     

       54
       50
        
           )

     

       55
       51
        
       

     

       56
       52
        
           args = p.parse_args()

+10 -7

pkgs/development/tools/poetry2nix/poetry2nix/hooks/remove-special-dependencies.sh

···

       1
       1
        
       remove-@kind@-dependencies-hook() {

     

       2
       2
       +
           # Tell poetry not to resolve special dependencies. Any version is fine!

     

       3
       3
       +
       

     

       2
       4
        
           if ! test -f pyproject.toml; then

     

       3
       5
        
               return

     

       4
       6
        
           fi

     

       5
       7
        
       

     

       6
       8
        
           echo "Removing @kind@ dependencies"

     

       7
       9
        
       

     

       8
       8
       -
           # Tell poetry not to resolve special dependencies. Any version is fine!

     

       9
       9
       -
           @yj@ -tj < pyproject.toml | \

     

       10
       10
       -
               @pythonInterpreter@ \

     

       11
       11
       -
               @pyprojectPatchScript@ \

     

       12
       12
       -
               --fields-to-remove @fields@ > pyproject.json

     

       13
       13
       -
           @yj@ -jt < pyproject.json > pyproject.toml

     

       10
       10
       +
           # NOTE: We have to reset PYTHONPATH to avoid having propagatedBuildInputs

     

       11
       11
       +
           # from the currently building derivation leaking into our unrelated Python

     

       12
       12
       +
           # environment.

     

       13
       13
       +
           PYTHONPATH=@pythonPath@ \

     

       14
       14
       +
           @pythonInterpreter@ \

     

       15
       15
       +
           @pyprojectPatchScript@ \

     

       16
       16
       +
             --fields-to-remove @fields@ < pyproject.toml > pyproject.formatted.toml

     

       14
       17
        
       

     

       15
       15
       -
           rm pyproject.json

     

       18
       18
       +
           mv pyproject.formatted.toml pyproject.toml

     

       16
       19
        
       

     

       17
       20
        
           echo "Finished removing @kind@ dependencies"

     

       18
       21
        
       }

+63

pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json

···

       50
       50
        
         "aiokafka": [

     

       51
       51
        
           "cython"

     

       52
       52
        
         ],

     

       53
       53
       +
         "aiolimiter": [

     

       54
       54
       +
           "poetry-core"

     

       55
       55
       +
         ],

     

       53
       56
        
         "aiomultiprocess": [

     

       54
       57
        
           "flit-core"

     

       55
       58
        
         ],

     
···

       229
       232
        
           "flit-core",

     

       230
       233
        
           "flitBuildHook"

     

       231
       234
        
         ],

     

       235
       235
       +
         "copier": [

     

       236
       236
       +
           "poetry-core"

     

       237
       237
       +
         ],

     

       232
       238
        
         "cpyparsing": [

     

       233
       239
        
           "cython"

     

       234
       240
        
         ],

     
···

       239
       245
        
           "cython",

     

       240
       246
        
           "poetry-core"

     

       241
       247
        
         ],

     

       248
       248
       +
         "cruft": [

     

       249
       249
       +
           "poetry-core"

     

       250
       250
       +
         ],

     

       242
       251
        
         "cssselect2": [

     

       243
       252
        
           "flit",

     

       244
       253
        
           "flit-core"

     
···

       350
       359
        
         "enumatch": [

     

       351
       360
        
           "poetry"

     

       352
       361
        
         ],

     

       362
       362
       +
         "envs": [

     

       363
       363
       +
           "poetry-core"

     

       364
       364
       +
         ],

     

       353
       365
        
         "exceptiongroup": [

     

       354
       366
        
           "flit-core",

     

       355
       367
        
           "flitBuildHook"

     
···

       364
       376
        
           "poetry"

     

       365
       377
        
         ],

     

       366
       378
        
         "fastavro": [

     

       379
       379
       +
           "cython"

     

       380
       380
       +
         ],

     

       381
       381
       +
         "fastbencode": [

     

       367
       382
        
           "cython"

     

       368
       383
        
         ],

     

       369
       384
        
         "fastdtw": [

     
···

       429
       444
        
         "gensim": [

     

       430
       445
        
           "cython"

     

       431
       446
        
         ],

     

       447
       447
       +
         "gidgethub": [

     

       448
       448
       +
           "flitBuildHook"

     

       449
       449
       +
         ],

     

       432
       450
        
         "glances-api": [

     

       433
       451
        
           "poetry-core"

     

       434
       452
        
         ],

     
···

       479
       497
        
         ],

     

       480
       498
        
         "hashids": [

     

       481
       499
        
           "flit-core"

     

       500
       500
       +
         ],

     

       501
       501
       +
         "hatch-vcs": [

     

       502
       502
       +
           "hatchling"

     

       482
       503
        
         ],

     

       483
       504
        
         "hdate": [

     

       484
       505
        
           "poetry-core"

     
···

       711
       732
        
         "monosat": [

     

       712
       733
        
           "cython"

     

       713
       734
        
         ],

     

       735
       735
       +
         "more-itertools": [

     

       736
       736
       +
           "flit-core"

     

       737
       737
       +
         ],

     

       714
       738
        
         "motioneye-client": [

     

       715
       739
        
           "poetry-core"

     

       716
       740
        
         ],

     
···

       720
       744
        
         "msgpack-numpy": [

     

       721
       745
        
           "cython"

     

       722
       746
        
         ],

     

       747
       747
       +
         "msgpack-types": [

     

       748
       748
       +
           "poetry"

     

       749
       749
       +
         ],

     

       723
       750
        
         "msoffcrypto-tool": [

     

       724
       751
        
           "poetry-core"

     

       725
       752
        
         ],

     
···

       734
       761
        
         ],

     

       735
       762
        
         "mypy-boto3-builder": [

     

       736
       763
        
           "poetry-core"

     

       764
       764
       +
         ],

     

       765
       765
       +
         "myst-parser": [

     

       766
       766
       +
           "flit-core"

     

       737
       767
        
         ],

     

       738
       768
        
         "nats-python": [

     

       739
       769
        
           "poetry-core"

     
···

       807
       837
        
         "openstacksdk": [

     

       808
       838
        
           "pbr"

     

       809
       839
        
         ],

     

       840
       840
       +
         "openstep-plist": [

     

       841
       841
       +
           "cython"

     

       842
       842
       +
         ],

     

       810
       843
        
         "openvino": [

     

       811
       844
        
           "cython"

     

       812
       845
        
         ],

     
···

       889
       922
        
         "pixelmatch": [

     

       890
       923
        
           "poetry-core"

     

       891
       924
        
         ],

     

       925
       925
       +
         "pkgconfig": [

     

       926
       926
       +
           "poetry-core"

     

       927
       927
       +
         ],

     

       892
       928
        
         "poetry": [

     

       893
       929
        
           "poetry-core"

     

       894
       930
        
         ],

     
···

       924
       960
        
         ],

     

       925
       961
        
         "prometheus-fastapi-instrumentator": [

     

       926
       962
        
           "poetry"

     

       963
       963
       +
         ],

     

       964
       964
       +
         "prospector": [

     

       965
       965
       +
           "poetry-core"

     

       966
       966
       +
         ],

     

       967
       967
       +
         "protoletariat": [

     

       968
       968
       +
           "poetry-core"

     

       927
       969
        
         ],

     

       928
       970
        
         "ptyprocess": [

     

       929
       971
        
           "flit-core"

     
···

       1234
       1276
        
         "python-swiftclient": [

     

       1235
       1277
        
           "pbr"

     

       1236
       1278
        
         ],

     

       1279
       1279
       +
         "python-trovo": [

     

       1280
       1280
       +
           "poetry"

     

       1281
       1281
       +
         ],

     

       1237
       1282
        
         "python_openzwave": [

     

       1238
       1283
        
           "cython"

     

       1239
       1284
        
         ],

     
···

       1275
       1320
        
         ],

     

       1276
       1321
        
         "qiskit-terra": [

     

       1277
       1322
        
           "cython"

     

       1323
       1323
       +
         ],

     

       1324
       1324
       +
         "qstylizer": [

     

       1325
       1325
       +
           "pbr"

     

       1278
       1326
        
         ],

     

       1279
       1327
        
         "questionary": [

     

       1280
       1328
        
           "poetry-core"

     
···

       1330
       1378
        
         "rich": [

     

       1331
       1379
        
           "poetry-core"

     

       1332
       1380
        
         ],

     

       1381
       1381
       +
         "rio-tiler": [

     

       1382
       1382
       +
           "flit-core"

     

       1383
       1383
       +
         ],

     

       1333
       1384
        
         "ripser": [

     

       1334
       1385
        
           "cython"

     

       1335
       1386
        
         ],

     
···

       1366
       1417
        
         ],

     

       1367
       1418
        
         "sarif-om": [

     

       1368
       1419
        
           "pbr"

     

       1420
       1420
       +
         ],

     

       1421
       1421
       +
         "sat-search": [

     

       1422
       1422
       +
           "pytest-runner"

     

       1369
       1423
        
         ],

     

       1370
       1424
        
         "scikit-bio": [

     

       1371
       1425
        
           "cython"

     
···

       1429
       1483
        
         ],

     

       1430
       1484
        
         "single-version": [

     

       1431
       1485
        
           "poetry-core"

     

       1486
       1486
       +
         ],

     

       1487
       1487
       +
         "skia-pathops": [

     

       1488
       1488
       +
           "cython"

     

       1432
       1489
        
         ],

     

       1433
       1490
        
         "slowapi": [

     

       1434
       1491
        
           "poetry-core"

     
···

       1602
       1659
        
         "toggl-cli": [

     

       1603
       1660
        
           "pbr"

     

       1604
       1661
        
         ],

     

       1662
       1662
       +
         "toml-cli": [

     

       1663
       1663
       +
           "poetry"

     

       1664
       1664
       +
         ],

     

       1605
       1665
        
         "toml-sort": [

     

       1606
       1666
        
           "poetry"

     

       1607
       1667
        
         ],

     
···

       1619
       1679
        
         ],

     

       1620
       1680
        
         "traceback2": [

     

       1621
       1681
        
           "pbr"

     

       1682
       1682
       +
         ],

     

       1683
       1683
       +
         "traitlets": [

     

       1684
       1684
       +
           "flit-core"

     

       1622
       1685
        
         ],

     

       1623
       1686
        
         "transmission-rpc": [

     

       1624
       1687
        
           "poetry-core"

+74 -107

pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix

···

       74
       74
        
             inherit (pkgs) buildPackages;

     

       75
       75
        
             pyBuildPackages = self.python.pythonForBuild.pkgs;

     

       76
       76
        
       

     

       77
       77
       +
             selectQt5 = version:

     

       78
       78
       +
               let

     

       79
       79
       +
                 selector = builtins.concatStringsSep "" (lib.take 2 (builtins.splitVersion version));

     

       80
       80
       +
               in

     

       81
       81
       +
                 pkgs."qt${selector}" or pkgs.qt5;

     

       82
       82
       +
       

     

       77
       83
        
           in

     

       78
       84
        
       

     

       79
       85
        
           {

     
···

       287
       293
        
                   "36.0.0" = "sha256-Y6TuW7AryVgSvZ6G8WNoDIvi+0tvx8ZlEYF5qB0jfNk=";

     

       288
       294
        
                   "36.0.1" = "sha256-kozYXkqt1Wpqyo9GYCwN08J+zV92ZWFJY/f+rulxmeQ=";

     

       289
       295
        
                   "36.0.2" = "1a0ni1a3dbv2dvh6gx2i54z8v5j9m6asqg97kkv7gqb1ivihsbp8";

     

       296
       296
       +
                   "37.0.2" = "sha256-qvrxvneoBXjP96AnUPyrtfmCnZo+IriHR5HbtWQ5Gk8=";

     

       290
       297
        
                 }.${version} or null;

     

       291
       298
        
                 sha256 = getCargoHash super.cryptography.version;

     

       292
       299
        
                 scrypto =

     
···

       517
       524
        
               }

     

       518
       525
        
             );

     

       519
       526
        
       

     

       527
       527
       +
             file-magic = super.file-magic.overridePythonAttrs (

     

       528
       528
       +
               old: {

     

       529
       529
       +
                 postPatch = ''

     

       530
       530
       +
                   substituteInPlace magic.py --replace "find_library('magic')" "'${pkgs.file}/lib/libmagic${pkgs.stdenv.hostPlatform.extensions.sharedLibrary}'"

     

       531
       531
       +
                 '';

     

       532
       532
       +
               }

     

       533
       533
       +
             );

     

       534
       534
       +
       

     

       520
       535
        
             fiona = super.fiona.overridePythonAttrs (

     

       521
       536
        
               old: {

     

       522
       537
        
                 buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.gdal_2 ];

     
···

       732
       747
        
                 buildInputs = (old.buildInputs or [ ]) ++ [

     

       733
       748
        
                   self.toml

     

       734
       749
        
                 ];

     

       750
       750
       +
               }

     

       751
       751
       +
             );

     

       752
       752
       +
       

     

       753
       753
       +
             jinja2-ansible-filters = super.jinja2-ansible-filters.overridePythonAttrs (

     

       754
       754
       +
               old: {

     

       755
       755
       +
                 preBuild = (old.preBuild or "") + ''

     

       756
       756
       +
                   echo "${old.version}" > VERSION

     

       757
       757
       +
                 '';

     

       735
       758
        
               }

     

       736
       759
        
             );

     

       737
       760
        
       

     
···

       1056
       1079
        
       

     

       1057
       1080
        
             mypy = super.mypy.overridePythonAttrs (

     

       1058
       1081
        
               old: {

     

       1082
       1082
       +
                 buildInputs = (old.buildInputs or [ ]) ++ [

     

       1083
       1083
       +
                   self.types-typed-ast

     

       1084
       1084
       +
                 ];

     

       1085
       1085
       +
                 # Compile mypy with mypyc, which makes mypy about 4 times faster. The compiled

     

       1086
       1086
       +
                 # version is also the default in the wheels on Pypi that include binaries.

     

       1087
       1087
       +
                 # is64bit: unfortunately the build would exhaust all possible memory on i686-linux.

     

       1088
       1088
       +
                 MYPY_USE_MYPYC = stdenv.buildPlatform.is64bit;

     

       1089
       1089
       +
       

     

       1090
       1090
       +
                 # when testing reduce optimisation level to drastically reduce build time

     

       1091
       1091
       +
                 # (default is 3)

     

       1092
       1092
       +
                 # MYPYC_OPT_LEVEL = 1;

     

       1093
       1093
       +
               } // lib.optionalAttrs (old.format != "wheel") {

     

       1059
       1094
        
                 # FIXME: Remove patch after upstream has decided the proper solution.

     

       1060
       1095
        
                 #        https://github.com/python/mypy/pull/11143

     

       1061
       1096
        
                 patches = (old.patches or [ ]) ++ lib.optionals ((lib.strings.versionAtLeast old.version "0.900") && lib.strings.versionOlder old.version "0.940") [

     
···

       1069
       1104
        
                     sha256 = "sha256-waIZ+m3tfvYE4HJ8kL6rN/C4fMjvLEe9UoPbt9mHWIM=";

     

       1070
       1105
        
                   })

     

       1071
       1106
        
                 ];

     

       1072
       1072
       -
                 buildInputs = (old.buildInputs or [ ]) ++ [

     

       1073
       1073
       -
                   self.types-typed-ast

     

       1074
       1074
       -
                 ];

     

       1075
       1075
       -
                 # Compile mypy with mypyc, which makes mypy about 4 times faster. The compiled

     

       1076
       1076
       -
                 # version is also the default in the wheels on Pypi that include binaries.

     

       1077
       1077
       -
                 # is64bit: unfortunately the build would exhaust all possible memory on i686-linux.

     

       1078
       1078
       -
                 MYPY_USE_MYPYC = stdenv.buildPlatform.is64bit;

     

       1079
       1079
       -
       

     

       1080
       1080
       -
                 # when testing reduce optimisation level to drastically reduce build time

     

       1081
       1081
       -
                 # (default is 3)

     

       1082
       1082
       -
                 # MYPYC_OPT_LEVEL = 1;

     

       1083
       1107
        
               }

     

       1084
       1108
        
             );

     

       1085
       1109
        
       

     
···

       1566
       1590
        
       

     

       1567
       1591
        
             pyqt5 =

     

       1568
       1592
        
               let

     

       1569
       1569
       -
                 drv = super.pyqt5;

     

       1570
       1570
       -
                 withConnectivity = drv.passthru.args.withConnectivity or false;

     

       1571
       1571
       -
                 withMultimedia = drv.passthru.args.withMultimedia or false;

     

       1572
       1572
       -
                 withWebKit = drv.passthru.args.withWebKit or false;

     

       1573
       1573
       -
                 withWebSockets = drv.passthru.args.withWebSockets or false;

     

       1593
       1593
       +
                 qt5 = selectQt5 super.pyqt5.version;

     

       1574
       1594
        
               in

     

       1575
       1595
        
               super.pyqt5.overridePythonAttrs (

     

       1576
       1596
        
                 old: {

     

       1577
       1577
       -
                   format = "other";

     

       1578
       1578
       -
       

     

       1597
       1597
       +
                   dontConfigure = true;

     

       1579
       1598
        
                   dontWrapQtApps = true;

     

       1580
       1580
       -
       

     

       1581
       1581
       -
                   nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [

     

       1582
       1582
       -
                     pkg-config

     

       1583
       1583
       -
                     pkgs.qt5.qmake

     

       1584
       1584
       -
                     pkgs.xorg.lndir

     

       1585
       1585
       -
                     pkgs.qt5.qtbase

     

       1586
       1586
       -
                     pkgs.qt5.qtsvg

     

       1587
       1587
       -
                     pkgs.qt5.qtdeclarative

     

       1588
       1588
       -
                     pkgs.qt5.qtwebchannel

     

       1589
       1589
       -
                     pkgs.qt5.qt3d

     

       1590
       1590
       -
                     # self.pyqt5-sip

     

       1599
       1599
       +
                   nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [

     

       1600
       1600
       +
                     self.pyqt-builder

     

       1591
       1601
        
                     self.sip

     

       1592
       1592
       -
                   ]

     

       1593
       1593
       -
                     ++ lib.optional withConnectivity pkgs.qt5.qtconnectivity

     

       1594
       1594
       -
                     ++ lib.optional withMultimedia pkgs.qt5.qtmultimedia

     

       1595
       1595
       -
                     ++ lib.optional withWebKit pkgs.qt5.qtwebkit

     

       1596
       1596
       -
                     ++ lib.optional withWebSockets pkgs.qt5.qtwebsockets

     

       1597
       1597
       -
                   ;

     

       1602
       1602
       +
                     qt5.full

     

       1603
       1603
       +
                   ];

     

       1604
       1604
       +
                 }

     

       1605
       1605
       +
               );

     

       1598
       1606
        
       

     

       1599
       1599
       -
                   buildInputs = (old.buildInputs or [ ]) ++ [

     

       1600
       1600
       -
                     pkgs.dbus

     

       1601
       1601
       -
                     pkgs.qt5.qtbase

     

       1602
       1602
       -
                     pkgs.qt5.qtsvg

     

       1603
       1603
       -
                     pkgs.qt5.qtdeclarative

     

       1604
       1604
       -
                     self.sip

     

       1605
       1605
       -
                   ]

     

       1606
       1606
       -
                     ++ lib.optional withConnectivity pkgs.qt5.qtconnectivity

     

       1607
       1607
       -
                     ++ lib.optional withWebKit pkgs.qt5.qtwebkit

     

       1608
       1608
       -
                     ++ lib.optional withWebSockets pkgs.qt5.qtwebsockets

     

       1609
       1609
       -
                   ;

     

       1610
       1610
       -
       

     

       1611
       1611
       -
                   # Fix dbus mainloop

     

       1612
       1612
       -
                   patches = pkgs.python3.pkgs.pyqt5.patches or [ ];

     

       1613
       1613
       -
       

     

       1614
       1614
       -
                   configurePhase = ''

     

       1615
       1615
       -
                     runHook preConfigure

     

       1616
       1616
       -
       

     

       1617
       1617
       -
                     export PYTHONPATH=$PYTHONPATH:$out/${self.python.sitePackages}

     

       1618
       1618
       -
       

     

       1619
       1619
       -
                     mkdir -p $out/${self.python.sitePackages}/dbus/mainloop

     

       1620
       1620
       -
                     ${self.python.executable} configure.py  -w \

     

       1621
       1621
       -
                       --confirm-license \

     

       1622
       1622
       -
                       --no-qml-plugin \

     

       1623
       1623
       -
                       --bindir=$out/bin \

     

       1624
       1624
       -
                       --destdir=$out/${self.python.sitePackages} \

     

       1625
       1625
       -
                       --stubsdir=$out/${self.python.sitePackages}/PyQt5 \

     

       1626
       1626
       -
                       --sipdir=$out/share/sip/PyQt5 \

     

       1627
       1627
       -
                       --designer-plugindir=$out/plugins/designer

     

       1628
       1628
       -
       

     

       1629
       1629
       -
                     runHook postConfigure

     

       1630
       1630
       -
                   '';

     

       1631
       1631
       -
       

     

       1632
       1632
       -
                   postInstall = ''

     

       1633
       1633
       -
                     ln -s ${self.pyqt5-sip}/${self.python.sitePackages}/PyQt5/sip.* $out/${self.python.sitePackages}/PyQt5/

     

       1634
       1634
       -
                     for i in $out/bin/*; do

     

       1635
       1635
       -
                       wrapProgram $i --prefix PYTHONPATH : "$PYTHONPATH"

     

       1636
       1636
       -
                     done

     

       1637
       1637
       -
       

     

       1638
       1638
       -
                     # Let's make it a namespace package

     

       1639
       1639
       -
                     cat << EOF > $out/${self.python.sitePackages}/PyQt5/__init__.py

     

       1640
       1640
       -
                     from pkgutil import extend_path

     

       1641
       1641
       -
                     __path__ = extend_path(__path__, __name__)

     

       1642
       1642
       -
                     EOF

     

       1643
       1643
       -
                   '';

     

       1644
       1644
       -
       

     

       1645
       1645
       -
                   installCheckPhase =

     

       1646
       1646
       -
                     let

     

       1647
       1647
       -
                       modules = [

     

       1648
       1648
       -
                         "PyQt5"

     

       1649
       1649
       -
                         "PyQt5.QtCore"

     

       1650
       1650
       -
                         "PyQt5.QtQml"

     

       1651
       1651
       -
                         "PyQt5.QtWidgets"

     

       1652
       1652
       -
                         "PyQt5.QtGui"

     

       1653
       1653
       -
                       ]

     

       1654
       1654
       -
                       ++ lib.optional withWebSockets "PyQt5.QtWebSockets"

     

       1655
       1655
       -
                       ++ lib.optional withWebKit "PyQt5.QtWebKit"

     

       1656
       1656
       -
                       ++ lib.optional withMultimedia "PyQt5.QtMultimedia"

     

       1657
       1657
       -
                       ++ lib.optional withConnectivity "PyQt5.QtConnectivity"

     

       1658
       1658
       -
                       ;

     

       1659
       1659
       -
                       imports = lib.concatMapStrings (module: "import ${module};") modules;

     

       1660
       1660
       -
                     in

     

       1661
       1661
       -
                     ''

     

       1662
       1662
       -
                       echo "Checking whether modules can be imported..."

     

       1663
       1663
       -
                       ${self.python.interpreter} -c "${imports}"

     

       1664
       1664
       -
                     '';

     

       1665
       1665
       -
       

     

       1666
       1666
       -
                   doCheck = true;

     

       1667
       1667
       -
       

     

       1668
       1668
       -
                   enableParallelBuilding = true;

     

       1607
       1607
       +
             pyqt5-qt5 =

     

       1608
       1608
       +
               let

     

       1609
       1609
       +
                 qt5 = selectQt5 super.pyqt5-qt5.version;

     

       1610
       1610
       +
               in

     

       1611
       1611
       +
               super.pyqt5-qt5.overridePythonAttrs (

     

       1612
       1612
       +
                 old: {

     

       1613
       1613
       +
                   dontWrapQtApps = true;

     

       1614
       1614
       +
                   propagatedBuildInputs = old.propagatedBuildInputs or [ ] ++ [

     

       1615
       1615
       +
                     qt5.full

     

       1616
       1616
       +
                     qt5.qtgamepad # As of 2022-05-13 not a port of qt5.full

     

       1617
       1617
       +
                     pkgs.gtk3

     

       1618
       1618
       +
                     pkgs.speechd

     

       1619
       1619
       +
                     pkgs.postgresql

     

       1620
       1620
       +
                     pkgs.unixODBC

     

       1621
       1621
       +
                   ];

     

       1669
       1622
        
                 }

     

       1670
       1623
        
               );

     

       1671
       1624
        
       

     
···

       1681
       1634
        
               old: {

     

       1682
       1635
        
                 # Fixes https://github.com/pytest-dev/pytest/issues/7891

     

       1683
       1636
        
                 postPatch = old.postPatch or "" + ''

     

       1684
       1684
       -
                   sed -i '/\[metadata\]/aversion = ${old.version}' setup.cfg

     

       1637
       1637
       +
                   # sometimes setup.cfg doesn't exist

     

       1638
       1638
       +
                   if [ -f setup.cfg ]; then

     

       1639
       1639
       +
                     sed -i '/\[metadata\]/aversion = ${old.version}' setup.cfg

     

       1640
       1640
       +
                   fi

     

       1685
       1641
        
                 '';

     

       1686
       1642
        
               }

     

       1687
       1643
        
             );

     
···

       1757
       1713
        
                 buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.snappy ];

     

       1758
       1714
        
               }

     

       1759
       1715
        
             );

     

       1716
       1716
       +
       

     

       1717
       1717
       +
             python-twitter = super.python-twitter.overridePythonAttrs (old: {

     

       1718
       1718
       +
               buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ];

     

       1719
       1719
       +
             });

     

       1760
       1720
        
       

     

       1761
       1721
        
             pythran = super.pythran.overridePythonAttrs (old: {

     

       1762
       1722
        
               buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ];

     
···

       1925
       1885
        
             shapely = super.shapely.overridePythonAttrs (

     

       1926
       1886
        
               old: {

     

       1927
       1887
        
                 buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.geos ];

     

       1928
       1928
       -
                 inherit (pkgs.python3.pkgs.shapely) patches GEOS_LIBRARY_PATH;

     

       1888
       1888
       +
                 inherit (pkgs.python3.pkgs.shapely) GEOS_LIBRARY_PATH;

     

       1889
       1889
       +
       

     

       1890
       1890
       +
                 GEOS_LIBC = lib.optionalString (!stdenv.isDarwin) "${stdenv.cc.libc}/lib/libc${stdenv.hostPlatform.extensions.sharedLibrary}.6";

     

       1891
       1891
       +
       

     

       1892
       1892
       +
                 # Fix library paths

     

       1893
       1893
       +
                 postPatch = old.postPatch or "" + ''

     

       1894
       1894
       +
                   ${self.python.pythonForBuild.interpreter} ${./shapely-rewrite.py} shapely/geos.py

     

       1895
       1895
       +
                 '';

     

       1929
       1896
        
               }

     

       1930
       1897
        
             );

     

       1931
       1898

+46

pkgs/development/tools/poetry2nix/poetry2nix/overrides/shapely-rewrite.py

···

       1
       1
       +
       """

     

       2
       2
       +
       Rewrite libc/library path references to Nix store paths

     

       3
       3
       +
       Nixpkgs uses a normal patch for this but we need to be less

     

       4
       4
       +
       sensitive to changes between versions.

     

       5
       5
       +
       """

     

       6
       6
       +
       from textwrap import dedent

     

       7
       7
       +
       import sys

     

       8
       8
       +
       import ast

     

       9
       9
       +
       import os

     

       10
       10
       +
       

     

       11
       11
       +
       

     

       12
       12
       +
       with open(sys.argv[1]) as f:

     

       13
       13
       +
           mod = ast.parse(f.read(), "geos.py")

     

       14
       14
       +
       

     

       15
       15
       +
       

     

       16
       16
       +
       class LibTransformer(ast.NodeTransformer):

     

       17
       17
       +
           _lgeos_replaced = False

     

       18
       18
       +
       

     

       19
       19
       +
           def visit_If(self, node):

     

       20
       20
       +
               if ast.unparse(node).startswith("if sys.platform.startswith('linux')"):

     

       21
       21
       +
                   return ast.parse(

     

       22
       22
       +
                       dedent(

     

       23
       23
       +
                           """

     

       24
       24
       +
                   free = CDLL(%s).free

     

       25
       25
       +
                   free.argtypes = [c_void_p]

     

       26
       26
       +
                   free.restype = None

     

       27
       27
       +
                   """

     

       28
       28
       +
                       )

     

       29
       29
       +
                       % (lambda x: "'" + x + "'" if x else None)(os.environ.get("GEOS_LIBC"))

     

       30
       30
       +
                   )

     

       31
       31
       +
               return node

     

       32
       32
       +
       

     

       33
       33
       +
           def visit_Assign(self, node):

     

       34
       34
       +
               _target = node.targets[0]

     

       35
       35
       +
               if (

     

       36
       36
       +
                   not self._lgeos_replaced

     

       37
       37
       +
                   and isinstance(_target, ast.Name)

     

       38
       38
       +
                   and _target.id == "_lgeos"

     

       39
       39
       +
               ):

     

       40
       40
       +
                   self._lgeos_replaced = True

     

       41
       41
       +
                   return ast.parse("_lgeos = CDLL('%s')" % os.environ["GEOS_LIBRARY_PATH"])

     

       42
       42
       +
               return node

     

       43
       43
       +
       

     

       44
       44
       +
       

     

       45
       45
       +
       with open(sys.argv[1], "w") as f:

     

       46
       46
       +
           f.write(ast.unparse(LibTransformer().visit(mod)))

+3 -1

pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix

···

       23
       23
        
           let

     

       24
       24
        
             entries' = splitString "-" str;

     

       25
       25
        
             # Hack: Remove version "suffixes" like 2.11.4-1

     

       26
       26
       -
             entries = builtins.filter (x: builtins.match "[0-9]" x == null) entries';

     

       26
       26
       +
             # Some wheels have build tag with more than one digit

     

       27
       27
       +
             # like openvino-2022.1.0-7019-cp36-cp36m-manylinux_2_27_x86_64.whl

     

       28
       28
       +
             entries = builtins.filter (x: builtins.match "[0-9]*" x == null) entries';

     

       27
       29
        
             p = removeSuffix ".whl" (builtins.elemAt entries 4);

     

       28
       30
        
           in

     

       29
       31
        
           {