From e39b5d7914eee9819bf9c15f1d696ebb0c848b63 Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Mon, 24 Mar 2025 00:20:33 +0000 Subject: [PATCH 1/4] authenticator: 4.5.0 -> 4.6.0 (cherry picked from commit a0ab65c18073e309c51cb8bc3faefe5946350b4b) --- pkgs/by-name/au/authenticator/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/au/authenticator/package.nix b/pkgs/by-name/au/authenticator/package.nix index 8a4779d649a0..f8a6075545b5 100644 --- a/pkgs/by-name/au/authenticator/package.nix +++ b/pkgs/by-name/au/authenticator/package.nix @@ -25,20 +25,20 @@ stdenv.mkDerivation rec { pname = "authenticator"; - version = "4.5.0"; + version = "4.6.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "Authenticator"; rev = version; - hash = "sha256-g4+ntBuAEH9sj61CiS5t95nMfCgaWJTgiwRXtwrUTs0="; + hash = "sha256-Kq/J/1+ROibR6NjfH/g760/CT4DZg1hIcsXQ4MHzrDc="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-XNAC1eA+11gAvMRu95huRM+YHdsrg5Sqpzb6F3Rgu5U="; + hash = "sha256-SQDr4jdCZzuizYWwJ5crrunqN8O2bCUv5gIslBduAZY="; }; preFixup = '' From 36bc96da9fa2b7931f8839cc8e15536bdfff461b Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Sat, 29 Mar 2025 03:20:33 +0000 Subject: [PATCH 2/4] authenticator: 4.6.0 -> 4.6.2 Diff: https://gitlab.gnome.org/World/Authenticator/-/compare/4.6.0..4.6.2 (cherry picked from commit c0f55b6a07ed24c626b74af726b45998d1e4e48f) --- pkgs/by-name/au/authenticator/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/au/authenticator/package.nix b/pkgs/by-name/au/authenticator/package.nix index f8a6075545b5..05e94ca580f3 100644 --- a/pkgs/by-name/au/authenticator/package.nix +++ b/pkgs/by-name/au/authenticator/package.nix @@ -25,20 +25,20 @@ stdenv.mkDerivation rec { pname = "authenticator"; - version = "4.6.0"; + version = "4.6.2"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "Authenticator"; rev = version; - hash = "sha256-Kq/J/1+ROibR6NjfH/g760/CT4DZg1hIcsXQ4MHzrDc="; + hash = "sha256-UvHIVUed4rxmjliaZ7jnwCjiHyvUDihoJyG3G+fYtow="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-SQDr4jdCZzuizYWwJ5crrunqN8O2bCUv5gIslBduAZY="; + hash = "sha256-iOIGm3egVtVM6Eb3W5/ys9nQV5so0dnv2ZODjQwrVyw="; }; preFixup = '' From dbc19c8d757d58a36ea1399e229adfbd2bdbc5d7 Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Fri, 28 Mar 2025 23:52:10 -0400 Subject: [PATCH 3/4] authenticator: format with nixfmt (cherry picked from commit 75de78d637ca8ca050e251c3e3fac8e889558a80) --- pkgs/by-name/au/authenticator/package.nix | 47 ++++++++++++----------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/pkgs/by-name/au/authenticator/package.nix b/pkgs/by-name/au/authenticator/package.nix index 05e94ca580f3..cce92cb43cf1 100644 --- a/pkgs/by-name/au/authenticator/package.nix +++ b/pkgs/by-name/au/authenticator/package.nix @@ -1,26 +1,27 @@ -{ lib -, stdenv -, fetchFromGitLab -, appstream-glib -, cargo -, desktop-file-utils -, meson -, ninja -, pkg-config -, rustPlatform -, rustc -, wrapGAppsHook4 -, gdk-pixbuf -, glib -, gst_all_1 -, gtk4 -, libadwaita -, openssl -, pipewire -, sqlite -, wayland -, zbar -, glycin-loaders +{ + lib, + stdenv, + fetchFromGitLab, + appstream-glib, + cargo, + desktop-file-utils, + meson, + ninja, + pkg-config, + rustPlatform, + rustc, + wrapGAppsHook4, + gdk-pixbuf, + glib, + gst_all_1, + gtk4, + libadwaita, + openssl, + pipewire, + sqlite, + wayland, + zbar, + glycin-loaders, }: stdenv.mkDerivation rec { From 9f881d807fb50fa20ad84c92b130cec7e5d8ddb1 Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Fri, 28 Mar 2025 23:54:50 -0400 Subject: [PATCH 4/4] authenticator: modernize (cherry picked from commit dbb90e1bf64a34678120bdaa2d06cd6b78c35722) --- pkgs/by-name/au/authenticator/package.nix | 27 ++++++++++++----------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/au/authenticator/package.nix b/pkgs/by-name/au/authenticator/package.nix index cce92cb43cf1..0fc6bb2e7c78 100644 --- a/pkgs/by-name/au/authenticator/package.nix +++ b/pkgs/by-name/au/authenticator/package.nix @@ -24,7 +24,7 @@ glycin-loaders, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "authenticator"; version = "4.6.2"; @@ -32,24 +32,16 @@ stdenv.mkDerivation rec { domain = "gitlab.gnome.org"; owner = "World"; repo = "Authenticator"; - rev = version; + tag = finalAttrs.version; hash = "sha256-UvHIVUed4rxmjliaZ7jnwCjiHyvUDihoJyG3G+fYtow="; }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - name = "${pname}-${version}"; + inherit (finalAttrs) pname version src; hash = "sha256-iOIGm3egVtVM6Eb3W5/ys9nQV5so0dnv2ZODjQwrVyw="; }; - preFixup = '' - gappsWrapperArgs+=( - # vp8enc preset - --prefix GST_PRESET_PATH : "${gst_all_1.gst-plugins-good}/share/gstreamer-1.0/presets" - # See https://gitlab.gnome.org/sophie-h/glycin/-/blob/0.1.beta.2/glycin/src/config.rs#L44 - --prefix XDG_DATA_DIRS : "${glycin-loaders}/share" - ) - ''; + strictDeps = true; nativeBuildInputs = [ appstream-glib @@ -81,6 +73,15 @@ stdenv.mkDerivation rec { zbar ]; + preFixup = '' + gappsWrapperArgs+=( + # vp8enc preset + --prefix GST_PRESET_PATH : "${gst_all_1.gst-plugins-good}/share/gstreamer-1.0/presets" + # See https://gitlab.gnome.org/sophie-h/glycin/-/blob/0.1.beta.2/glycin/src/config.rs#L44 + --prefix XDG_DATA_DIRS : "${glycin-loaders}/share" + ) + ''; + meta = { description = "Two-factor authentication code generator for GNOME"; mainProgram = "authenticator"; @@ -89,4 +90,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ austinbutler ]; platforms = lib.platforms.linux; }; -} +})