From b7894e3485baee5e91543ed6186ae6426dcd8965 Mon Sep 17 00:00:00 2001 From: Ryan Omasta Date: Mon, 29 Sep 2025 00:24:49 -0600 Subject: [PATCH 1/3] gnucash: 5.12 -> 5.13 https://github.com/Gnucash/gnucash/releases/tag/5.13 Diff: https://github.com/Gnucash/gnucash/compare/5.12...5.13 --- pkgs/by-name/gn/gnucash/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/gn/gnucash/package.nix b/pkgs/by-name/gn/gnucash/package.nix index e48743dd7211..34143f76310d 100644 --- a/pkgs/by-name/gn/gnucash/package.nix +++ b/pkgs/by-name/gn/gnucash/package.nix @@ -37,12 +37,12 @@ let in stdenv.mkDerivation rec { pname = "gnucash"; - version = "5.12"; + version = "5.13"; # raw source code doesn't work out of box; fetchFromGitHub not usable src = fetchurl { url = "https://github.com/Gnucash/gnucash/releases/download/${version}/gnucash-${version}.tar.bz2"; - hash = "sha256-s1tHVr4SvP2+1URo8wRD+lPyOFIKnOrVveLmxHc/vzk="; + hash = "sha256-CC7swzK3IvIj0/JRJibr5e9j+UqvXECeh1JsZURkrvU="; }; nativeBuildInputs = [ @@ -125,8 +125,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "Gnucash"; repo = "gnucash-docs"; - rev = version; - hash = "sha256-9hXOgHdNtTcPOf44L2RrfOTXAgJi2Xu6gWnjDU7gHjU="; + tag = version; + hash = "sha256-EVK36JzK8BPe6St4FhhZEqdc07oaiePJ/EH2NHm3r1U="; }; nativeBuildInputs = [ cmake ]; From 6c6f11aa03121bee338e262e98fa8d433ad1adef Mon Sep 17 00:00:00 2001 From: Ryan Omasta Date: Mon, 29 Sep 2025 00:26:37 -0600 Subject: [PATCH 2/3] gnucash: `rec` -> `finalAttrs` --- pkgs/by-name/gn/gnucash/package.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/gn/gnucash/package.nix b/pkgs/by-name/gn/gnucash/package.nix index 34143f76310d..82d7d6cac38d 100644 --- a/pkgs/by-name/gn/gnucash/package.nix +++ b/pkgs/by-name/gn/gnucash/package.nix @@ -35,13 +35,13 @@ let ] ); in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnucash"; version = "5.13"; # raw source code doesn't work out of box; fetchFromGitHub not usable src = fetchurl { - url = "https://github.com/Gnucash/gnucash/releases/download/${version}/gnucash-${version}.tar.bz2"; + url = "https://github.com/Gnucash/gnucash/releases/download/${finalAttrs.version}/gnucash-${finalAttrs.version}.tar.bz2"; hash = "sha256-CC7swzK3IvIj0/JRJibr5e9j+UqvXECeh1JsZURkrvU="; }; @@ -100,7 +100,7 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace bindings/python/__init__.py \ --subst-var-by gnc_dbd_dir "${libdbiDrivers}/lib/dbd" \ - --subst-var-by gsettings_schema_dir ${glib.makeSchemaPath "$out" "gnucash-${version}"}; + --subst-var-by gsettings_schema_dir ${glib.makeSchemaPath "$out" "gnucash-${finalAttrs.version}"}; ''; # this needs to be an environment variable and not a cmake flag to suppress @@ -120,12 +120,12 @@ stdenv.mkDerivation rec { passthru.docs = stdenv.mkDerivation { pname = "gnucash-docs"; - inherit version; + inherit (finalAttrs) version; src = fetchFromGitHub { owner = "Gnucash"; repo = "gnucash-docs"; - tag = version; + tag = finalAttrs.version; hash = "sha256-EVK36JzK8BPe6St4FhhZEqdc07oaiePJ/EH2NHm3r1U="; }; @@ -139,11 +139,11 @@ stdenv.mkDerivation rec { preFixup = '' gappsWrapperArgs+=( # documentation - --prefix XDG_DATA_DIRS : ${passthru.docs}/share + --prefix XDG_DATA_DIRS : ${finalAttrs.passthru.docs}/share # db drivers location --set GNC_DBD_DIR ${libdbiDrivers}/lib/dbd # gsettings schema location on Nix - --set GSETTINGS_SCHEMA_DIR ${glib.makeSchemaPath "$out" "gnucash-${version}"} + --set GSETTINGS_SCHEMA_DIR ${glib.makeSchemaPath "$out" "gnucash-${finalAttrs.version}"} ) ''; @@ -208,5 +208,5 @@ stdenv.mkDerivation rec { platforms = platforms.unix; mainProgram = "gnucash"; }; -} +}) # TODO: investigate Darwin support From 15ae8ba51dbaeafed09a6d7e29c402a999dc9da9 Mon Sep 17 00:00:00 2001 From: Ryan Omasta Date: Mon, 29 Sep 2025 00:27:17 -0600 Subject: [PATCH 3/3] gnucash: remove `with lib;` --- pkgs/by-name/gn/gnucash/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/gn/gnucash/package.nix b/pkgs/by-name/gn/gnucash/package.nix index 82d7d6cac38d..f615bf6a1936 100644 --- a/pkgs/by-name/gn/gnucash/package.nix +++ b/pkgs/by-name/gn/gnucash/package.nix @@ -177,7 +177,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = ./update.sh; - meta = with lib; { + meta = { homepage = "https://www.gnucash.org/"; description = "Free software for double entry accounting"; longDescription = '' @@ -200,12 +200,12 @@ stdenv.mkDerivation (finalAttrs: { - Scheduled Transactions - Financial Calculations ''; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ nevivurn ryand56 ]; - platforms = platforms.unix; + platforms = lib.platforms.unix; mainProgram = "gnucash"; }; })