b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

python3Packages.gdtoolkit: Move to pkgs/development/tools

Browse source 
gdtoolkit is not a library. Move to pkgs/development/tools and use
buildPythonApplication.

Fixes #216243.
This commit is contained in:
Tobias Markus 2023-02-14 19:16:30 +01:00 committed by Frederik Rietdijk
parent 142a89518e
commit 1668ab99ae
4 changed files with 13 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
pkgs/development/python-modules/gdtoolkit/default.nix → pkgs/development/tools/gdtoolkit/default.nix
View file

@ -1,29 +1,23 @@
{ lib { lib
, buildPythonPackage , python3Packages
, fetchFromGitHub , fetchFromGitHub
, pythonOlder
, lark
, docopt
, pyyaml
, setuptools
, pytestCheckHook
, godot-server , godot-server
, hypothesis
}: }:
let lark080 = lark.overrideAttrs (old: rec { let lark080 = python3Packages.lark.overrideAttrs (old: rec {
# gdtoolkit needs exactly this lark version # gdtoolkit needs exactly this lark version
version = "0.8.0"; version = "0.8.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lark-parser"; owner = "lark-parser";
repo = "lark"; repo = "lark";
rev = version; rev = version;
sha256 = "su7kToZ05OESwRCMPG6Z+XlFUvbEb3d8DgsTEcPJMg4="; hash = "sha256-KN9buVlH8hJ8t0ZP5yefeYM5vH5Gg7a7TEDGKJYpozs=";
fetchSubmodules = true;
}; };
}); });
in in
buildPythonPackage rec { python3Packages.buildPythonApplication rec {
pname = "gdtoolkit"; pname = "gdtoolkit";
version = "3.3.1"; version = "3.3.1";
@ -35,18 +29,18 @@ buildPythonPackage rec {
sha256 = "13nnpwy550jf5qnm9ixpxl1bwfnhhbiys8vqfd25g3aim4bm3gnn"; sha256 = "13nnpwy550jf5qnm9ixpxl1bwfnhhbiys8vqfd25g3aim4bm3gnn";
}; };
disabled = pythonOlder "3.7"; disabled = python3Packages.pythonOlder "3.7";
propagatedBuildInputs = [ propagatedBuildInputs = [ lark080
lark080 ] ++ (with python3Packages; [
docopt docopt
pyyaml pyyaml
setuptools setuptools
]; ]);
doCheck = true; doCheck = true;
nativeCheckInputs = [ nativeCheckInputs = with python3Packages; [
pytestCheckHook pytestCheckHook
hypothesis hypothesis
godot-server godot-server

2
pkgs/top-level/all-packages.nix
View file

@ -7584,6 +7584,8 @@ with pkgs;
gdmap = callPackage ../tools/system/gdmap { }; gdmap = callPackage ../tools/system/gdmap { };
gdtoolkit = callPackage ../development/tools/gdtoolkit { };
gef = callPackage ../development/tools/misc/gef { }; gef = callPackage ../development/tools/misc/gef { };
gelasio = callPackage ../data/fonts/gelasio { }; gelasio = callPackage ../data/fonts/gelasio { };

1
pkgs/top-level/python-aliases.nix
View file

@ -91,6 +91,7 @@ mapAliases ({
functorch = throw "functorch is now part of the torch package and has therefore been removed. See https://github.com/pytorch/functorch/releases/tag/v1.13.0 for more info."; # added 2022-12-01 functorch = throw "functorch is now part of the torch package and has therefore been removed. See https://github.com/pytorch/functorch/releases/tag/v1.13.0 for more info."; # added 2022-12-01
garages-amsterdam = throw "garages-amsterdam has been renamed odp-amsterdam."; # added 2023-01-04 garages-amsterdam = throw "garages-amsterdam has been renamed odp-amsterdam."; # added 2023-01-04
garminconnect-ha = garminconnect; # added 2022-02-05 garminconnect-ha = garminconnect; # added 2022-02-05
gdtoolkit = throw "gdtoolkit has been promoted to a top-level attribute"; # added 2023-02-15
gigalixir = throw "gigalixir has been promoted to a top-level attribute"; # Added 2022-10-02 gigalixir = throw "gigalixir has been promoted to a top-level attribute"; # Added 2022-10-02
gitdb2 = throw "gitdb2 has been deprecated, use gitdb instead."; # added 2020-03-14 gitdb2 = throw "gitdb2 has been deprecated, use gitdb instead."; # added 2020-03-14
GitPython = gitpython; # added 2022-10-28 GitPython = gitpython; # added 2022-10-28

2
pkgs/top-level/python-packages.nix
View file

@ -3726,8 +3726,6 @@ self: super: with self; {
gdown = callPackage ../development/python-modules/gdown { }; gdown = callPackage ../development/python-modules/gdown { };
gdtoolkit = callPackage ../development/python-modules/gdtoolkit { };
ge25519 = callPackage ../development/python-modules/ge25519 { }; ge25519 = callPackage ../development/python-modules/ge25519 { };
geant4 = toPythonModule (pkgs.geant4.override { geant4 = toPythonModule (pkgs.geant4.override {