From 6a1c2f6836072633b1d246f75c3fefeed27480f6 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Thu, 18 Jan 2024 14:21:47 -0500 Subject: [PATCH] audiobookshelf: move to pkgs/by-name --- .../au/audiobookshelf/package.nix} | 0 pkgs/{servers => by-name/au}/audiobookshelf/source.json | 0 pkgs/{servers => by-name/au}/audiobookshelf/update.nu | 9 +++++---- pkgs/{servers => by-name/au}/audiobookshelf/wrapper.nix | 0 pkgs/top-level/all-packages.nix | 2 -- 5 files changed, 5 insertions(+), 6 deletions(-) rename pkgs/{servers/audiobookshelf/default.nix => by-name/au/audiobookshelf/package.nix} (100%) rename pkgs/{servers => by-name/au}/audiobookshelf/source.json (100%) rename pkgs/{servers => by-name/au}/audiobookshelf/update.nu (73%) rename pkgs/{servers => by-name/au}/audiobookshelf/wrapper.nix (100%) diff --git a/pkgs/servers/audiobookshelf/default.nix b/pkgs/by-name/au/audiobookshelf/package.nix similarity index 100% rename from pkgs/servers/audiobookshelf/default.nix rename to pkgs/by-name/au/audiobookshelf/package.nix diff --git a/pkgs/servers/audiobookshelf/source.json b/pkgs/by-name/au/audiobookshelf/source.json similarity index 100% rename from pkgs/servers/audiobookshelf/source.json rename to pkgs/by-name/au/audiobookshelf/source.json diff --git a/pkgs/servers/audiobookshelf/update.nu b/pkgs/by-name/au/audiobookshelf/update.nu similarity index 73% rename from pkgs/servers/audiobookshelf/update.nu rename to pkgs/by-name/au/audiobookshelf/update.nu index 005d0193a076..25166c9cf1d1 100755 --- a/pkgs/servers/audiobookshelf/update.nu +++ b/pkgs/by-name/au/audiobookshelf/update.nu @@ -2,14 +2,15 @@ #!nix-shell -i nu -p nushell common-updater-scripts prefetch-npm-deps def main [] { + let sourceFile = $"(pwd)/pkgs/by-name/au/audiobookshelf/source.json" let tags = list-git-tags --url=https://github.com/advplyr/audiobookshelf | lines | sort --natural | str replace v '' let latest_tag = $tags | last - let current_version = open ./pkgs/servers/audiobookshelf/source.json | get version + let current_version = open $sourceFile | get version if $latest_tag != $current_version { let source = nix-prefetch-github advplyr audiobookshelf --rev $"v($latest_tag)" | from json | merge { version: $latest_tag, depsHash: "", clientDepsHash: ""} - $source | save --force $"(pwd)/pkgs/servers/audiobookshelf/source.json" + $source | save --force $sourceFile let srcPath = nix-build $env.PWD -A audiobookshelf.src | complete | get stdout | lines | first @@ -19,10 +20,10 @@ def main [] { $source | merge { depsHash: (prefetch-npm-deps $"($srcPath)/package-lock.json"), clientDepsHash: (prefetch-npm-deps $"($srcPath)/client/package-lock.json") - } | save --force $"(pwd)/pkgs/servers/audiobookshelf/source.json" + } | save --force $sourceFile # appease the editorconfig CI check - echo "\n" | save --append $"(pwd)/pkgs/servers/audiobookshelf/source.json" + echo "\n" | save --append $sourceFile } {before: $current_version, after: $latest_tag} diff --git a/pkgs/servers/audiobookshelf/wrapper.nix b/pkgs/by-name/au/audiobookshelf/wrapper.nix similarity index 100% rename from pkgs/servers/audiobookshelf/wrapper.nix rename to pkgs/by-name/au/audiobookshelf/wrapper.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 961f8c4d61cd..cab33571a1a5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1721,8 +1721,6 @@ with pkgs; audible-cli = callPackage ../tools/misc/audible-cli { }; - audiobookshelf = callPackage ../servers/audiobookshelf { }; - auditwheel = with python3Packages; toPythonApplication auditwheel; amidst = callPackage ../tools/games/minecraft/amidst { };