Merge pull request #45347 from bignaux/pysolfc

PySolFC: 2.0 -> 2.6.4
This commit is contained in:
worldofpeace 2019-12-21 22:20:48 -05:00 committed by GitHub
commit e7c568a0b0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 21 deletions

View file

@ -1,39 +1,48 @@
{ fetchurl, python2, stdenv }: { stdenv, fetchzip, buildPythonApplication, python3Packages
, desktop-file-utils, freecell-solver }:
with python2.pkgs;
buildPythonApplication rec { buildPythonApplication rec {
pname = "PySolFC"; pname = "PySolFC";
version = "2.0"; version = "2.6.4";
src = fetchurl { src = fetchzip {
url = "mirror://sourceforge/pysolfc/${pname}-${version}.tar.bz2"; url = "https://versaweb.dl.sourceforge.net/project/pysolfc/PySolFC/PySolFC-${version}/PySolFC-${version}.tar.xz";
sha256 = "0v0v8iflw55f5mghglkw80j8b7lv1hffjassfhqc4y84dmz8xjyv"; sha256 = "1bd84law5b1yga3pryggdvlfvm0l62gci2q8y3q79cysdk3z4w3z";
}; };
cardsets = fetchzip {
url = "https://versaweb.dl.sourceforge.net/project/pysolfc/PySolFC-Cardsets/PySolFC-Cardsets-2.0/PySolFC-Cardsets-2.0.tar.bz2";
sha256 = "0h0fibjv47j8lkc1bwnlbbvrx2nr3l2hzv717kcgagwhc7v2mrqh";
};
propagatedBuildInputs = with python3Packages; [
tkinter six random2
# optional :
pygame freecell-solver pillow
];
patches = [ patches = [
./pysolfc-datadir.patch ./pysolfc-datadir.patch
]; ];
propagatedBuildInputs = [ nativeBuildInputs = [ desktop-file-utils ];
tkinter postPatch = ''
]; desktop-file-edit --set-key Icon --set-value ${placeholder "out"}/share/icons/pysol01.png data/pysol.desktop
desktop-file-edit --set-key Comment --set-value "${meta.description}" data/pysol.desktop
'';
postInstall = ''
mkdir $out/share/PySolFC/cardsets
cp -r $cardsets/* $out/share/PySolFC/cardsets
'';
# No tests in archive # No tests in archive
doCheck = false; doCheck = false;
postInstall = ''
# executables should not have an extension
pushd $out/bin
mv pysol.py pysol
rm pysol.pyc
popd
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A collection of more than 1000 solitaire card games"; description = "A collection of more than 1000 solitaire card games";
homepage = http://pysolfc.sourceforge.net/; homepage = https://pysolfc.sourceforge.io;
license = licenses.gpl3; license = licenses.gpl3;
maintainers = with maintainers; [ kierdavis ]; maintainers = with maintainers; [ kierdavis genesis ];
}; };
} }

View file

@ -23025,7 +23025,7 @@ in
privateer = callPackage ../games/privateer { }; privateer = callPackage ../games/privateer { };
pysolfc = callPackage ../games/pysolfc { }; pysolfc = python3Packages.callPackage ../games/pysolfc { };
qweechat = callPackage ../applications/networking/irc/qweechat { }; qweechat = callPackage ../applications/networking/irc/qweechat { };