Merge pull request #244454 from jnsgruk/homepage-0.6.23

This commit is contained in:
Ryan Lahfa 2023-07-24 18:16:03 +02:00 committed by GitHub
commit 503101a4cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 13 deletions

View File

@ -2,6 +2,9 @@
, fetchFromGitHub , fetchFromGitHub
, nodePackages , nodePackages
, python3 , python3
, stdenv
, cctools
, IOKit
, lib , lib
, fetchpatch , fetchpatch
, makeBinaryWrapper , makeBinaryWrapper
@ -10,24 +13,16 @@
buildNpmPackage rec { buildNpmPackage rec {
pname = "homepage-dashboard"; pname = "homepage-dashboard";
version = "0.6.21"; version = "0.6.23";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "benphelps"; owner = "benphelps";
repo = "homepage"; repo = "homepage";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-kjxA02hJj/GAQ0fM1xTtXAnZSQgVyE+EMRrXis1Vr+o="; hash = "sha256-Nr090221lTW7luuzh/URdDPByILnjMChyZcV2+AUG3o=";
}; };
npmDepsHash = "sha256-O6SQYx5vxscMsbWv0ynUYqdUkOp/nMtdvlZ/Mp95sBY="; npmDepsHash = "sha256-l6kVmKXAQMqpzu/GTrz92WeDorLhunfcUrbMVfUwR9U=";
patches = [
(fetchpatch {
name = "env-config-dir.patch";
url = "https://github.com/benphelps/homepage/commit/ca396ce96bce52f6c06a321f292aa94a66ceeb97.patch";
hash = "sha256-eNnW/ce4ytoKR6jH1Ztc4UTWOmL0uGRdY6nYBIVYM6k=";
})
];
preBuild = '' preBuild = ''
mkdir -p config mkdir -p config
@ -39,8 +34,14 @@ buildNpmPackage rec {
patchShebangs .next/standalone/server.js patchShebangs .next/standalone/server.js
''; '';
nativeBuildInputs = lib.optionals stdenv.isDarwin [
cctools
];
buildInputs = [ buildInputs = [
nodePackages.node-gyp-build nodePackages.node-gyp-build
] ++ lib.optionals stdenv.isDarwin [
IOKit
]; ];
env.PYTHON = "${python3}/bin/python"; env.PYTHON = "${python3}/bin/python";
@ -68,7 +69,7 @@ buildNpmPackage rec {
doDist = false; doDist = false;
passthru.tests = { passthru.tests = {
inherit (nixosTests) homepage; inherit (nixosTests) homepage-dashboard;
}; };
meta = { meta = {

View File

@ -5455,7 +5455,10 @@ with pkgs;
home-manager = callPackage ../tools/package-management/home-manager { }; home-manager = callPackage ../tools/package-management/home-manager { };
homepage-dashboard = callPackage ../servers/homepage-dashboard { }; homepage-dashboard = callPackage ../servers/homepage-dashboard {
inherit (darwin) cctools;
inherit (darwin.apple_sdk.frameworks) IOKit;
};
hostsblock = callPackage ../tools/misc/hostsblock { }; hostsblock = callPackage ../tools/misc/hostsblock { };