Commit 73688410 authored by Tom Fitzhenry's avatar Tom Fitzhenry
Browse files

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
parent 51d261b0

nixos/tests/all-tests.nix

+1 −1
Original line number Diff line number Diff line
@@ -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 {};

nixos/tests/sgtpuzzles.nix→nixos/tests/sgt-puzzles.nix

+2 −2
Original line number Diff line number Diff line 
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

    ];

  };

pkgs/games/sgt-puzzles/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -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"

    '';

  };

pkgs/top-level/all-packages.nix

+5 −2
Original line number Diff line number Diff line
@@ -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 { };