From e7b5ea29a036367afedcc007a20c477adfb3ff6c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 1 Feb 2021 18:59:24 +0100 Subject: [PATCH 1/4] libgda: clean up the expression This will make the diff against libgda6 smaller. --- pkgs/development/libraries/libgda/default.nix | 67 +++++++++++++++---- 1 file changed, 55 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/libgda/default.nix b/pkgs/development/libraries/libgda/default.nix index 73e71de4aac6..307cc14a6efe 100644 --- a/pkgs/development/libraries/libgda/default.nix +++ b/pkgs/development/libraries/libgda/default.nix @@ -1,7 +1,27 @@ -{ lib, stdenv, fetchurl, pkg-config, intltool, itstool, libxml2, gtk3, openssl, gnome3, gobject-introspection, vala, libgee -, overrideCC, gcc6, fetchpatch, autoreconfHook, gtk-doc, autoconf-archive, yelp-tools -, mysqlSupport ? false, libmysqlclient ? null -, postgresSupport ? false, postgresql ? null +{ lib +, stdenv +, fetchurl +, pkg-config +, intltool +, itstool +, libxml2 +, gtk3 +, openssl +, gnome3 +, gobject-introspection +, vala +, libgee +, overrideCC +, gcc6 +, fetchpatch +, autoreconfHook +, gtk-doc +, autoconf-archive +, yelp-tools +, mysqlSupport ? false +, libmysqlclient ? null +, postgresSupport ? false +, postgresql ? null }: assert mysqlSupport -> libmysqlclient != null; @@ -24,7 +44,30 @@ assert postgresSupport -> postgresql != null; }) ]; - configureFlags = with lib; [ + nativeBuildInputs = [ + pkg-config + intltool + itstool + libxml2 + gobject-introspection + vala + autoreconfHook + gtk-doc + autoconf-archive + yelp-tools + ]; + + buildInputs = [ + gtk3 + openssl + libgee + ] ++ lib.optionals mysqlSupport [ + libmysqlclient + ] ++ lib.optionals postgresSupport [ + postgresql + ]; + + configureFlags = [ "--with-mysql=${if mysqlSupport then "yes" else "no"}" "--with-postgres=${if postgresSupport then "yes" else "no"}" @@ -40,11 +83,6 @@ assert postgresSupport -> postgresql != null; hardeningDisable = [ "format" ]; - nativeBuildInputs = [ pkg-config intltool itstool libxml2 gobject-introspection vala autoreconfHook gtk-doc autoconf-archive yelp-tools ]; - buildInputs = with lib; [ gtk3 openssl libgee ] - ++ optional (mysqlSupport) libmysqlclient - ++ optional (postgresSupport) postgresql; - passthru = { updateScript = gnome3.updateScript { packageName = pname; @@ -54,8 +92,13 @@ assert postgresSupport -> postgresql != null; meta = with lib; { description = "Database access library"; homepage = "https://www.gnome-db.org/"; - license = [ licenses.lgpl2 licenses.gpl2 ]; + license = with licenses; [ + # library + lgpl2Plus + # CLI tools + gpl2Plus + ]; maintainers = teams.gnome.members; - platforms = platforms.linux ++ platforms.darwin; + platforms = platforms.unix; }; } From 4d77a1ef3948357fec9b68fbf33d173e4a4a90de Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 1 Feb 2021 18:54:28 +0100 Subject: [PATCH 2/4] libgda6: init at 6.0.0 https://blogs.gnome.org/despinosa/2021/01/31/gnome-data-access-6-0-released/ https://gitlab.gnome.org/GNOME/libgda/-/blob/LIBGDA_6_0_0/NEWS#L1-92 --- pkgs/development/libraries/libgda/6.x.nix | 92 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 94 insertions(+) create mode 100644 pkgs/development/libraries/libgda/6.x.nix diff --git a/pkgs/development/libraries/libgda/6.x.nix b/pkgs/development/libraries/libgda/6.x.nix new file mode 100644 index 000000000000..fc24fe41c4d3 --- /dev/null +++ b/pkgs/development/libraries/libgda/6.x.nix @@ -0,0 +1,92 @@ +{ lib +, stdenv +, fetchurl +, pkg-config +, intltool +, meson +, ninja +, itstool +, libxml2 +, python3 +, gtk3 +, json-glib +, isocodes +, openssl +, gnome3 +, gobject-introspection +, vala +, libgee +, sqlite +, gtk-doc +, yelp-tools +, mysqlSupport ? false +, libmysqlclient ? null +, postgresSupport ? false +, postgresql ? null +}: + +assert mysqlSupport -> libmysqlclient != null; +assert postgresSupport -> postgresql != null; + +stdenv.mkDerivation rec { + pname = "libgda"; + version = "6.0.0"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "0w564z7krgjk19r39mi5qn4kggpdg9ggbyn9pb4aavb61r14npwr"; + }; + + nativeBuildInputs = [ + pkg-config + intltool + meson + ninja + itstool + libxml2 + python3 + gobject-introspection + vala + gtk-doc + yelp-tools + ]; + + buildInputs = [ + gtk3 + json-glib + isocodes + openssl + libgee + sqlite + ] ++ lib.optionals mysqlSupport [ + libmysqlclient + ] ++ lib.optionals postgresSupport [ + postgresql + ]; + + postPatch = '' + patchShebangs \ + providers/raw_spec.py \ + providers/mysql/gen_bin.py + ''; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "libgda6"; + }; + }; + + meta = with lib; { + description = "Database access library"; + homepage = "https://www.gnome-db.org/"; + license = with licenses; [ + # library + lgpl2Plus + # CLI tools + gpl2Plus + ]; + maintainers = teams.gnome.members; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7f27d960d6e4..243417590ccd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14747,6 +14747,8 @@ in libgda = callPackage ../development/libraries/libgda { }; + libgda6 = callPackage ../development/libraries/libgda/6.x.nix { }; + libgdamm = callPackage ../development/libraries/libgdamm { }; libgdata = callPackage ../development/libraries/libgdata { }; From 6f1546e33c46bd302f051f35f6b3f1a2f9c481af Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 1 Feb 2021 20:13:53 +0100 Subject: [PATCH 3/4] gnome3.yelp-xsl: update metadata --- pkgs/desktops/gnome-3/core/yelp-xsl/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix index b02c7039e51d..d4b6561c0ded 100644 --- a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix +++ b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix @@ -38,7 +38,15 @@ stdenv.mkDerivation rec { homepage = "https://wiki.gnome.org/Apps/Yelp"; description = "Yelp's universal stylesheets for Mallard and DocBook"; maintainers = teams.gnome.members; - license = [licenses.gpl2 licenses.lgpl2]; - platforms = platforms.linux; + license = with licenses; [ + # See https://gitlab.gnome.org/GNOME/yelp-xsl/blob/master/COPYING + # Stylesheets + lgpl2Plus + # Icons, unclear: https://gitlab.gnome.org/GNOME/yelp-xsl/issues/25 + gpl2 + # highlight.js + bsd3 + ]; + platforms = platforms.unix; }; } From 64ea2687a80e44faa31680ead096f9b66c9d7dae Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 1 Feb 2021 20:14:13 +0100 Subject: [PATCH 4/4] yelp-tools: clean up - Correct license - Update platforms - Format and reorder expression --- pkgs/development/misc/yelp-tools/default.nix | 34 ++++++++++++++------ 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/pkgs/development/misc/yelp-tools/default.nix b/pkgs/development/misc/yelp-tools/default.nix index 9d5eb2af4968..bf348d68041a 100644 --- a/pkgs/development/misc/yelp-tools/default.nix +++ b/pkgs/development/misc/yelp-tools/default.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, fetchurl, libxml2, libxslt, itstool, gnome3, pkg-config }: +{ lib +, stdenv +, fetchurl +, libxml2 +, libxslt +, itstool +, gnome3 +, pkg-config +}: stdenv.mkDerivation rec { pname = "yelp-tools"; @@ -9,22 +17,30 @@ stdenv.mkDerivation rec { sha256 = "1c045c794sm83rrjan67jmsk20qacrw1m814p4nw85w5xsry8z30"; }; + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + libxml2 + libxslt + itstool + gnome3.yelp-xsl + ]; + + doCheck = true; + passthru = { updateScript = gnome3.updateScript { packageName = pname; }; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libxml2 libxslt itstool gnome3.yelp-xsl ]; - - doCheck = true; - meta = with lib; { homepage = "https://wiki.gnome.org/Apps/Yelp/Tools"; description = "Small programs that help you create, edit, manage, and publish your Mallard or DocBook documentation"; - maintainers = with maintainers; [ domenkozar ]; - license = licenses.gpl2; - platforms = platforms.linux; + maintainers = teams.gnome.members ++ (with maintainers; [ domenkozar ]); + license = licenses.gpl2Plus; + platforms = platforms.unix; }; }