From 92283e00bdb7d84a4ec5fcb4ef5e277d1624f7e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 16 Apr 2023 08:20:44 +0200 Subject: [PATCH 1/2] ferdium: 6.2.4 -> 6.2.6 --- .../networking/instant-messengers/ferdium/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/ferdium/default.nix b/pkgs/applications/networking/instant-messengers/ferdium/default.nix index 813e1973e551..209656171632 100644 --- a/pkgs/applications/networking/instant-messengers/ferdium/default.nix +++ b/pkgs/applications/networking/instant-messengers/ferdium/default.nix @@ -3,10 +3,10 @@ mkFranzDerivation rec { pname = "ferdium"; name = "Ferdium"; - version = "6.2.4"; + version = "6.2.6"; src = fetchurl { url = "https://github.com/ferdium/ferdium-app/releases/download/v${version}/Ferdium-linux-${version}-amd64.deb"; - sha256 = "sha256-iat0d06IhupMVYfK8Ot14gBY+5rHO4e/lVYqbX9ucIo="; + sha256 = "sha256-jG3NdolWqQzj/62jYwnqJHz5uT6QIuOkrpL/FcLl56k="; }; extraBuildInputs = [ xorg.libxshmfence ]; From ae1b465987dcf9fb85d6c428e81d513983d59bc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 16 Apr 2023 08:22:24 +0200 Subject: [PATCH 2/2] ferdium: add update script --- .../networking/instant-messengers/ferdium/default.nix | 8 +++++++- .../networking/instant-messengers/franz/generic.nix | 9 +++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/ferdium/default.nix b/pkgs/applications/networking/instant-messengers/ferdium/default.nix index 209656171632..0ff76e418862 100644 --- a/pkgs/applications/networking/instant-messengers/ferdium/default.nix +++ b/pkgs/applications/networking/instant-messengers/ferdium/default.nix @@ -1,4 +1,4 @@ -{ lib, mkFranzDerivation, fetchurl, xorg }: +{ lib, mkFranzDerivation, fetchurl, xorg, nix-update-script }: mkFranzDerivation rec { pname = "ferdium"; @@ -11,6 +11,12 @@ mkFranzDerivation rec { extraBuildInputs = [ xorg.libxshmfence ]; + passthru = { + updateScript = nix-update-script { + extraArgs = [ "--override-filename" ./default.nix ]; + }; + }; + meta = with lib; { description = "All your services in one place built by the community"; homepage = "https://ferdium.org/"; diff --git a/pkgs/applications/networking/instant-messengers/franz/generic.nix b/pkgs/applications/networking/instant-messengers/franz/generic.nix index 44546aabe223..b48acec1d32b 100644 --- a/pkgs/applications/networking/instant-messengers/franz/generic.nix +++ b/pkgs/applications/networking/instant-messengers/franz/generic.nix @@ -28,9 +28,10 @@ # Helper function for building a derivation for Franz and forks. -{ pname, name, version, src, meta, extraBuildInputs ? [] }: - -stdenv.mkDerivation rec { +{ pname, name, version, src, meta, extraBuildInputs ? [], ... } @ args: +let + cleanedArgs = builtins.removeAttrs args [ "pname" "name" "version" "src" "meta" "extraBuildInputs" ]; +in stdenv.mkDerivation (rec { inherit pname version src meta; # Don't remove runtime deps. @@ -91,4 +92,4 @@ stdenv.mkDerivation rec { --suffix PATH : ${xdg-utils}/bin \ "''${gappsWrapperArgs[@]}" ''; -} +} // cleanedArgs)