diff options
author | Tom Fitzhenry <tom@tom-fitzhenry.me.uk> | 2023-10-06 21:36:48 +1100 |
---|---|---|
committer | Tom Fitzhenry <tom@tom-fitzhenry.me.uk> | 2023-10-06 21:36:48 +1100 |
commit | 736884108d45daa6c41f123c6b318043a2c33ee1 (patch) | |
tree | ff591189833bed68aa8a8c3c771775fde166bfed | |
parent | 51d261b0aed53b56dd4a658a05c9ed6b937eb731 (diff) |
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
-rw-r--r-- | nixos/tests/all-tests.nix | 2 | ||||
-rw-r--r-- | nixos/tests/sgt-puzzles.nix (renamed from nixos/tests/sgtpuzzles.nix) | 4 | ||||
-rw-r--r-- | pkgs/games/sgt-puzzles/default.nix | 6 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 7 |
4 files changed, 11 insertions, 8 deletions
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index c221835f9a6ab..9c90304690074 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -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 {}; diff --git a/nixos/tests/sgtpuzzles.nix b/nixos/tests/sgt-puzzles.nix index b8d25d42d312f..4c5210bfce778 100644 --- a/nixos/tests/sgtpuzzles.nix +++ b/nixos/tests/sgt-puzzles.nix @@ -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 ]; }; diff --git a/pkgs/games/sgt-puzzles/default.nix b/pkgs/games/sgt-puzzles/default.nix index a161d8d68ef77..8173fb5fe1d2f 100644 --- a/pkgs/games/sgt-puzzles/default.nix +++ b/pkgs/games/sgt-puzzles/default.nix @@ -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" ''; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index faa6d3e35a8c2..51eb556ff4986 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |