From 01fc61f585ea93e88371f89e95e25c2516014f36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 26 May 2020 17:31:42 -0300 Subject: [PATCH 1/2] gsettings-qt: 0.1.20170824 -> 0.2 - Update to version 0.2 - Upstream moved to gitlab (see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=951019). --- .../libraries/gsettings-qt/default.nix | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/gsettings-qt/default.nix b/pkgs/development/libraries/gsettings-qt/default.nix index 5f09f437f04f..27b03a04bdb8 100644 --- a/pkgs/development/libraries/gsettings-qt/default.nix +++ b/pkgs/development/libraries/gsettings-qt/default.nix @@ -1,16 +1,18 @@ -{ stdenv, fetchbzr, pkgconfig +{ stdenv, fetchFromGitLab, pkgconfig , qmake, qtbase, qtdeclarative, wrapQtAppsHook , glib, gobject-introspection }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "gsettings-qt"; - version = "0.1.20170824"; + version = "0.2"; - src = fetchbzr { - url = "http://bazaar.launchpad.net/~system-settings-touch/gsettings-qt/trunk"; - rev = "85"; - sha256 = "1kcw0fgdyndx9c0dyha11wkj0gi05spdc1adf1609mrinbb4rnyi"; + src = fetchFromGitLab { + group = "ubports"; + owner = "core"; + repo = pname; + rev = "v${version}"; + sha256 = "14l8xphw4jd9ckqba13cyxq0i362x8lfsd0zlfawwi2z1q1vqm92"; }; nativeBuildInputs = [ @@ -53,8 +55,8 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - description = "Qt/QML bindings for GSettings"; - homepage = "https://launchpad.net/gsettings-qt"; + description = "Library to access GSettings from Qt"; + homepage = "https://gitlab.com/ubports/core/gsettings-qt"; license = licenses.lgpl3; platforms = platforms.linux; maintainers = [ maintainers.romildo ]; From dbc9decefbb0114c8c838dc7638e491cab183164 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 26 May 2020 18:15:24 -0300 Subject: [PATCH 2/2] gsettings-qt: add update script --- pkgs/development/libraries/gsettings-qt/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/libraries/gsettings-qt/default.nix b/pkgs/development/libraries/gsettings-qt/default.nix index 27b03a04bdb8..cbba9c5fcea2 100644 --- a/pkgs/development/libraries/gsettings-qt/default.nix +++ b/pkgs/development/libraries/gsettings-qt/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchFromGitLab, pkgconfig , qmake, qtbase, qtdeclarative, wrapQtAppsHook , glib, gobject-introspection +, genericUpdater, common-updater-scripts }: stdenv.mkDerivation rec { @@ -54,6 +55,12 @@ stdenv.mkDerivation rec { done ''; + passthru.updateScript = genericUpdater { + inherit pname version; + rev-prefix = "v"; + versionLister = "${common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}"; + }; + meta = with stdenv.lib; { description = "Library to access GSettings from Qt"; homepage = "https://gitlab.com/ubports/core/gsettings-qt";