diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-09-29 18:00:55 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-29 18:00:55 +0000 |
| commit | 50751b0602e568403898fc17c4bbb5f3101ccbbd (patch) | |
| tree | 87a8a6c67f9e5b97c0441ecf656fa59930ac58b2 /pkgs/games | |
| parent | c1a6c05aa71609aa9b892987d12527c73f53987a (diff) | |
| parent | c182df2e68bd97deb32c7e4765adfbbbcaf75b60 (diff) | |
| download | nixlib-50751b0602e568403898fc17c4bbb5f3101ccbbd.tar nixlib-50751b0602e568403898fc17c4bbb5f3101ccbbd.tar.gz nixlib-50751b0602e568403898fc17c4bbb5f3101ccbbd.tar.bz2 nixlib-50751b0602e568403898fc17c4bbb5f3101ccbbd.tar.lz nixlib-50751b0602e568403898fc17c4bbb5f3101ccbbd.tar.xz nixlib-50751b0602e568403898fc17c4bbb5f3101ccbbd.tar.zst nixlib-50751b0602e568403898fc17c4bbb5f3101ccbbd.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/boohu/default.nix | 19 | ||||
| -rw-r--r-- | pkgs/games/boohu/deps.nix | 20 | ||||
| -rw-r--r-- | pkgs/games/sgt-puzzles/default.nix | 6 |
3 files changed, 12 insertions, 33 deletions
diff --git a/pkgs/games/boohu/default.nix b/pkgs/games/boohu/default.nix index 6b3c0e04f982..708d8d7510bc 100644 --- a/pkgs/games/boohu/default.nix +++ b/pkgs/games/boohu/default.nix @@ -1,20 +1,17 @@ -{lib, fetchurl, buildGoPackage}: - -buildGoPackage rec { +{ lib, fetchurl, buildGoModule }: +buildGoModule rec { pname = "boohu"; - version = "0.13.0"; - - goPackagePath = "git.tuxfamily.org/boohu/boohu.git"; + version = "0.14.0"; src = fetchurl { - url = "https://download.tuxfamily.org/boohu/downloads/${pname}-${version}.tar.gz"; - sha256 = "0q89yv4klldjpli6y9xpyr6k8nsn7qa68gp90vb3dgxynn91sh68"; + url = "https://download.tuxfamily.org/boohu/downloads/boohu-${version}.tar.gz"; + hash = "sha256-IB59C5/uuHP6LtKLypjpgHOo0MR9bFdCbudaRa+h7lI="; }; - goDeps = ./deps.nix; + vendorHash = "sha256-AVK4zE/Hs9SN8Qj2WYj/am2B0R74QKYoMNf3sRRjnU4="; - postInstall = "mv $out/bin/boohu.git $out/bin/boohu"; + ldflags = [ "-s" "-w" ]; meta = with lib; { description = "A new coffee-break roguelike game"; @@ -27,6 +24,6 @@ buildGoPackage rec { homepage = "https://download.tuxfamily.org/boohu/index.html"; license = licenses.isc; platforms = platforms.unix; - maintainers = with maintainers; []; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/games/boohu/deps.nix b/pkgs/games/boohu/deps.nix deleted file mode 100644 index c2dc3b41b973..000000000000 --- a/pkgs/games/boohu/deps.nix +++ /dev/null @@ -1,20 +0,0 @@ -[ - { - goPackagePath = "github.com/nsf/termbox-go"; - fetch = { - type = "git"; - url = "https://github.com/nsf/termbox-go"; - rev = "93860e16131719fa9722e7c448dbf8c0e3210a0d"; - sha256 = "03hz060cy8qrl4kgr80pbq6xvr38z4c6ghr3y81i8g854rvp6426"; - }; - } - { - goPackagePath = "github.com/mattn/go-runewidth"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-runewidth"; - rev = "f93a0d58d5fd95e53f82782d07bb0c79d23e1290"; - sha256 = "1sq97q71vgwnbg1fphsmqrzkbfn6mjal6d8a3qgwv4nbgppwaz25"; - }; - } -] diff --git a/pkgs/games/sgt-puzzles/default.nix b/pkgs/games/sgt-puzzles/default.nix index bf378cd188de..5902579b73b1 100644 --- a/pkgs/games/sgt-puzzles/default.nix +++ b/pkgs/games/sgt-puzzles/default.nix @@ -6,11 +6,13 @@ stdenv.mkDerivation rec { pname = "sgt-puzzles"; - version = "20220913.27dd36e"; + # To find the latest version: + # $ curl -s -i 'https://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles.tar.gz' | grep Location + version = "20230918.2d9e414"; src = fetchurl { url = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${version}.tar.gz"; - hash = "sha256-fj1XWuXcW01uuC5dK2wDIrweyruSRdfEZBfmEj99zZE="; + hash = "sha256-YsvJ/5DTevRb+sCxWc/KcD2X5IXwAXvWGVfokr06nUM="; }; sgt-puzzles-menu = fetchurl { |