From fd53ec0b2a476e052a3ed878dcdb06c3882fa2c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Wed, 9 Oct 2024 11:53:05 +0200
Subject: [PATCH] osu-lazer{,-bin}: move to pkgs/by-name

---
 .../bin.nix => by-name/os/osu-lazer-bin/package.nix}        | 2 +-
 .../update-bin.sh => by-name/os/osu-lazer-bin/update.sh}    | 6 +++---
 pkgs/{games => by-name/os}/osu-lazer/deps.nix               | 0
 pkgs/{games => by-name/os}/osu-lazer/osu.runtimeconfig.json | 0
 .../default.nix => by-name/os/osu-lazer/package.nix}        | 0
 pkgs/{games => by-name/os}/osu-lazer/update.sh              | 4 ++--
 pkgs/top-level/all-packages.nix                             | 4 ----
 7 files changed, 6 insertions(+), 10 deletions(-)
 rename pkgs/{games/osu-lazer/bin.nix => by-name/os/osu-lazer-bin/package.nix} (98%)
 rename pkgs/{games/osu-lazer/update-bin.sh => by-name/os/osu-lazer-bin/update.sh} (91%)
 rename pkgs/{games => by-name/os}/osu-lazer/deps.nix (100%)
 rename pkgs/{games => by-name/os}/osu-lazer/osu.runtimeconfig.json (100%)
 rename pkgs/{games/osu-lazer/default.nix => by-name/os/osu-lazer/package.nix} (100%)
 rename pkgs/{games => by-name/os}/osu-lazer/update.sh (86%)

diff --git a/pkgs/games/osu-lazer/bin.nix b/pkgs/by-name/os/osu-lazer-bin/package.nix
similarity index 98%
rename from pkgs/games/osu-lazer/bin.nix
rename to pkgs/by-name/os/osu-lazer-bin/package.nix
index af2997dc7e62..e0011b6b4a4c 100644
--- a/pkgs/games/osu-lazer/bin.nix
+++ b/pkgs/by-name/os/osu-lazer-bin/package.nix
@@ -51,7 +51,7 @@ let
     ];
   };
 
-  passthru.updateScript = ./update-bin.sh;
+  passthru.updateScript = ./update.sh;
 in
 if stdenv.hostPlatform.isDarwin then
   stdenv.mkDerivation {
diff --git a/pkgs/games/osu-lazer/update-bin.sh b/pkgs/by-name/os/osu-lazer-bin/update.sh
similarity index 91%
rename from pkgs/games/osu-lazer/update-bin.sh
rename to pkgs/by-name/os/osu-lazer-bin/update.sh
index 182875a42731..0b06950762b5 100755
--- a/pkgs/games/osu-lazer/update-bin.sh
+++ b/pkgs/by-name/os/osu-lazer-bin/update.sh
@@ -3,16 +3,16 @@
 set -eo pipefail
 cd "$(dirname "${BASH_SOURCE[0]}")"
 
-bin_file="$(realpath ./bin.nix)"
+bin_file="$(realpath ./package.nix)"
 
 new_version="$(curl -s "https://api.github.com/repos/ppy/osu/releases?per_page=1" | jq -r '.[0].name')"
-old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./bin.nix)"
+old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./package.nix)"
 if [[ "$new_version" == "$old_version" ]]; then
     echo "Already up to date."
     exit 0
 fi
 
-cd ../../..
+cd ../../../..
 
 echo "Updating osu-lazer-bin from $old_version to $new_version..."
 sed -Ei.bak '/ *version = "/s/".+"/"'"$new_version"'"/' "$bin_file"
diff --git a/pkgs/games/osu-lazer/deps.nix b/pkgs/by-name/os/osu-lazer/deps.nix
similarity index 100%
rename from pkgs/games/osu-lazer/deps.nix
rename to pkgs/by-name/os/osu-lazer/deps.nix
diff --git a/pkgs/games/osu-lazer/osu.runtimeconfig.json b/pkgs/by-name/os/osu-lazer/osu.runtimeconfig.json
similarity index 100%
rename from pkgs/games/osu-lazer/osu.runtimeconfig.json
rename to pkgs/by-name/os/osu-lazer/osu.runtimeconfig.json
diff --git a/pkgs/games/osu-lazer/default.nix b/pkgs/by-name/os/osu-lazer/package.nix
similarity index 100%
rename from pkgs/games/osu-lazer/default.nix
rename to pkgs/by-name/os/osu-lazer/package.nix
diff --git a/pkgs/games/osu-lazer/update.sh b/pkgs/by-name/os/osu-lazer/update.sh
similarity index 86%
rename from pkgs/games/osu-lazer/update.sh
rename to pkgs/by-name/os/osu-lazer/update.sh
index 7ef726621a09..194b644e7777 100755
--- a/pkgs/games/osu-lazer/update.sh
+++ b/pkgs/by-name/os/osu-lazer/update.sh
@@ -4,13 +4,13 @@ set -eo pipefail
 cd "$(dirname "${BASH_SOURCE[0]}")"
 
 new_version="$(curl -s "https://api.github.com/repos/ppy/osu/releases?per_page=1" | jq -r '.[0].name')"
-old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)"
+old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./package.nix)"
 if [[ "$new_version" == "$old_version" ]]; then
     echo "Up to date"
     exit 0
 fi
 
-cd ../../..
+cd ../../../..
 
 if [[ "$1" != "--deps-only" ]]; then
     update-source-version osu-lazer "$new_version"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8198b782e9a9..fa33159625c2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -34458,10 +34458,6 @@ with pkgs;
 
   opensearch = callPackage ../servers/search/opensearch { };
 
-  osu-lazer = callPackage ../games/osu-lazer { };
-
-  osu-lazer-bin = callPackage ../games/osu-lazer/bin.nix { };
-
   pro-office-calculator = libsForQt5.callPackage ../games/pro-office-calculator { };
 
   qgo = libsForQt5.callPackage ../games/qgo { };