lol

Merge pull request #306914 from jopejoe1/accounts-qt/update-staging/1.17

kdePackages.accounts-qt: update repo and homepage

authored by

K900 and committed by
GitHub
8ac30cf4 56cfc87a

+22 -12
+12 -8
pkgs/development/libraries/accounts-qt/default.nix
··· 1 - { stdenv, lib, fetchFromGitLab, doxygen, glib, libaccounts-glib, pkg-config, qmake, qtbase, wrapQtAppsHook }: 1 + { stdenv, lib, fetchFromGitLab, gitUpdater, doxygen, glib, libaccounts-glib, pkg-config, qmake, qtbase, wrapQtAppsHook }: 2 2 3 - stdenv.mkDerivation { 3 + stdenv.mkDerivation (finalAttrs: { 4 4 pname = "accounts-qt"; 5 - version = "1.16-unstable-2023-11-24"; 5 + version = "1.17"; 6 6 7 7 # pinned to fork with Qt6 support 8 8 src = fetchFromGitLab { 9 - owner = "nicolasfella"; 9 + owner = "accounts-sso"; 10 10 repo = "libaccounts-qt"; 11 - rev = "18557f7def9af8f4a9e0e93e9f575ae11e5066aa"; 12 - hash = "sha256-8FGZmg2ljSh1DYZfklMTrWN7Sdlk/Atw0qfpbb+GaBc="; 11 + rev = "refs/tags/VERSION_${finalAttrs.version}"; 12 + hash = "sha256-mPZgD4r7vlUP6wklvZVknGqTXZBckSOtNzK7p6e2qSA="; 13 13 }; 14 14 15 15 propagatedBuildInputs = [ glib libaccounts-glib ]; ··· 21 21 patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" "$out"/bin/* 22 22 ''; 23 23 24 + passthru.updateScript = gitUpdater { 25 + rev = "VERSION_"; 26 + }; 27 + 24 28 meta = with lib; { 25 29 description = "Qt library for accessing the online accounts database"; 26 30 mainProgram = "accountstest"; 27 - homepage = "https://gitlab.com/accounts-sso"; 31 + homepage = "https://gitlab.com/accounts-sso/libaccounts-qt"; 28 32 license = licenses.lgpl21; 29 33 platforms = platforms.linux; 30 34 }; 31 - } 35 + })
+10 -4
pkgs/development/libraries/libaccounts-glib/default.nix
··· 1 - { lib, stdenv, fetchFromGitLab, meson, mesonEmulatorHook, ninja, glib, check, python3, vala, gtk-doc, glibcLocales 1 + { lib, stdenv, fetchFromGitLab, gitUpdater, meson, mesonEmulatorHook, ninja, glib, check, python3, vala, gtk-doc, glibcLocales 2 2 , libxml2, libxslt, pkg-config, sqlite, docbook_xsl, docbook_xml_dtd_43, gobject-introspection }: 3 3 4 4 stdenv.mkDerivation rec { 5 5 pname = "libaccounts-glib"; 6 - version = "1.26"; 6 + version = "1.27"; 7 7 8 8 outputs = [ "out" "dev" "devdoc" "py" ]; 9 9 10 10 src = fetchFromGitLab { 11 11 owner = "accounts-sso"; 12 12 repo = "libaccounts-glib"; 13 - rev = version; 14 - sha256 = "sha256-KVKylt+XjLfidsS2KzT7oFXP6rTR528lYAUP8dffu7k="; 13 + rev = "VERSION_${version}"; 14 + sha256 = "sha256-mLhcwp8rhCGSB1K6rTWT0tuiINzgwULwXINfCbgPKEg="; 15 15 }; 16 16 17 17 nativeBuildInputs = [ ··· 46 46 LC_ALL = "en_US.UTF-8"; 47 47 48 48 mesonFlags = [ 49 + "-Dinstall-py-overrides=true" 49 50 "-Dpy-overrides-dir=${placeholder "py"}/${python3.sitePackages}/gi/overrides" 50 51 ]; 51 52 53 + passthru.updateScript = gitUpdater { 54 + rev = "VERSION_"; 55 + }; 56 + 52 57 meta = with lib; { 53 58 description = "Library for managing accounts which can be used from GLib applications"; 59 + homepage = "https://gitlab.com/accounts-sso/libaccounts-glib"; 54 60 platforms = platforms.linux; 55 61 license = licenses.lgpl21; 56 62 };