From 3d2d06a280c12ccce3778d526497e4acf977c6f0 Mon Sep 17 00:00:00 2001 From: Anna Aurora Date: Mon, 4 Nov 2024 19:07:07 +0100 Subject: [PATCH] kaufkauflist: 4.0.0 -> 4.0.2 --- .../ka}/kaufkauflist/default.nix | 4 +- pkgs/by-name/ka/kaufkauflist/package.nix | 53 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 - 3 files changed, 55 insertions(+), 4 deletions(-) rename pkgs/{applications/misc => by-name/ka}/kaufkauflist/default.nix (93%) create mode 100644 pkgs/by-name/ka/kaufkauflist/package.nix diff --git a/pkgs/applications/misc/kaufkauflist/default.nix b/pkgs/by-name/ka/kaufkauflist/default.nix similarity index 93% rename from pkgs/applications/misc/kaufkauflist/default.nix rename to pkgs/by-name/ka/kaufkauflist/default.nix index 895567ba659b30..cc723188b7a8c0 100644 --- a/pkgs/applications/misc/kaufkauflist/default.nix +++ b/pkgs/by-name/ka/kaufkauflist/default.nix @@ -21,14 +21,14 @@ let }; in buildNpmPackage rec { pname = "kaufkauflist"; - version = "4.0.0"; + version = "4.0.2"; src = fetchFromGitea { domain = "codeberg.org"; owner = "annaaurora"; repo = "kaufkauflist"; rev = "v${version}"; - hash = "sha256-x30K2dYxawfebdq//9OmCCG48w0V04tDTXpvRW7lfJI="; + hash = "sha256-AqlWjFQtUBnFb0cSuh+p9GDEV74qGSLd4KiPsvjvGm8="; }; npmDepsHash = "sha256-E3AXFwiRvrE2Swt7BfSfAoU5mQplSaSJ4q56pVfoEkQ="; diff --git a/pkgs/by-name/ka/kaufkauflist/package.nix b/pkgs/by-name/ka/kaufkauflist/package.nix new file mode 100644 index 00000000000000..93a4b70d7854b9 --- /dev/null +++ b/pkgs/by-name/ka/kaufkauflist/package.nix @@ -0,0 +1,53 @@ +{ lib +, buildPackages +, fetchFromGitHub +, buildNpmPackage +, fetchFromGitea +, nix-update-script +}: + +let + esbuild' = buildPackages.esbuild.override { + buildGoModule = args: buildPackages.buildGoModule (args // rec { + version = "0.19.11"; + src = fetchFromGitHub { + owner = "evanw"; + repo = "esbuild"; + rev = "v${version}"; + hash = "sha256-NUwjzOpHA0Ijuh0E69KXx8YVS5GTnKmob9HepqugbIU="; + }; + vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; + }); + }; +in buildNpmPackage rec { + pname = "kaufkauflist"; + version = "4.0.2"; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "annaaurora"; + repo = "kaufkauflist"; + rev = "v${version}"; + hash = ""; + }; + + npmDepsHash = "sha256-E3AXFwiRvrE2Swt7BfSfAoU5mQplSaSJ4q56pVfoEkQ="; + + ESBUILD_BINARY_PATH = lib.getExe esbuild'; + + postInstall = '' + mkdir -p $out/share/kaufkauflist $out/share/pocketbase + cp -vr build/* $out/share/kaufkauflist/ + cp -v pb_schema.json $out/share/pocketbase/ + ''; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + homepage = "https://codeberg.org/annaaurora/kaufkauflist"; + description = "To-do list for shopping or other use cases"; + license = licenses.mit; + maintainers = with maintainers; [ annaaurora ]; + mainProgram = "kaufdbclean"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 886bbda236365a..813b6079807b80 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1798,8 +1798,6 @@ with pkgs; kanata-with-cmd = kanata.override { withCmd = true; }; - kaufkauflist = callPackage ../applications/misc/kaufkauflist { }; - kdocker = libsForQt5.callPackage ../tools/X11/kdocker { }; kicli = callPackage ../tools/misc/kicli { };