From 5e26b032730e5c41ddebe789e6eb5d44c6e0491f Mon Sep 17 00:00:00 2001 From: eljamm Date: Thu, 29 Aug 2024 14:10:54 +0100 Subject: [PATCH] taler-merchant: use `finalAttrs`, remove `with lib;` --- pkgs/by-name/ta/taler-merchant/package.nix | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/ta/taler-merchant/package.nix b/pkgs/by-name/ta/taler-merchant/package.nix index dcc45968894f..2154731dc028 100644 --- a/pkgs/by-name/ta/taler-merchant/package.nix +++ b/pkgs/by-name/ta/taler-merchant/package.nix @@ -13,8 +13,6 @@ }: let - version = "0.12.0"; - taler-wallet-core = fetchgit { url = "https://git.taler.net/wallet-core.git"; # https://taler.net/en/news/2024-23.html @@ -22,13 +20,13 @@ let hash = "sha256-5fyPPrRCKvHTgipIpKqHX3iH5f+wTuyfsAKgKmvl1nI="; }; in -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "taler-merchant"; - inherit version; + version = "0.12.0"; src = fetchgit { url = "https://git.taler.net/merchant.git"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; fetchSubmodules = true; hash = "sha256-BNIVlL+YPqqRZUhHOR/eH38dSHn/kNyCbMyz0ICxAMk="; }; @@ -88,7 +86,7 @@ stdenv.mkDerivation { checkTarget = "check"; - meta = with lib; { + meta = { description = '' This is the GNU Taler merchant backend. It provides the logic that should run at every GNU Taler merchant. The GNU Taler merchant is a RESTful backend that @@ -99,8 +97,8 @@ stdenv.mkDerivation { ''; homepage = "https://taler.net/"; changelog = "https://git.taler.net/merchant.git/tree/ChangeLog"; - license = licenses.agpl3Plus; - maintainers = with maintainers; [ astro ]; - platforms = platforms.linux; + license = lib.licenses.agpl3Plus; + maintainers = with lib.maintainers; [ astro ]; + platforms = lib.platforms.linux; }; -} +})