diff --git a/pkgs/by-name/ei/eintopf/frontend.nix b/pkgs/by-name/ei/eintopf/frontend.nix index c87c850eeb0660..08108d97081ac4 100644 --- a/pkgs/by-name/ei/eintopf/frontend.nix +++ b/pkgs/by-name/ei/eintopf/frontend.nix @@ -1,11 +1,12 @@ -{ stdenv -, fetchYarnDeps -, fixup-yarn-lock -, yarn -, src -, version -, nodejs -, eintopf +{ + stdenv, + fetchYarnDeps, + src, + version, + nodejs, + eintopf, + yarnConfigHook, + yarnBuildHook, }: stdenv.mkDerivation (finalAttrs: { @@ -16,35 +17,16 @@ stdenv.mkDerivation (finalAttrs: { offlineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/backstage/yarn.lock"; - hash = "sha256-7Br2FBhLZf7Cuul5n55EHfqyW8GbujB+yZ/RK6f7I4M="; + hash = "sha256-3TPBrQxvTfmBfhAavHy8eDcZwRZMwu0dCovnE1fcuTE="; }; nativeBuildInputs = [ - fixup-yarn-lock + yarnConfigHook + yarnBuildHook + # Needed for executing package.json scripts nodejs - yarn ]; - configurePhase = '' - runHook preConfigure - - export HOME=$(mktemp -d) - yarn config --offline set yarn-offline-mirror $offlineCache - fixup-yarn-lock yarn.lock - yarn --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive install - patchShebangs node_modules - - runHook postConfigure - ''; - - buildPhase = '' - runHook preBuild - - yarn --offline build - - runHook postBuild - ''; - installPhase = '' runHook preInstall @@ -57,6 +39,11 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = { - inherit (eintopf.meta) homepage description license maintainers; + inherit (eintopf.meta) + homepage + description + license + maintainers + ; }; }) diff --git a/pkgs/by-name/ei/eintopf/package.nix b/pkgs/by-name/ei/eintopf/package.nix index fddd943b7af6a9..8cb08bc68d56e0 100644 --- a/pkgs/by-name/ei/eintopf/package.nix +++ b/pkgs/by-name/ei/eintopf/package.nix @@ -1,18 +1,19 @@ -{ lib -, buildGoModule -, fetchFromGitea -, callPackage -, nixosTests +{ + lib, + buildGoModule, + fetchFromGitea, + callPackage, + nixosTests, }: let - version = "0.14.1"; + version = "0.14.2"; src = fetchFromGitea { domain = "codeberg.org"; owner = "Klasse-Methode"; repo = "eintopf"; rev = "v${version}"; - hash = "sha256-+QEAUyAqFLcc3bhGI3v4FxhDt+3P6vBnxWsFPp56lfg="; + hash = "sha256-38lVbgAjKsg/yXGFmIdw4KmvfIDCAE3K6qhvza3c+dU="; }; frontend = callPackage ./frontend.nix { inherit src version; }; in @@ -21,7 +22,7 @@ buildGoModule rec { pname = "eintopf"; inherit version src; - vendorHash = "sha256-ODVCZWxkPWW8ZlONiVXwVQalsLIUl9x512JimLAUm6U="; + vendorHash = "sha256-ysAgyaewREI8TaMnKH+kh33QT6AN1eLhog35lv7CbVU="; ldflags = [ "-s" @@ -44,12 +45,11 @@ buildGoModule rec { inherit (nixosTests) eintopf; }; - meta = with lib; { + meta = { description = "A calendar for Stuttgart, showing events, groups and places"; homepage = "https://codeberg.org/Klasse-Methode/eintopf"; - license = licenses.agpl3Only; - maintainers = with maintainers; [ onny ]; - platforms = platforms.unix; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ onny ]; + platforms = lib.platforms.unix; }; } -