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

sgt-puzzles: rename all "sgtpuzzles" -> "sgt-puzzles"

authored by 7c6f434c and committed by GitHub 8a2cb1f0 a95049d9

+11 -8
+1 -1
nixos/tests/all-tests.nix
··· 714 714 service-runner = handleTest ./service-runner.nix {}; 715 715 sftpgo = runTest ./sftpgo.nix; 716 716 sfxr-qt = handleTest ./sfxr-qt.nix {}; 717 - sgtpuzzles = handleTest ./sgtpuzzles.nix {}; 717 + sgt-puzzles = handleTest ./sgt-puzzles.nix {}; 718 718 shadow = handleTest ./shadow.nix {}; 719 719 shadowsocks = handleTest ./shadowsocks {}; 720 720 shattered-pixel-dungeon = handleTest ./shattered-pixel-dungeon.nix {};
+2 -2
nixos/tests/sgtpuzzles.nix nixos/tests/sgt-puzzles.nix
··· 1 1 import ./make-test-python.nix ({ pkgs, ...} : 2 2 { 3 - name = "sgtpuzzles"; 3 + name = "sgt-puzzles"; 4 4 meta = with pkgs.lib.maintainers; { 5 5 maintainers = [ tomfitzhenry ]; 6 6 }; ··· 14 14 15 15 services.xserver.enable = true; 16 16 environment.systemPackages = with pkgs; [ 17 - sgtpuzzles 17 + sgt-puzzles 18 18 ]; 19 19 }; 20 20
+3 -3
pkgs/games/sgt-puzzles/default.nix
··· 60 60 ''; 61 61 62 62 passthru = { 63 - tests.sgtpuzzles = nixosTests.sgtpuzzles; 64 - updateScript = writeScript "update-sgtpuzzles" '' 63 + tests.sgt-puzzles = nixosTests.sgt-puzzles; 64 + updateScript = writeScript "update-sgt-puzzles" '' 65 65 #!/usr/bin/env nix-shell 66 66 #!nix-shell -i bash -p curl pcre common-updater-scripts 67 67 68 68 set -eu -o pipefail 69 69 70 70 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')" 71 - update-source-version sgtpuzzles "$version" 71 + update-source-version sgt-puzzles "$version" 72 72 ''; 73 73 }; 74 74
+5 -2
pkgs/top-level/all-packages.nix
··· 38476 38476 38477 38477 sfrotz = callPackage ../games/sfrotz { }; 38478 38478 38479 - sgtpuzzles = callPackage ../games/sgt-puzzles { }; 38479 + sgt-puzzles = callPackage ../games/sgt-puzzles { }; 38480 38480 38481 - sgtpuzzles-mobile = callPackage ../games/sgt-puzzles { 38481 + sgt-puzzles-mobile = callPackage ../games/sgt-puzzles { 38482 38482 isMobile = true; 38483 38483 }; 38484 + 38485 + sgtpuzzles = throw "sgtpuzzles has been renamed to sgt-puzzles."; # 2023-10-06 38486 + sgtpuzzles-mobile = throw "sgtpuzzles-mobile has been renamed to sgt-puzzles-mobile."; # 2023-10-06 38484 38487 38485 38488 shattered-pixel-dungeon = callPackage ../games/shattered-pixel-dungeon { }; 38486 38489