From 3c59a7e43fe7e2ac4afd51e9e0befdacbdb06451 Mon Sep 17 00:00:00 2001 From: Frank Lanitz Date: Wed, 11 Sep 2024 20:51:41 +0200 Subject: [PATCH 1/3] homebank: move to pkgs/by-name --- .../homebank/default.nix => by-name/ho/homebank/package.nix} | 4 ++-- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) rename pkgs/{applications/office/homebank/default.nix => by-name/ho/homebank/package.nix} (82%) diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/by-name/ho/homebank/package.nix similarity index 82% rename from pkgs/applications/office/homebank/default.nix rename to pkgs/by-name/ho/homebank/package.nix index ef61bb15c301..38ed47bb0b69 100644 --- a/pkgs/applications/office/homebank/default.nix +++ b/pkgs/by-name/ho/homebank/package.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, gtk, pkg-config, libofx, intltool, wrapGAppsHook3 +{ fetchurl, lib, stdenv, gtk3, pkg-config, libofx, intltool, wrapGAppsHook3 , libsoup_3, adwaita-icon-theme }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config wrapGAppsHook3 intltool ]; - buildInputs = [ gtk libofx libsoup_3 adwaita-icon-theme]; + buildInputs = [ gtk3 libofx libsoup_3 adwaita-icon-theme]; meta = with lib; { description = "Free, easy, personal accounting for everyone"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7c4d82f04ae2..d5d3b291e597 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30187,10 +30187,6 @@ with pkgs; hmm = callPackage ../applications/misc/hmm { }; - homebank = callPackage ../applications/office/homebank { - gtk = gtk3; - }; - hollywood = callPackage ../applications/misc/hollywood { inherit (python3Packages) pygments; }; From 37ca64fd76eba15a8a998657c6122e5018a239ee Mon Sep 17 00:00:00 2001 From: Frank Lanitz Date: Wed, 11 Sep 2024 20:58:04 +0200 Subject: [PATCH 2/3] homebank: 5.8.2 -> 5.8.3 --- pkgs/by-name/ho/homebank/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ho/homebank/package.nix b/pkgs/by-name/ho/homebank/package.nix index 38ed47bb0b69..ffc14ea79630 100644 --- a/pkgs/by-name/ho/homebank/package.nix +++ b/pkgs/by-name/ho/homebank/package.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { pname = "homebank"; - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { url = "https://www.gethomebank.org/public/sources/homebank-${version}.tar.gz"; - hash = "sha256-1CpForKKHXp6le8vVlObm22VTh2LqQlI9Qk4bwlzfLA="; + hash = "sha256-5Ag9UjAdxT5R6cYV6VT7ktaVHqd0kzQoLCpfS5q5xMI="; }; nativeBuildInputs = [ pkg-config wrapGAppsHook3 intltool ]; From 9a43175f8aaaa09bc8774138c4e99710dd991c9b Mon Sep 17 00:00:00 2001 From: Frank Lanitz Date: Fri, 13 Sep 2024 09:51:11 +0200 Subject: [PATCH 3/3] homebank: format --- pkgs/by-name/ho/homebank/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ho/homebank/package.nix b/pkgs/by-name/ho/homebank/package.nix index ffc14ea79630..ff5a4f5e86fb 100644 --- a/pkgs/by-name/ho/homebank/package.nix +++ b/pkgs/by-name/ho/homebank/package.nix @@ -5,12 +5,13 @@ stdenv.mkDerivation rec { pname = "homebank"; version = "5.8.3"; src = fetchurl { - url = "https://www.gethomebank.org/public/sources/homebank-${version}.tar.gz"; + url = + "https://www.gethomebank.org/public/sources/homebank-${version}.tar.gz"; hash = "sha256-5Ag9UjAdxT5R6cYV6VT7ktaVHqd0kzQoLCpfS5q5xMI="; }; nativeBuildInputs = [ pkg-config wrapGAppsHook3 intltool ]; - buildInputs = [ gtk3 libofx libsoup_3 adwaita-icon-theme]; + buildInputs = [ gtk3 libofx libsoup_3 adwaita-icon-theme ]; meta = with lib; { description = "Free, easy, personal accounting for everyone";