git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #45347 from bignaux/pysolfc

PySolFC: 2.0 -> 2.6.4

commite7c568a0b0d6a54a384a8a32b8cf278d58d681a7 authorworldofpeace <worldofpeace@protonmail.ch> dateSat 21 Dec 2019, 22:20 (7 years ago) parent9f995176157422
2 files changed+30−21
pkgs/games/pysolfc/default.nix+29−20 pkgs/top-level/all-packages.nix+1−1
pkgs/games/pysolfc/default.nix+29−20
@@ -1,39 +1,48 @@
1−{ fetchurl, python2, stdenv }:
2−
3−with python2.pkgs;
1+{ stdenv, fetchzip, buildPythonApplication, python3Packages
2+ , desktop-file-utils, freecell-solver }:
43
54buildPythonApplication rec {
65 pname = "PySolFC";
7− version = "2.0";
6+ version = "2.6.4";
87
9− src = fetchurl {
10− url = "mirror://sourceforge/pysolfc/${pname}-${version}.tar.bz2";
11− sha256 = "0v0v8iflw55f5mghglkw80j8b7lv1hffjassfhqc4y84dmz8xjyv";
8+ src = fetchzip {
9+ url = "https://versaweb.dl.sourceforge.net/project/pysolfc/PySolFC/PySolFC-${version}/PySolFC-${version}.tar.xz";
10+ sha256 = "1bd84law5b1yga3pryggdvlfvm0l62gci2q8y3q79cysdk3z4w3z";
1211 };
1312
14− patches = [
15− ./pysolfc-datadir.patch
13+ cardsets = fetchzip {
14+ url = "https://versaweb.dl.sourceforge.net/project/pysolfc/PySolFC-Cardsets/PySolFC-Cardsets-2.0/PySolFC-Cardsets-2.0.tar.bz2";
15+ sha256 = "0h0fibjv47j8lkc1bwnlbbvrx2nr3l2hzv717kcgagwhc7v2mrqh";
16+ };
17+
18+ propagatedBuildInputs = with python3Packages; [
19+ tkinter six random2
20+ # optional :
21+ pygame freecell-solver pillow
1622 ];
1723
18− propagatedBuildInputs = [
19− tkinter
24+ patches = [
25+ ./pysolfc-datadir.patch
2026 ];
2127
22− # No tests in archive
23− doCheck = false;
28+ nativeBuildInputs = [ desktop-file-utils ];
29+ postPatch = ''
30+ desktop-file-edit --set-key Icon --set-value ${placeholder "out"}/share/icons/pysol01.png data/pysol.desktop
31+ desktop-file-edit --set-key Comment --set-value "${meta.description}" data/pysol.desktop
32+ '';
2433
2534 postInstall = ''
26− # executables should not have an extension
27− pushd $out/bin
28− mv pysol.py pysol
29− rm pysol.pyc
30− popd
35+ mkdir $out/share/PySolFC/cardsets
36+ cp -r $cardsets/* $out/share/PySolFC/cardsets
3137 '';
3238
39+ # No tests in archive
40+ doCheck = false;
41+
3342 meta = with stdenv.lib; {
3443 description = "A collection of more than 1000 solitaire card games";
35− homepage = http://pysolfc.sourceforge.net/;
44+ homepage = https://pysolfc.sourceforge.io;
3645 license = licenses.gpl3;
37− maintainers = with maintainers; [ kierdavis ];
46+ maintainers = with maintainers; [ kierdavis genesis ];
3847 };
3948}
pkgs/top-level/all-packages.nix+1−1
@@ -23025,7 +23025,7 @@ in
2302523025
2302623026 privateer = callPackage ../games/privateer { };
2302723027
23028− pysolfc = callPackage ../games/pysolfc { };
23028+ pysolfc = python3Packages.callPackage ../games/pysolfc { };
2302923029
2303023030 qweechat = callPackage ../applications/networking/irc/qweechat { };
2303123031