summary refs log tree commit diff
diff options
context:
space:
mode:
authorAnomalocaridid <29845794+Anomalocaridid@users.noreply.github.com>2023-06-28 20:45:59 -0400
committerAnomalocaridid <29845794+Anomalocaridid@users.noreply.github.com>2023-07-01 18:38:25 -0400
commiteda43a206a963ed641ed01fba4e9f8c5b295ed37 (patch)
tree4c190a32a88008d31f31c4abf6a07ceb9433c6ad
parentaadd1db32480459c5502f404d48a101efa26fc4d (diff)
downloadnixpkgs-eda43a206a963ed641ed01fba4e9f8c5b295ed37.tar
nixpkgs-eda43a206a963ed641ed01fba4e9f8c5b295ed37.tar.gz
nixpkgs-eda43a206a963ed641ed01fba4e9f8c5b295ed37.tar.bz2
nixpkgs-eda43a206a963ed641ed01fba4e9f8c5b295ed37.tar.lz
nixpkgs-eda43a206a963ed641ed01fba4e9f8c5b295ed37.tar.xz
nixpkgs-eda43a206a963ed641ed01fba4e9f8c5b295ed37.tar.zst
nixpkgs-eda43a206a963ed641ed01fba4e9f8c5b295ed37.zip
pysolfc: 2.16.0 -> 2.20.1
-rw-r--r--pkgs/games/pysolfc/default.nix36
1 files changed, 27 insertions, 9 deletions
diff --git a/pkgs/games/pysolfc/default.nix b/pkgs/games/pysolfc/default.nix
index f05babac5b7..c543434b610 100644
--- a/pkgs/games/pysolfc/default.nix
+++ b/pkgs/games/pysolfc/default.nix
@@ -1,25 +1,42 @@
-{ lib, fetchzip, buildPythonApplication, python3Packages
-  , desktop-file-utils, freecell-solver }:
+{ lib
+, fetchzip
+, buildPythonApplication
+, python3Packages
+, desktop-file-utils
+, freecell-solver
+}:
 
 buildPythonApplication rec {
   pname = "PySolFC";
-  version = "2.16.0";
+  version = "2.20.1";
 
   src = fetchzip {
     url = "https://versaweb.dl.sourceforge.net/project/pysolfc/PySolFC/PySolFC-${version}/PySolFC-${version}.tar.xz";
-    sha256 = "sha256-kklB16IrDicxqMee1kbxtoqgwcSrMjCV4HP6GtnZxo8=";
+    hash = "sha256-mEnsq8Su0ses+nqoSFC+Wr0MHY7aTDMbtDV8toYVNPY=";
   };
 
   cardsets = fetchzip {
-    url = "https://versaweb.dl.sourceforge.net/project/pysolfc/PySolFC-Cardsets/PySolFC-Cardsets-2.1/PySolFC-Cardsets-2.1.tar.bz2";
-    sha256 = "sha256-0ji6jY7zJFaaaJdInaULKUou+u934RMzYjxVDGVHbE0=";
+    url = "https://versaweb.dl.sourceforge.net/project/pysolfc/PySolFC-Cardsets/PySolFC-Cardsets-2.2/PySolFC-Cardsets-2.2.tar.bz2";
+    hash = "sha256-mWJ0l9rvn9KeZ9rCWy7VjngJzJtSQSmG8zGcYFE4yM0=";
+  };
+
+  music = fetchzip {
+    url = "https://versaweb.dl.sourceforge.net/project/pysolfc/PySol-Music/PySol-Music-4.50/pysol-music-4.50.tar.xz";
+    hash = "sha256-sOl5U98aIorrQHJRy34s0HHaSW8hMUE7q84FMQAj5Yg=";
   };
 
   propagatedBuildInputs = with python3Packages; [
-    tkinter six random2 configobj
-    pysol-cards attrs pycotap
+    tkinter
+    six
+    random2
+    configobj
+    pysol-cards
+    attrs
+    pycotap
     # optional :
-    pygame freecell-solver pillow
+    pygame
+    freecell-solver
+    pillow
   ];
 
   patches = [
@@ -35,6 +52,7 @@ buildPythonApplication rec {
   postInstall = ''
     mkdir $out/share/PySolFC/cardsets
     cp -r $cardsets/* $out/share/PySolFC/cardsets
+    cp -r $music/data/music $out/share/PySolFC
   '';
 
   # No tests in archive