From 3106fe526f5c57b619641932775f3889bd670f9a Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 26 Apr 2024 07:53:32 +0200 Subject: [PATCH 1/6] kdePackages.accounts-qt: update repo and homepage --- pkgs/development/libraries/accounts-qt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/accounts-qt/default.nix b/pkgs/development/libraries/accounts-qt/default.nix index 8a11d3375491..8f1eb1414582 100644 --- a/pkgs/development/libraries/accounts-qt/default.nix +++ b/pkgs/development/libraries/accounts-qt/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { # pinned to fork with Qt6 support src = fetchFromGitLab { - owner = "nicolasfella"; + owner = "accounts-sso"; repo = "libaccounts-qt"; rev = "18557f7def9af8f4a9e0e93e9f575ae11e5066aa"; hash = "sha256-8FGZmg2ljSh1DYZfklMTrWN7Sdlk/Atw0qfpbb+GaBc="; @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Qt library for accessing the online accounts database"; mainProgram = "accountstest"; - homepage = "https://gitlab.com/accounts-sso"; + homepage = "https://gitlab.com/accounts-sso/libaccounts-qt"; license = licenses.lgpl21; platforms = platforms.linux; }; From df93219d89112b8ef98c3c6de4cf7e896cd9a50f Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 26 Apr 2024 07:57:41 +0200 Subject: [PATCH 2/6] kdePackages.accounts-qt: 1.16-unstable-2023-11-24 -> 1.17 --- pkgs/development/libraries/accounts-qt/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/accounts-qt/default.nix b/pkgs/development/libraries/accounts-qt/default.nix index 8f1eb1414582..bd55149f69fa 100644 --- a/pkgs/development/libraries/accounts-qt/default.nix +++ b/pkgs/development/libraries/accounts-qt/default.nix @@ -1,15 +1,15 @@ { stdenv, lib, fetchFromGitLab, doxygen, glib, libaccounts-glib, pkg-config, qmake, qtbase, wrapQtAppsHook }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "accounts-qt"; - version = "1.16-unstable-2023-11-24"; + version = "1.17"; # pinned to fork with Qt6 support src = fetchFromGitLab { owner = "accounts-sso"; repo = "libaccounts-qt"; - rev = "18557f7def9af8f4a9e0e93e9f575ae11e5066aa"; - hash = "sha256-8FGZmg2ljSh1DYZfklMTrWN7Sdlk/Atw0qfpbb+GaBc="; + rev = "refs/tags/VERSION_${finalAttrs.version}"; + hash = "sha256-mPZgD4r7vlUP6wklvZVknGqTXZBckSOtNzK7p6e2qSA="; }; propagatedBuildInputs = [ glib libaccounts-glib ]; @@ -28,4 +28,4 @@ stdenv.mkDerivation { license = licenses.lgpl21; platforms = platforms.linux; }; -} +}) From a340e9732d8db06effcc2f34e70102c746d28880 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 26 Apr 2024 07:59:33 +0200 Subject: [PATCH 3/6] kdePackages.accounts-qt: add update script --- pkgs/development/libraries/accounts-qt/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/accounts-qt/default.nix b/pkgs/development/libraries/accounts-qt/default.nix index bd55149f69fa..8e5dd411fca2 100644 --- a/pkgs/development/libraries/accounts-qt/default.nix +++ b/pkgs/development/libraries/accounts-qt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitLab, doxygen, glib, libaccounts-glib, pkg-config, qmake, qtbase, wrapQtAppsHook }: +{ stdenv, lib, fetchFromGitLab, gitUpdater, doxygen, glib, libaccounts-glib, pkg-config, qmake, qtbase, wrapQtAppsHook }: stdenv.mkDerivation (finalAttrs: { pname = "accounts-qt"; @@ -21,6 +21,10 @@ stdenv.mkDerivation (finalAttrs: { patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" "$out"/bin/* ''; + passthru.updateScript = gitUpdater { + rev = "VERSION_"; + }; + meta = with lib; { description = "Qt library for accessing the online accounts database"; mainProgram = "accountstest"; From ddc85353e2a7496eda583bfed73cb37d94b8185a Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Mon, 29 Apr 2024 16:17:46 +0200 Subject: [PATCH 4/6] libaccounts-glib: update homepage --- pkgs/development/libraries/libaccounts-glib/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/libaccounts-glib/default.nix b/pkgs/development/libraries/libaccounts-glib/default.nix index c540f4bc26ec..f6da42f1e14b 100644 --- a/pkgs/development/libraries/libaccounts-glib/default.nix +++ b/pkgs/development/libraries/libaccounts-glib/default.nix @@ -51,6 +51,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Library for managing accounts which can be used from GLib applications"; + homepage = "https://gitlab.com/accounts-sso/libaccounts-glib"; platforms = platforms.linux; license = licenses.lgpl21; }; From 39cd4980613c26fbb27caed7be5a64048d82dc75 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Mon, 29 Apr 2024 16:21:03 +0200 Subject: [PATCH 5/6] libaccounts-glib: 1.26 -> 1.27 --- pkgs/development/libraries/libaccounts-glib/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libaccounts-glib/default.nix b/pkgs/development/libraries/libaccounts-glib/default.nix index f6da42f1e14b..cb04e6d0bec0 100644 --- a/pkgs/development/libraries/libaccounts-glib/default.nix +++ b/pkgs/development/libraries/libaccounts-glib/default.nix @@ -3,15 +3,15 @@ stdenv.mkDerivation rec { pname = "libaccounts-glib"; - version = "1.26"; + version = "1.27"; outputs = [ "out" "dev" "devdoc" "py" ]; src = fetchFromGitLab { owner = "accounts-sso"; repo = "libaccounts-glib"; - rev = version; - sha256 = "sha256-KVKylt+XjLfidsS2KzT7oFXP6rTR528lYAUP8dffu7k="; + rev = "VERSION_${version}"; + sha256 = "sha256-mLhcwp8rhCGSB1K6rTWT0tuiINzgwULwXINfCbgPKEg="; }; nativeBuildInputs = [ @@ -46,6 +46,7 @@ stdenv.mkDerivation rec { LC_ALL = "en_US.UTF-8"; mesonFlags = [ + "-Dinstall-py-overrides=true" "-Dpy-overrides-dir=${placeholder "py"}/${python3.sitePackages}/gi/overrides" ]; From e228b6d41a30ffe3e70dfbee28ba880820834b34 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Mon, 29 Apr 2024 16:22:01 +0200 Subject: [PATCH 6/6] libaccounts-glib: add update script --- pkgs/development/libraries/libaccounts-glib/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libaccounts-glib/default.nix b/pkgs/development/libraries/libaccounts-glib/default.nix index cb04e6d0bec0..310d13c978b3 100644 --- a/pkgs/development/libraries/libaccounts-glib/default.nix +++ b/pkgs/development/libraries/libaccounts-glib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, meson, mesonEmulatorHook, ninja, glib, check, python3, vala, gtk-doc, glibcLocales +{ lib, stdenv, fetchFromGitLab, gitUpdater, meson, mesonEmulatorHook, ninja, glib, check, python3, vala, gtk-doc, glibcLocales , libxml2, libxslt, pkg-config, sqlite, docbook_xsl, docbook_xml_dtd_43, gobject-introspection }: stdenv.mkDerivation rec { @@ -50,6 +50,10 @@ stdenv.mkDerivation rec { "-Dpy-overrides-dir=${placeholder "py"}/${python3.sitePackages}/gi/overrides" ]; + passthru.updateScript = gitUpdater { + rev = "VERSION_"; + }; + meta = with lib; { description = "Library for managing accounts which can be used from GLib applications"; homepage = "https://gitlab.com/accounts-sso/libaccounts-glib";