Merge pull request #306914 from jopejoe1/accounts-qt/update-staging/1.17
kdePackages.accounts-qt: update repo and homepage
This commit is contained in:
@@ -1,15 +1,15 @@
|
||||
{ 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 {
|
||||
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 = "nicolasfella";
|
||||
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 ];
|
||||
@@ -21,11 +21,15 @@ stdenv.mkDerivation {
|
||||
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";
|
||||
homepage = "https://gitlab.com/accounts-sso";
|
||||
homepage = "https://gitlab.com/accounts-sso/libaccounts-qt";
|
||||
license = licenses.lgpl21;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -1,17 +1,17 @@
|
||||
{ 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 {
|
||||
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,11 +46,17 @@ stdenv.mkDerivation rec {
|
||||
LC_ALL = "en_US.UTF-8";
|
||||
|
||||
mesonFlags = [
|
||||
"-Dinstall-py-overrides=true"
|
||||
"-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";
|
||||
platforms = platforms.linux;
|
||||
license = licenses.lgpl21;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user