From d9cbf28ebdc17761335e6d8a2a304d24f266cf2e Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sat, 11 Oct 2025 19:11:37 +0400 Subject: [PATCH] plexamp: migrate to by-name --- .../default.nix => by-name/pl/plexamp/package.nix} | 0 .../audio => by-name/pl}/plexamp/update-plexamp.sh | 8 ++++---- pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 4 insertions(+), 6 deletions(-) rename pkgs/{applications/audio/plexamp/default.nix => by-name/pl/plexamp/package.nix} (100%) rename pkgs/{applications/audio => by-name/pl}/plexamp/update-plexamp.sh (90%) diff --git a/pkgs/applications/audio/plexamp/default.nix b/pkgs/by-name/pl/plexamp/package.nix similarity index 100% rename from pkgs/applications/audio/plexamp/default.nix rename to pkgs/by-name/pl/plexamp/package.nix diff --git a/pkgs/applications/audio/plexamp/update-plexamp.sh b/pkgs/by-name/pl/plexamp/update-plexamp.sh similarity index 90% rename from pkgs/applications/audio/plexamp/update-plexamp.sh rename to pkgs/by-name/pl/plexamp/update-plexamp.sh index 44ad9b925014..e241d92b5d87 100755 --- a/pkgs/applications/audio/plexamp/update-plexamp.sh +++ b/pkgs/by-name/pl/plexamp/update-plexamp.sh @@ -11,8 +11,8 @@ cleanup() { trap cleanup EXIT ROOT="$(dirname "$(readlink -f "$0")")" -if [ ! -f "$ROOT/default.nix" ]; then - echo "ERROR: cannot find default.nix in $ROOT" +if [ ! -f "$ROOT/package.nix" ]; then + echo "ERROR: cannot find package.nix in $ROOT" exit 1 fi @@ -30,8 +30,8 @@ curl "$VERSION_URL" -o "$VERSION_FILE" VERSION="$(yq -r .version "$VERSION_FILE")" SHA512="$(yq -r .sha512 "$VERSION_FILE")" -DEFAULT_NIX="$ROOT/default.nix" -WORKING_NIX="$TMPDIR/default.nix" +DEFAULT_NIX="$ROOT/package.nix" +WORKING_NIX="$TMPDIR/package.nix" cp "$DEFAULT_NIX" "$WORKING_NIX" sed -i "s@version = .*;@version = \"$VERSION\";@g" "$WORKING_NIX" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9a1c7a5c4ce0..1d9606cd310c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12225,8 +12225,6 @@ with pkgs; pineapple-pictures = qt6Packages.callPackage ../applications/graphics/pineapple-pictures { }; - plexamp = callPackage ../applications/audio/plexamp { }; - plex-mpv-shim = python3Packages.callPackage ../applications/video/plex-mpv-shim { }; plover = recurseIntoAttrs (libsForQt5.callPackage ../applications/misc/plover { });