diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
| commit | 99fcaeccb89621dd492203ce1f2d551c06f228ed (patch) | |
| tree | 41cb730ae07383004789779b0f6e11cb3f4642a3 /nixpkgs/pkgs/development/python-modules/worldengine | |
| parent | 59c5f5ac8682acc13bb22bc29c7cf02f7d75f01f (diff) | |
| parent | 75a5ebf473cd60148ba9aec0d219f72e5cf52519 (diff) | |
| download | nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.gz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.bz2 nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.lz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.xz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.zst nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.zip | |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/nixos/modules/config/console.nix nixpkgs/nixos/modules/services/mail/mailman.nix nixpkgs/nixos/modules/services/mail/public-inbox.nix nixpkgs/nixos/modules/services/mail/rss2email.nix nixpkgs/nixos/modules/services/networking/ssh/sshd.nix nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix nixpkgs/pkgs/applications/networking/irc/weechat/default.nix nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/interpreters/python/default.nix nixpkgs/pkgs/development/node-packages/overrides.nix nixpkgs/pkgs/development/tools/b4/default.nix nixpkgs/pkgs/servers/dict/dictd-db.nix nixpkgs/pkgs/servers/mail/public-inbox/default.nix nixpkgs/pkgs/tools/security/pinentry/default.nix nixpkgs/pkgs/tools/text/unoconv/default.nix nixpkgs/pkgs/top-level/all-packages.nix
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules/worldengine')
| -rw-r--r-- | nixpkgs/pkgs/development/python-modules/worldengine/default.nix | 27 |
1 files changed, 20 insertions, 7 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/worldengine/default.nix b/nixpkgs/pkgs/development/python-modules/worldengine/default.nix index fed9a3c9007f..cda6fdb6ebdd 100644 --- a/nixpkgs/pkgs/development/python-modules/worldengine/default.nix +++ b/nixpkgs/pkgs/development/python-modules/worldengine/default.nix @@ -1,14 +1,15 @@ { lib , buildPythonPackage -, isPy27 , fetchFromGitHub +, gdal +, h5py , noise , numpy -, pyplatec , protobuf , purepng -, h5py -, gdal +, pyplatec +, six +, isPy27 , pytestCheckHook }: @@ -34,7 +35,16 @@ buildPythonPackage rec { ln -s ${src-data} worldengine-data ''; - propagatedBuildInputs = [ noise numpy pyplatec protobuf purepng h5py gdal ]; + propagatedBuildInputs = [ + gdal + h5py + noise + numpy + protobuf + purepng + pyplatec + six + ]; prePatch = '' substituteInPlace setup.py \ @@ -44,10 +54,14 @@ buildPythonPackage rec { --replace 'protobuf==3.0.0a3' 'protobuf' \ --replace 'noise==1.2.2' 'noise' \ --replace 'PyPlatec==1.4.0' 'PyPlatec' \ + + substituteInPlace \ + worldengine/{draw.py,hdf5_serialization.py} \ + --replace numpy.float float ''; doCheck = !isPy27; # google namespace clash - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTests = [ "TestSerialization" @@ -59,5 +73,4 @@ buildPythonPackage rec { license = licenses.mit; maintainers = with maintainers; [ rardiol ]; }; - } |