sgt-puzzles: rename all "sgtpuzzles" -> "sgt-puzzles"
nixpkgs currently mixes sgtpuzzles/sgt-puzzles across filenames, packages, tests. This inconsistency is frequently annoying. Let's unify on "sgt-puzzles", on the basis that: * "sgt-puzzles" is the package filename. * Alpine/FreeBSD/Debian use "sgt-puzzles". No other distro uses "sgtpuzzles". https://repology.org/project/sgt-puzzles/versions
This commit is contained in:
parent
51d261b0ae
commit
736884108d
|
@ -714,7 +714,7 @@ in {
|
||||||
service-runner = handleTest ./service-runner.nix {};
|
service-runner = handleTest ./service-runner.nix {};
|
||||||
sftpgo = runTest ./sftpgo.nix;
|
sftpgo = runTest ./sftpgo.nix;
|
||||||
sfxr-qt = handleTest ./sfxr-qt.nix {};
|
sfxr-qt = handleTest ./sfxr-qt.nix {};
|
||||||
sgtpuzzles = handleTest ./sgtpuzzles.nix {};
|
sgt-puzzles = handleTest ./sgt-puzzles.nix {};
|
||||||
shadow = handleTest ./shadow.nix {};
|
shadow = handleTest ./shadow.nix {};
|
||||||
shadowsocks = handleTest ./shadowsocks {};
|
shadowsocks = handleTest ./shadowsocks {};
|
||||||
shattered-pixel-dungeon = handleTest ./shattered-pixel-dungeon.nix {};
|
shattered-pixel-dungeon = handleTest ./shattered-pixel-dungeon.nix {};
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
import ./make-test-python.nix ({ pkgs, ...} :
|
import ./make-test-python.nix ({ pkgs, ...} :
|
||||||
{
|
{
|
||||||
name = "sgtpuzzles";
|
name = "sgt-puzzles";
|
||||||
meta = with pkgs.lib.maintainers; {
|
meta = with pkgs.lib.maintainers; {
|
||||||
maintainers = [ tomfitzhenry ];
|
maintainers = [ tomfitzhenry ];
|
||||||
};
|
};
|
||||||
|
@ -14,7 +14,7 @@ import ./make-test-python.nix ({ pkgs, ...} :
|
||||||
|
|
||||||
services.xserver.enable = true;
|
services.xserver.enable = true;
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
sgtpuzzles
|
sgt-puzzles
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
|
@ -60,15 +60,15 @@ stdenv.mkDerivation rec {
|
||||||
'';
|
'';
|
||||||
|
|
||||||
passthru = {
|
passthru = {
|
||||||
tests.sgtpuzzles = nixosTests.sgtpuzzles;
|
tests.sgt-puzzles = nixosTests.sgt-puzzles;
|
||||||
updateScript = writeScript "update-sgtpuzzles" ''
|
updateScript = writeScript "update-sgt-puzzles" ''
|
||||||
#!/usr/bin/env nix-shell
|
#!/usr/bin/env nix-shell
|
||||||
#!nix-shell -i bash -p curl pcre common-updater-scripts
|
#!nix-shell -i bash -p curl pcre common-updater-scripts
|
||||||
|
|
||||||
set -eu -o pipefail
|
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')"
|
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"
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -38476,12 +38476,15 @@ with pkgs;
|
||||||
|
|
||||||
sfrotz = callPackage ../games/sfrotz { };
|
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;
|
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 { };
|
shattered-pixel-dungeon = callPackage ../games/shattered-pixel-dungeon { };
|
||||||
|
|
||||||
shticker-book-unwritten = callPackage ../games/shticker-book-unwritten { };
|
shticker-book-unwritten = callPackage ../games/shticker-book-unwritten { };
|
||||||
|
|
Loading…
Reference in a new issue