diff options
| author | Vladimír Čunát <v@cunat.cz> | 2023-10-04 22:40:54 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2023-10-04 22:40:54 +0200 |
| commit | fa7835846a2482727e082c4181d05ba561b21ab5 (patch) | |
| tree | fc43ba9974abea7c536db5b2ffcb07fdd6f7f946 /pkgs/games | |
| parent | c7a3c2d71b34df36c507d9ad52a14df54bba0474 (diff) | |
| parent | bc16dfe4b34c9bbc95cee03c656c8871acc4e347 (diff) | |
| download | nixlib-fa7835846a2482727e082c4181d05ba561b21ab5.tar nixlib-fa7835846a2482727e082c4181d05ba561b21ab5.tar.gz nixlib-fa7835846a2482727e082c4181d05ba561b21ab5.tar.bz2 nixlib-fa7835846a2482727e082c4181d05ba561b21ab5.tar.lz nixlib-fa7835846a2482727e082c4181d05ba561b21ab5.tar.xz nixlib-fa7835846a2482727e082c4181d05ba561b21ab5.tar.zst nixlib-fa7835846a2482727e082c4181d05ba561b21ab5.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/minesweep-rs/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/games/sgt-puzzles/default.nix | 17 |
2 files changed, 16 insertions, 7 deletions
diff --git a/pkgs/games/minesweep-rs/default.nix b/pkgs/games/minesweep-rs/default.nix index a448597d9b1e..19fdae615ae9 100644 --- a/pkgs/games/minesweep-rs/default.nix +++ b/pkgs/games/minesweep-rs/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "minesweep-rs"; - version = "6.0.31"; + version = "6.0.34"; src = fetchFromGitHub { owner = "cpcloud"; repo = pname; rev = "v${version}"; - hash = "sha256-1jC2tudU5epMOzDR//yjSLNe+5nWzqhWDD2Zxdn5+F4="; + hash = "sha256-qYt4LrSQYFr3C0Mkks5aBOYFp60Y3OjFamXxaD5h+mU="; }; - cargoHash = "sha256-qH464zNpI/Y5SXplTwhPu9TjbqfExQYs/Lh75lPUoh4="; + cargoHash = "sha256-s2WvRXxEm+/QceHpJA41ZRts6NCcG04kib3L78KwBPg="; meta = with lib; { description = "Sweep some mines for fun, and probably not for profit"; diff --git a/pkgs/games/sgt-puzzles/default.nix b/pkgs/games/sgt-puzzles/default.nix index 5902579b73b1..a161d8d68ef7 100644 --- a/pkgs/games/sgt-puzzles/default.nix +++ b/pkgs/games/sgt-puzzles/default.nix @@ -1,13 +1,11 @@ { lib, stdenv, fetchurl, desktop-file-utils , gtk3, libX11, cmake, imagemagick -, pkg-config, perl, wrapGAppsHook, nixosTests +, pkg-config, perl, wrapGAppsHook, nixosTests, writeScript , isMobile ? false }: stdenv.mkDerivation rec { pname = "sgt-puzzles"; - # 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 { @@ -61,7 +59,18 @@ stdenv.mkDerivation rec { install -Dm644 ${sgt-puzzles-menu} -t $out/etc/xdg/menus/applications-merged/ ''; - passthru.tests.sgtpuzzles = nixosTests.sgtpuzzles; + passthru = { + tests.sgtpuzzles = nixosTests.sgtpuzzles; + updateScript = writeScript "update-sgtpuzzles" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl pcre common-updater-scripts + + set -eu -o pipefail + + version="$(curl -sI 'https://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles.tar.gz' | grep -Fi Location: | pcregrep -o1 'puzzles-([0-9a-f.]*).tar.gz')" + update-source-version sgtpuzzles "$version" + ''; + }; meta = with lib; { description = "Simon Tatham's portable puzzle collection"; |