diff --git a/pkgs/by-name/li/libcotp/package.nix b/pkgs/by-name/li/libcotp/package.nix index 3fe41d69cd33..e8c51602e239 100644 --- a/pkgs/by-name/li/libcotp/package.nix +++ b/pkgs/by-name/li/libcotp/package.nix @@ -6,24 +6,21 @@ pkg-config, libgcrypt, }: - stdenv.mkDerivation (finalAttrs: { pname = "libcotp"; - version = "3.1.1"; + version = "4.1.0"; + + __structuredAttrs = true; src = fetchFromGitHub { owner = "paolostivanin"; repo = "libcotp"; - rev = "v${finalAttrs.version}"; - sha256 = "sha256-5Jjk8uby1QjvU7TraTTTp+29Yh5lzbCvlorfPbGvciM="; + tag = "v${finalAttrs.version}"; + hash = "sha256-iNmCQHAl2LIkdJiVByc9CWiJSTo1HIz5Ma5Xjo2n9mA="; }; - postPatch = lib.optionalString stdenv.cc.isClang '' - substituteInPlace CMakeLists.txt \ - --replace "add_link_options(-Wl," "# add_link_options(-Wl," - ''; - buildInputs = [ libgcrypt ]; + nativeBuildInputs = [ cmake pkg-config @@ -32,6 +29,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "C library that generates TOTP and HOTP"; homepage = "https://github.com/paolostivanin/libcotp"; + changelog = "https://github.com/paolostivanin/libcotp/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ alexbakker ]; platforms = lib.platforms.all; diff --git a/pkgs/by-name/ot/otpclient/package.nix b/pkgs/by-name/ot/otpclient/package.nix index 914ce9bc7b80..39187ded9172 100644 --- a/pkgs/by-name/ot/otpclient/package.nix +++ b/pkgs/by-name/ot/otpclient/package.nix @@ -4,30 +4,32 @@ fetchFromGitHub, cmake, pkg-config, - gtk3, + gtk4, wrapGAppsHook3, jansson, libgcrypt, - libzip, + libadwaita, libpng, libcotp, - protobuf, + glib, protobufc, qrencode, libsecret, libuuid, zbar, }: - stdenv.mkDerivation (finalAttrs: { pname = "otpclient"; - version = "4.2.0"; + version = "5.1.1"; + + strictDeps = true; + __structuredAttrs = true; src = fetchFromGitHub { owner = "paolostivanin"; repo = "otpclient"; tag = "v${finalAttrs.version}"; - hash = "sha256-KGtASCc07NGdjvQ8tIrnQIaEeld9H6z3odytKd8c5aQ="; + hash = "sha256-sKXxujzHNQUZj9XloQLsZR12ZhyiY+512FOqgkTrxyQ="; }; nativeBuildInputs = [ @@ -37,15 +39,15 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - gtk3 + gtk4 + glib + libadwaita jansson libcotp libgcrypt libpng libsecret libuuid - libzip - protobuf protobufc qrencode zbar @@ -54,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Highly secure and easy to use OTP client written in C/GTK that supports both TOTP and HOTP"; homepage = "https://github.com/paolostivanin/OTPClient"; - changelog = "https://github.com/paolostivanin/OTPClient/releases/tag/v${finalAttrs.version}"; + changelog = "https://github.com/paolostivanin/OTPClient/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ alexbakker ]; platforms = lib.platforms.linux;