b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #259362 from tomfitzhenry/sgt-puzzles-name

Browse source 
sgt-puzzles: rename all "sgtpuzzles" -> "sgt-puzzles"
This commit is contained in:
7c6f434c 2023-10-06 11:50:49 +00:00 committed by GitHub
parent a95049d917 736884108d
commit 8a2cb1f05f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/tests/all-tests.nix
View file

@ -714,7 +714,7 @@ in {
service-runner = handleTest ./service-runner.nix {};
sftpgo = runTest ./sftpgo.nix;
sfxr-qt = handleTest ./sfxr-qt.nix {};
sgtpuzzles = handleTest ./sgtpuzzles.nix {};
sgt-puzzles = handleTest ./sgt-puzzles.nix {};
shadow = handleTest ./shadow.nix {};
shadowsocks = handleTest ./shadowsocks {};
shattered-pixel-dungeon = handleTest ./shattered-pixel-dungeon.nix {};

4
nixos/tests/sgtpuzzles.nix → nixos/tests/sgt-puzzles.nix
View file

@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, ...} :
{
name = "sgtpuzzles";
name = "sgt-puzzles";
meta = with pkgs.lib.maintainers; {
maintainers = [ tomfitzhenry ];
};
@ -14,7 +14,7 @@ import ./make-test-python.nix ({ pkgs, ...} :
services.xserver.enable = true;
environment.systemPackages = with pkgs; [
sgtpuzzles
sgt-puzzles
];
};

6
pkgs/games/sgt-puzzles/default.nix
View file

@ -60,15 +60,15 @@ stdenv.mkDerivation rec {
'';
passthru = {
tests.sgtpuzzles = nixosTests.sgtpuzzles;
updateScript = writeScript "update-sgtpuzzles" ''
tests.sgt-puzzles = nixosTests.sgt-puzzles;
updateScript = writeScript "update-sgt-puzzles" ''
#!/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"
update-source-version sgt-puzzles "$version"
'';
};

7
pkgs/top-level/all-packages.nix
View file

@ -38476,12 +38476,15 @@ with pkgs;
sfrotz = callPackage ../games/sfrotz { };
sgtpuzzles = callPackage ../games/sgt-puzzles { };
sgt-puzzles = callPackage ../games/sgt-puzzles { };
sgtpuzzles-mobile = callPackage ../games/sgt-puzzles {
sgt-puzzles-mobile = callPackage ../games/sgt-puzzles {
isMobile = true;
};
sgtpuzzles = throw "sgtpuzzles has been renamed to sgt-puzzles."; # 2023-10-06
sgtpuzzles-mobile = throw "sgtpuzzles-mobile has been renamed to sgt-puzzles-mobile."; # 2023-10-06
shattered-pixel-dungeon = callPackage ../games/shattered-pixel-dungeon { };
shticker-book-unwritten = callPackage ../games/shticker-book-unwritten { };