diff options
author | Mario Rodas <marsam@users.noreply.github.com> | 2022-10-23 18:34:23 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-10-23 18:34:23 -0500 |
commit | bdb2cf6de37624fb9ca98182800ee53ecd95bd54 (patch) | |
tree | a7f88885d1323ff5060a7c87caf9f606855c60bf /pkgs | |
parent | e63aba352c606802bff851d145ce28d25ede0616 (diff) | |
parent | da4cf04fad8167266183dc1310bae9ef91d5b9bb (diff) |
Merge pull request #193284 from m0rg-dev/pysolfc-2.16.0
pysolfc: 2.6.4 -> 2.16.0 Closes #190799
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/python-modules/pycotap/default.nix | 18 | ||||
-rw-r--r-- | pkgs/development/python-modules/pysol-cards/default.nix | 21 | ||||
-rw-r--r-- | pkgs/games/pysolfc/default.nix | 11 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 4 |
4 files changed, 49 insertions, 5 deletions
diff --git a/pkgs/development/python-modules/pycotap/default.nix b/pkgs/development/python-modules/pycotap/default.nix new file mode 100644 index 0000000000000..df7591459e2d3 --- /dev/null +++ b/pkgs/development/python-modules/pycotap/default.nix @@ -0,0 +1,18 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "pycotap"; + version = "1.2.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-+Tjs1JMczRnZWY+2M9Xqu3k48IuEcXMV5SUmqmJ3yew="; + }; + + meta = with lib; { + description = "Test runner for unittest that outputs TAP results to stdout"; + homepage = "https://el-tramo.be/pycotap"; + license = licenses.mit; + maintainers = with maintainers; [ mwolfe ]; + }; +} diff --git a/pkgs/development/python-modules/pysol-cards/default.nix b/pkgs/development/python-modules/pysol-cards/default.nix new file mode 100644 index 0000000000000..7be154a315c99 --- /dev/null +++ b/pkgs/development/python-modules/pysol-cards/default.nix @@ -0,0 +1,21 @@ +{ lib, buildPythonPackage, fetchPypi, six, random2 }: + +buildPythonPackage rec { + pname = "pysol-cards"; + version = "0.14.2"; + + src = fetchPypi { + inherit version; + pname = "pysol_cards"; + sha256 = "sha256-wI3oV1d7w+7JcMOt08RbNlMWzChErNYIO7Vuox1A6vA="; + }; + + propagatedBuildInputs = [ six random2 ]; + + meta = with lib; { + description = "Generates Solitaire deals"; + homepage = "https://github.com/shlomif/pysol_cards"; + license = licenses.mit; + maintainers = with maintainers; [ mwolfe ]; + }; +} diff --git a/pkgs/games/pysolfc/default.nix b/pkgs/games/pysolfc/default.nix index 925532bbbf537..f05babac5b79b 100644 --- a/pkgs/games/pysolfc/default.nix +++ b/pkgs/games/pysolfc/default.nix @@ -3,20 +3,21 @@ buildPythonApplication rec { pname = "PySolFC"; - version = "2.6.4"; + version = "2.16.0"; src = fetchzip { url = "https://versaweb.dl.sourceforge.net/project/pysolfc/PySolFC/PySolFC-${version}/PySolFC-${version}.tar.xz"; - sha256 = "1bd84law5b1yga3pryggdvlfvm0l62gci2q8y3q79cysdk3z4w3z"; + sha256 = "sha256-kklB16IrDicxqMee1kbxtoqgwcSrMjCV4HP6GtnZxo8="; }; cardsets = fetchzip { - url = "https://versaweb.dl.sourceforge.net/project/pysolfc/PySolFC-Cardsets/PySolFC-Cardsets-2.0/PySolFC-Cardsets-2.0.tar.bz2"; - sha256 = "0h0fibjv47j8lkc1bwnlbbvrx2nr3l2hzv717kcgagwhc7v2mrqh"; + url = "https://versaweb.dl.sourceforge.net/project/pysolfc/PySolFC-Cardsets/PySolFC-Cardsets-2.1/PySolFC-Cardsets-2.1.tar.bz2"; + sha256 = "sha256-0ji6jY7zJFaaaJdInaULKUou+u934RMzYjxVDGVHbE0="; }; propagatedBuildInputs = with python3Packages; [ - tkinter six random2 + tkinter six random2 configobj + pysol-cards attrs pycotap # optional : pygame freecell-solver pillow ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 34fbf69573039..ac7aea67d2e7d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7694,6 +7694,8 @@ in { pycosat = callPackage ../development/python-modules/pycosat { }; + pycotap = callPackage ../development/python-modules/pycotap { }; + pycountry = callPackage ../development/python-modules/pycountry { }; pycparser = callPackage ../development/python-modules/pycparser { }; @@ -8687,6 +8689,8 @@ in { pysocks = callPackage ../development/python-modules/pysocks { }; + pysol-cards = callPackage ../development/python-modules/pysol-cards { }; + pysolr = callPackage ../development/python-modules/pysolr { }; pysoma = callPackage ../development/python-modules/pysoma { }; |