From 72110f58b83fdd553f537239459a97f34541d6ef Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Fri, 1 Jun 2018 18:36:06 +0300 Subject: [PATCH 01/11] at-spi2-core: build with meson --- pkgs/development/libraries/at-spi2-core/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix index b7547c29392..051083136a3 100644 --- a/pkgs/development/libraries/at-spi2-core/default.nix +++ b/pkgs/development/libraries/at-spi2-core/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, python, pkgconfig, popt, gettext, dbus-glib +{ stdenv, fetchurl, pkgconfig, gettext, meson, ninja +, python, popt, dbus-glib , libX11, xextproto, libSM, libICE, libXtst, libXi, gobjectIntrospection }: stdenv.mkDerivation rec { @@ -14,15 +15,12 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection ]; + nativeBuildInputs = [ meson ninja pkgconfig gettext gobjectIntrospection ]; buildInputs = [ python popt dbus-glib libX11 xextproto libSM libICE libXtst libXi ]; - # ToDo: on non-NixOS we create a symlink from there? - configureFlags = "--with-dbus-daemondir=/run/current-system/sw/bin/"; - doCheck = false; # needs dbus daemon meta = with stdenv.lib; { From abdeca490222ef7034d4acb7fefa38cc94d55ed4 Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Sat, 2 Jun 2018 15:40:26 +0300 Subject: [PATCH 02/11] at-spi2-core: 2.26.2 -> 2.28.0 --- pkgs/development/libraries/at-spi2-core/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix index 051083136a3..a3b55ef631e 100644 --- a/pkgs/development/libraries/at-spi2-core/default.nix +++ b/pkgs/development/libraries/at-spi2-core/default.nix @@ -3,14 +3,14 @@ , libX11, xextproto, libSM, libICE, libXtst, libXi, gobjectIntrospection }: stdenv.mkDerivation rec { - versionMajor = "2.26"; - versionMinor = "2"; + versionMajor = "2.28"; + versionMinor = "0"; moduleName = "at-spi2-core"; name = "${moduleName}-${versionMajor}.${versionMinor}"; src = fetchurl { url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; - sha256 = "0596ghkamkxgv08r4a1pdhm06qd5zzgcfqsv64038w9xbvghq3n8"; + sha256 = "11qwdxxx4jm0zj04xydlwah41axiz276dckkiql3rr0wn5x4i8j2"; }; outputs = [ "out" "dev" ]; From f70ef8f4116485042e1dd925e761297bcf4cb55f Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Sat, 2 Jun 2018 15:48:43 +0300 Subject: [PATCH 03/11] at-spi2-core: maintainers, license, clean-up --- .../libraries/at-spi2-core/default.nix | 37 ++++++++++++------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix index a3b55ef631e..cb17a026e5f 100644 --- a/pkgs/development/libraries/at-spi2-core/default.nix +++ b/pkgs/development/libraries/at-spi2-core/default.nix @@ -1,29 +1,38 @@ -{ stdenv, fetchurl, pkgconfig, gettext, meson, ninja -, python, popt, dbus-glib -, libX11, xextproto, libSM, libICE, libXtst, libXi, gobjectIntrospection }: +{ stdenv +, fetchurl + +, meson +, ninja +, pkgconfig +, gobjectIntrospection + +, dbus +, glib +, libX11 +, libXtst # at-spi2-core can be build with custom option not to support X, but due to it is a aplication client-side library, GUI-less usage is a very rare case +, libXi +}: stdenv.mkDerivation rec { - versionMajor = "2.28"; - versionMinor = "0"; + name = "${moduleName}-${version}"; moduleName = "at-spi2-core"; - name = "${moduleName}-${versionMajor}.${versionMinor}"; + version = "2.28.0"; src = fetchurl { - url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; + url = "mirror://gnome/sources/${moduleName}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "11qwdxxx4jm0zj04xydlwah41axiz276dckkiql3rr0wn5x4i8j2"; }; outputs = [ "out" "dev" ]; - nativeBuildInputs = [ meson ninja pkgconfig gettext gobjectIntrospection ]; - buildInputs = [ - python popt dbus-glib - libX11 xextproto libSM libICE libXtst libXi - ]; - - doCheck = false; # needs dbus daemon + nativeBuildInputs = [ meson ninja pkgconfig gobjectIntrospection ]; + buildInputs = [ dbus glib libX11 libXtst libXi ]; meta = with stdenv.lib; { + description = "Assistive Technology Service Provider Interface protocol definitions and daemon for D-Bus"; + homepage = https://gitlab.gnome.org/GNOME/at-spi2-core; + license = licenses.lgpl2Plus; # NOTE: 2018-06-06: Please check the license when upstream sorts-out licensing: https://gitlab.gnome.org/GNOME/at-spi2-core/issues/2 + maintainers = with maintainers; [ jtojnar gnome3.maintainers ]; platforms = platforms.unix; }; } From a381349ad82da5c85453b64fc4ae416f0a94c40f Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Tue, 5 Jun 2018 18:57:18 +0300 Subject: [PATCH 04/11] at-spi2-core: add updateScript hook --- .../libraries/at-spi2-core/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix index cb17a026e5f..ba34e7f5f3f 100644 --- a/pkgs/development/libraries/at-spi2-core/default.nix +++ b/pkgs/development/libraries/at-spi2-core/default.nix @@ -9,17 +9,19 @@ , dbus , glib , libX11 -, libXtst # at-spi2-core can be build with custom option not to support X, but due to it is a aplication client-side library, GUI-less usage is a very rare case +, libXtst # at-spi2-core can be build without X support, but due it is a client-side library, GUI-less usage is a very rare case , libXi + +, gnome3 # To pass updateScript }: stdenv.mkDerivation rec { - name = "${moduleName}-${version}"; - moduleName = "at-spi2-core"; + name = "${pname}-${version}"; + pname = "at-spi2-core"; version = "2.28.0"; src = fetchurl { - url = "mirror://gnome/sources/${moduleName}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "11qwdxxx4jm0zj04xydlwah41axiz276dckkiql3rr0wn5x4i8j2"; }; @@ -28,6 +30,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkgconfig gobjectIntrospection ]; buildInputs = [ dbus glib libX11 libXtst libXi ]; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + meta = with stdenv.lib; { description = "Assistive Technology Service Provider Interface protocol definitions and daemon for D-Bus"; homepage = https://gitlab.gnome.org/GNOME/at-spi2-core; From d663d6305131f6fcee986960392869c81ca5fa91 Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Fri, 1 Jun 2018 17:33:58 +0300 Subject: [PATCH 05/11] at-spi2-atk: build with meson --- pkgs/development/libraries/at-spi2-atk/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/at-spi2-atk/default.nix b/pkgs/development/libraries/at-spi2-atk/default.nix index 1e5d003654c..6df75ec7eed 100644 --- a/pkgs/development/libraries/at-spi2-atk/default.nix +++ b/pkgs/development/libraries/at-spi2-atk/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, python, pkgconfig, popt, atk, libX11, libICE, xorg, libXi +{ stdenv, fetchurl, pkgconfig, meson, ninja, libxml2 +, python, popt, atk, libX11, libICE, xorg, libXi , intltool, dbus-glib, at-spi2-core, libSM }: stdenv.mkDerivation rec { @@ -12,9 +13,9 @@ stdenv.mkDerivation rec { sha256 = "0x9vc99ni46fg5dzlx67vbw0zqffr24gz8jvbdxbmzyvc5xw5w5l"; }; - nativeBuildInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ meson ninja pkgconfig intltool ]; buildInputs = [ python popt atk libX11 libICE xorg.libXtst libXi - dbus-glib at-spi2-core libSM ]; + dbus-glib at-spi2-core libSM libxml2 ]; doCheck = false; # needs dbus daemon From ed2497f3a703c0e85fb5561183b13df59b277af8 Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Sun, 3 Jun 2018 01:08:29 +0300 Subject: [PATCH 06/11] at-spi2-atk: 2.26.1 -> 2.26.2, clean-up --- .../libraries/at-spi2-atk/default.nix | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/at-spi2-atk/default.nix b/pkgs/development/libraries/at-spi2-atk/default.nix index 6df75ec7eed..acf14cba91a 100644 --- a/pkgs/development/libraries/at-spi2-atk/default.nix +++ b/pkgs/development/libraries/at-spi2-atk/default.nix @@ -1,25 +1,24 @@ -{ stdenv, fetchurl, pkgconfig, meson, ninja, libxml2 -, python, popt, atk, libX11, libICE, xorg, libXi -, intltool, dbus-glib, at-spi2-core, libSM }: +{ stdenv, fetchurl, meson, ninja, pkgconfig +, at-spi2-core, atk, dbus, glib, libxml2 }: stdenv.mkDerivation rec { - versionMajor = "2.26"; - versionMinor = "1"; - moduleName = "at-spi2-atk"; name = "${moduleName}-${versionMajor}.${versionMinor}"; + moduleName = "at-spi2-atk"; + versionMajor = "2.26"; + versionMinor = "2"; src = fetchurl { url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; - sha256 = "0x9vc99ni46fg5dzlx67vbw0zqffr24gz8jvbdxbmzyvc5xw5w5l"; + sha256 = "0vkan52ab9vrkknnv8y4f1cspk8x7xd10qx92xk9ys71p851z2b1"; }; - nativeBuildInputs = [ meson ninja pkgconfig intltool ]; - buildInputs = [ python popt atk libX11 libICE xorg.libXtst libXi - dbus-glib at-spi2-core libSM libxml2 ]; - - doCheck = false; # needs dbus daemon + nativeBuildInputs = [ meson ninja pkgconfig ]; + buildInputs = [ at-spi2-core atk dbus glib libxml2 ]; meta = with stdenv.lib; { + description = "D-Bus bridge for Assistive Technology Service Provider Interface (AT-SPI) and Accessibility Toolkit (ATK)"; + homepage = "https://gitlab.gnome.org/GNOME/at-spi2-atk"; platforms = platforms.unix; + }; } From d4fe62dc46512c4f68a314874f143699353039ba Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Tue, 5 Jun 2018 15:18:21 +0300 Subject: [PATCH 07/11] at-spi2-atk: maintainers, license, clean-up --- .../libraries/at-spi2-atk/default.nix | 29 +++++++++++++------ 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/at-spi2-atk/default.nix b/pkgs/development/libraries/at-spi2-atk/default.nix index acf14cba91a..b064285bbf7 100644 --- a/pkgs/development/libraries/at-spi2-atk/default.nix +++ b/pkgs/development/libraries/at-spi2-atk/default.nix @@ -1,14 +1,24 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig -, at-spi2-core, atk, dbus, glib, libxml2 }: +{ stdenv +, fetchurl + +, meson +, ninja +, pkgconfig + +, at-spi2-core +, atk +, dbus +, glib +, libxml2 +}: stdenv.mkDerivation rec { - name = "${moduleName}-${versionMajor}.${versionMinor}"; - moduleName = "at-spi2-atk"; - versionMajor = "2.26"; - versionMinor = "2"; + name = "${moduleName}-${version}"; + moduleName = "at-spi2-atk"; + version = "2.26.2"; src = fetchurl { - url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; + url = "mirror://gnome/sources/${moduleName}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "0vkan52ab9vrkknnv8y4f1cspk8x7xd10qx92xk9ys71p851z2b1"; }; @@ -17,8 +27,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "D-Bus bridge for Assistive Technology Service Provider Interface (AT-SPI) and Accessibility Toolkit (ATK)"; - homepage = "https://gitlab.gnome.org/GNOME/at-spi2-atk"; + homepage = https://gitlab.gnome.org/GNOME/at-spi2-atk; + license = licenses.lgpl2Plus; # NOTE: 2018-06-06: Please check the license when upstream sorts-out licensing: https://gitlab.gnome.org/GNOME/at-spi2-atk/issues/2 + maintainers = with maintainers; [ jtojnar gnome3.maintainers ]; platforms = platforms.unix; - }; } From d4e5243207607934f0875020f077e398b8cdec51 Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Tue, 5 Jun 2018 18:48:03 +0300 Subject: [PATCH 08/11] at-spi2-atk: add updateScript hook --- pkgs/development/libraries/at-spi2-atk/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/at-spi2-atk/default.nix b/pkgs/development/libraries/at-spi2-atk/default.nix index b064285bbf7..688c9e300ed 100644 --- a/pkgs/development/libraries/at-spi2-atk/default.nix +++ b/pkgs/development/libraries/at-spi2-atk/default.nix @@ -10,21 +10,29 @@ , dbus , glib , libxml2 + +, gnome3 # To pass updateScript }: stdenv.mkDerivation rec { - name = "${moduleName}-${version}"; - moduleName = "at-spi2-atk"; + name = "${pname}-${version}"; + pname = "at-spi2-atk"; version = "2.26.2"; src = fetchurl { - url = "mirror://gnome/sources/${moduleName}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "0vkan52ab9vrkknnv8y4f1cspk8x7xd10qx92xk9ys71p851z2b1"; }; nativeBuildInputs = [ meson ninja pkgconfig ]; buildInputs = [ at-spi2-core atk dbus glib libxml2 ]; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + meta = with stdenv.lib; { description = "D-Bus bridge for Assistive Technology Service Provider Interface (AT-SPI) and Accessibility Toolkit (ATK)"; homepage = https://gitlab.gnome.org/GNOME/at-spi2-atk; From 45e5a49673e0623acf112e12b3c180a498d0af11 Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Fri, 1 Jun 2018 19:34:56 +0300 Subject: [PATCH 09/11] clutter-gtk: build with meson --- pkgs/development/libraries/clutter-gtk/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/clutter-gtk/default.nix b/pkgs/development/libraries/clutter-gtk/default.nix index 22f205cdcec..9759e4904b2 100644 --- a/pkgs/development/libraries/clutter-gtk/default.nix +++ b/pkgs/development/libraries/clutter-gtk/default.nix @@ -1,8 +1,11 @@ -{ fetchurl, stdenv, pkgconfig, gobjectIntrospection, clutter, gtk3, gnome3 }: +{ fetchurl, stdenv, pkgconfig, meson, ninja +, gobjectIntrospection, clutter, gtk3, gnome3 }: + let pname = "clutter-gtk"; version = "1.8.4"; in + stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -12,7 +15,7 @@ stdenv.mkDerivation rec { }; propagatedBuildInputs = [ clutter gtk3 ]; - nativeBuildInputs = [ pkgconfig gobjectIntrospection ]; + nativeBuildInputs = [ meson ninja pkgconfig gobjectIntrospection ]; postBuild = "rm -rf $out/share/gtk-doc"; From 930db86830644bff0b0850db4acbd5c8263c50c1 Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Fri, 1 Jun 2018 20:38:09 +0300 Subject: [PATCH 10/11] fribidi: 0.19.7 -> 1.0.3 --- pkgs/development/libraries/fribidi/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/fribidi/default.nix b/pkgs/development/libraries/fribidi/default.nix index a107c9a478f..bd1d4449967 100644 --- a/pkgs/development/libraries/fribidi/default.nix +++ b/pkgs/development/libraries/fribidi/default.nix @@ -2,15 +2,16 @@ stdenv.mkDerivation rec { name = "fribidi-${version}"; - version = "0.19.7"; + version = "1.0.3"; src = fetchFromGitHub { owner = "fribidi"; repo = "fribidi"; - rev = version; - sha256 = "10q5jfch5qzrj2w4fbkr086ank66plx8hp7ra9a01irj80pbk96d"; + rev = "v${version}"; + sha256 = "02483nscxc695j9b92clcdf0xb7xkfjry09kqdkkhkzl3vdcj039"; }; + # FIXME: Please build with Meson after https://github.com/fribidi/fribidi/issues/79 solved nativeBuildInputs = [ autoreconfHook pkgconfig ]; # Configure script checks for glib, but it is only used for tests. From 1d84ebc325195bfaf4fa44ae2d2a3021357e85e9 Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Sat, 2 Jun 2018 01:01:37 +0300 Subject: [PATCH 11/11] fribidi: build with meson, clean-up --- .../development/libraries/fribidi/default.nix | 27 ++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/fribidi/default.nix b/pkgs/development/libraries/fribidi/default.nix index bd1d4449967..2bc36d1b2b9 100644 --- a/pkgs/development/libraries/fribidi/default.nix +++ b/pkgs/development/libraries/fribidi/default.nix @@ -1,20 +1,23 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig }: +{ stdenv +, fetchurl + +, meson +, ninja +, pkgconfig +}: stdenv.mkDerivation rec { - name = "fribidi-${version}"; - version = "1.0.3"; + name = "${pname}-${version}"; + pname = "fribidi"; + version = "1.0.4"; - src = fetchFromGitHub { - owner = "fribidi"; - repo = "fribidi"; - rev = "v${version}"; - sha256 = "02483nscxc695j9b92clcdf0xb7xkfjry09kqdkkhkzl3vdcj039"; + # NOTE: 2018-06-06 v1.0.4: Only URL tarball has "Have pre-generated man pages: true", which works-around upstream usage of some rare ancient `c2man` fossil application. + src = fetchurl { + url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${name}.tar.bz2"; + sha256 = "1gipy8fjyn6i4qrhima02x8xs493d21f22dijp88nk807razxgcl"; }; - # FIXME: Please build with Meson after https://github.com/fribidi/fribidi/issues/79 solved - nativeBuildInputs = [ autoreconfHook pkgconfig ]; - - # Configure script checks for glib, but it is only used for tests. + nativeBuildInputs = [ meson ninja pkgconfig ]; outputs = [ "out" "devdoc" ];