diff --git a/pkgs/servers/homepage-dashboard/default.nix b/pkgs/by-name/ho/homepage-dashboard/package.nix similarity index 96% rename from pkgs/servers/homepage-dashboard/default.nix rename to pkgs/by-name/ho/homepage-dashboard/package.nix index 76a08bfec7e6..86312d3f06e9 100644 --- a/pkgs/servers/homepage-dashboard/default.nix +++ b/pkgs/by-name/ho/homepage-dashboard/package.nix @@ -7,7 +7,7 @@ python3, stdenv, cctools, - IOKit, + darwin, lib, nixosTests, enableLocalIcons ? false, @@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ nodePackages.node-gyp-build - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ IOKit ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.IOKit ]; env.PYTHON = "${python3}/bin/python"; diff --git a/pkgs/servers/homepage-dashboard/prerender_cache_path.patch b/pkgs/by-name/ho/homepage-dashboard/prerender_cache_path.patch similarity index 100% rename from pkgs/servers/homepage-dashboard/prerender_cache_path.patch rename to pkgs/by-name/ho/homepage-dashboard/prerender_cache_path.patch diff --git a/pkgs/servers/homepage-dashboard/update.sh b/pkgs/by-name/ho/homepage-dashboard/update.sh similarity index 90% rename from pkgs/servers/homepage-dashboard/update.sh rename to pkgs/by-name/ho/homepage-dashboard/update.sh index 4b5069626263..e8f0ced770c5 100755 --- a/pkgs/servers/homepage-dashboard/update.sh +++ b/pkgs/by-name/ho/homepage-dashboard/update.sh @@ -38,8 +38,8 @@ update_homepage_dashboard_source() { old_version="$(nix eval --json --impure --expr "(import $nixpkgs/default.nix {}).homepage-dashboard.version" | jq -r)" new_hash="$(nix-build --impure --expr "let src = (import $nixpkgs/default.nix {}).homepage-dashboard.src; in (src.overrideAttrs or (f: src // f src)) (_: { version = \"$version\"; outputHash = \"\"; outputHashAlgo = \"sha256\"; })" 2>&1 | tr -s ' ' | grep -Po "got: \K.+$")" || true - sed -i "s|${old_hash}|${new_hash}|g" default.nix - sed -i "s|${old_version}|${version}|g" default.nix + sed -i "s|${old_hash}|${new_hash}|g" package.nix + sed -i "s|${old_version}|${version}|g" package.nix } # Update the hash of the homepage-dashboard pnpm dependencies in the Nix expression. @@ -49,12 +49,12 @@ update_pnpm_deps_hash() { old_hash="$(nix eval --json --impure --expr "(import $nixpkgs/default.nix {}).homepage-dashboard.pnpmDeps.outputHash" | jq -r)" new_hash="$(nix-build --impure --expr "let src = (import $nixpkgs/default.nix {}).homepage-dashboard.pnpmDeps; in (src.overrideAttrs or (f: src // f src)) (_: { outputHash = \"\"; outputHashAlgo = \"sha256\"; })" 2>&1 | tr -s ' ' | grep -Po "got: \K.+$")" || true - sed -i "s|${old_hash}|${new_hash}|g" default.nix + sed -i "s|${old_hash}|${new_hash}|g" package.nix } LATEST_TAG="$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} https://api.github.com/repos/gethomepage/homepage/releases/latest | jq -r '.tag_name')" LATEST_VERSION="$(expr "$LATEST_TAG" : 'v\(.*\)')" -CURRENT_VERSION="$(grep -Po "version = \"\K[^\"]+" default.nix)" +CURRENT_VERSION="$(nix eval --json --impure --expr "(import $nixpkgs/default.nix {}).homepage-dashboard.version" | jq -r)" if [[ "$CURRENT_VERSION" == "$LATEST_VERSION" ]]; then echo "homepage-dashboard is up to date: ${CURRENT_VERSION}" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d151a09dbac7..6d00dbd901aa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2328,10 +2328,6 @@ with pkgs; hocr-tools = with python3Packages; toPythonApplication hocr-tools; - homepage-dashboard = callPackage ../servers/homepage-dashboard { - inherit (darwin.apple_sdk.frameworks) IOKit; - }; - hopper = qt5.callPackage ../development/tools/analysis/hopper { }; hypr = callPackage ../applications/window-managers/hyprwm/hypr {