From d561b1769554ab6e99e89a752ac2ed5aa211f61a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 17 Nov 2018 21:35:33 +0100 Subject: [PATCH 01/10] =?UTF-8?q?librepo:=201.8.1=20=E2=86=92=201.9.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/tools/package-management/librepo/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/package-management/librepo/default.nix b/pkgs/tools/package-management/librepo/default.nix index b08d65e123da..c35550597a34 100644 --- a/pkgs/tools/package-management/librepo/default.nix +++ b/pkgs/tools/package-management/librepo/default.nix @@ -1,24 +1,24 @@ -{ stdenv, fetchFromGitHub, cmake, python, pkgconfig, expat, glib, pcre, openssl, curl, check, attr, gpgme }: +{ stdenv, fetchFromGitHub, cmake, python, pkgconfig, libxml2, glib, openssl, curl, check, gpgme }: stdenv.mkDerivation rec { - version = "1.8.1"; + version = "1.9.2"; name = "librepo-${version}"; src = fetchFromGitHub { owner = "rpm-software-management"; repo = "librepo"; rev = version; - sha256 = "11rypnxjgsc2klyg294ndxy1cyp0nyk00zpjhcvqkhp58vvkkv12"; + sha256 = "0xa9ng9mhpianhjy2a0jnj8ha1zckk2sz91y910daggm1qcv5asx"; }; nativeBuildInputs = [ cmake pkgconfig ]; cmakeFlags="-DPYTHON_DESIRED=${stdenv.lib.substring 0 1 python.pythonVersion}"; - buildInputs = [ python expat glib pcre openssl curl check attr gpgme ]; + buildInputs = [ python libxml2 glib openssl curl check gpgme ]; # librepo/fastestmirror.h includes curl/curl.h, and pkg-config specfile refers to others in here - propagatedBuildInputs = [ curl gpgme expat ]; + propagatedBuildInputs = [ curl gpgme libxml2 ]; meta = with stdenv.lib; { description = "Library providing C and Python (libcURL like) API for downloading linux repository metadata and packages"; From 04016f3076813966f46b69336fe6c313c4fea088 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 17 Nov 2018 22:03:49 +0100 Subject: [PATCH 02/10] =?UTF-8?q?ostree:=202018.8=20=E2=86=92=202018.9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/tools/misc/ostree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix index 3cbdd498aa73..25cba56449cd 100644 --- a/pkgs/tools/misc/ostree/default.nix +++ b/pkgs/tools/misc/ostree/default.nix @@ -4,7 +4,7 @@ }: let - version = "2018.8"; + version = "2018.9"; libglnx-src = fetchFromGitHub { owner = "GNOME"; @@ -28,7 +28,7 @@ in stdenv.mkDerivation { rev = "v${version}"; owner = "ostreedev"; repo = "ostree"; - sha256 = "0i7b7hvlv8m44k39fr5389wskf810vda8s7ivy2whj1nan5951yx"; + sha256 = "0a8gr4qqxcvz3fqv9w4dxy6iq0rq4kdzf08rzv8xg4gic3ldgyvj"; }; patches = [ From 2025436e5c7cb384aca2eeb729e060ef35b163e9 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 17 Nov 2018 23:17:12 +0100 Subject: [PATCH 03/10] =?UTF-8?q?libsolv:=200.7.0=20=E2=86=92=200.7.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/libsolv/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libsolv/default.nix b/pkgs/development/libraries/libsolv/default.nix index 51b6cbd4ed52..7d93b3f7d80f 100644 --- a/pkgs/development/libraries/libsolv/default.nix +++ b/pkgs/development/libraries/libsolv/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake, ninja, zlib, expat, rpm, db }: stdenv.mkDerivation rec { - rev = "0.7.0"; - name = "libsolv-${rev}"; + version = "0.7.1"; + name = "libsolv-${version}"; src = fetchFromGitHub { - inherit rev; owner = "openSUSE"; repo = "libsolv"; - sha256 = "02vz1yp516nh4vv0jdckll37mc373ddd363ip005xfbrbb2jr1xh"; + rev = version; + sha256 = "0ssiadh10d28gzmq9vpgvvwmkw5ccb5iglafzsx3pf33z1zp5a3b"; }; cmakeFlags = [ From 699f124990ef2197674cc649bbe2db3d127b4423 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 17 Nov 2018 23:23:27 +0100 Subject: [PATCH 04/10] =?UTF-8?q?libskk:=201.0.4=20=E2=86=92=201.0.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/libskk/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libskk/default.nix b/pkgs/development/libraries/libskk/default.nix index b64c3e517782..cf943d45b4db 100644 --- a/pkgs/development/libraries/libskk/default.nix +++ b/pkgs/development/libraries/libskk/default.nix @@ -1,20 +1,20 @@ { stdenv, fetchFromGitHub, libtool, gettext, pkgconfig, vala, gnome-common, gobjectIntrospection, - libgee, json-glib, skk-dicts }: + libgee, json-glib, skk-dicts, libxkbcommon }: stdenv.mkDerivation rec { name = "libskk-${version}"; - version = "1.0.4"; + version = "1.0.5"; src = fetchFromGitHub { owner = "ueno"; repo = "libskk"; rev = version; - sha256 = "1yvyscr22rrh0jja1bz70jzwi5776jyw39pgbgrx00j79vsv7b51"; + sha256 = "0y279pcgs3jrsi9vzx086xhz9jbz23dqqijp4agygc9ackp9sxy5"; }; - buildInputs = [ skk-dicts ]; + buildInputs = [ skk-dicts libxkbcommon ]; nativeBuildInputs = [ vala gnome-common gobjectIntrospection libtool gettext pkgconfig ]; propagatedBuildInputs = [ libgee json-glib ]; From 3b04b58beeee85bfee3cec0521bd78c3217cc760 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 17 Nov 2018 23:32:45 +0100 Subject: [PATCH 05/10] =?UTF-8?q?gtkspell3:=203.0.9=20=E2=86=92=203.0.10?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/gtkspell/3.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/gtkspell/3.nix b/pkgs/development/libraries/gtkspell/3.nix index d5fc094844a7..110315110006 100644 --- a/pkgs/development/libraries/gtkspell/3.nix +++ b/pkgs/development/libraries/gtkspell/3.nix @@ -1,19 +1,19 @@ -{stdenv, fetchurl, gtk3, aspell, pkgconfig, enchant, isocodes, intltool, gobjectIntrospection, vala}: +{stdenv, fetchurl, gtk3, aspell, pkgconfig, enchant2, isocodes, intltool, gobjectIntrospection, vala}: stdenv.mkDerivation rec { name = "gtkspell-${version}"; - version = "3.0.9"; + version = "3.0.10"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://sourceforge/gtkspell/gtkspell3-${version}.tar.xz"; - sha256 = "09jdicmpipmj4v84gnkqwbmj4lh8v0i6pn967rb9jx4zg2ia9x54"; + sha256 = "0cjp6xdcnzh6kka42w9g0w2ihqjlq8yl8hjm9wsfnixk6qwgch5h"; }; nativeBuildInputs = [ pkgconfig intltool gobjectIntrospection vala ]; - buildInputs = [ aspell gtk3 enchant isocodes ]; - propagatedBuildInputs = [ enchant ]; + buildInputs = [ aspell gtk3 enchant2 isocodes ]; + propagatedBuildInputs = [ enchant2 ]; configureFlags = [ "--enable-introspection" From 333313d4de27987c531b86fd744f525fb1247fec Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 17 Nov 2018 23:42:09 +0100 Subject: [PATCH 06/10] =?UTF-8?q?fwts:=2018.07.00=20=E2=86=92=2018.11.00?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/os-specific/linux/fwts/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/fwts/default.nix b/pkgs/os-specific/linux/fwts/default.nix index e54ab7bcba73..1e16725af3f9 100644 --- a/pkgs/os-specific/linux/fwts/default.nix +++ b/pkgs/os-specific/linux/fwts/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchzip, autoreconfHook, pkgconfig, glib, libtool, pcre -, json_c, flex, bison, dtc, pciutils, dmidecode, iasl }: +, json_c, flex, bison, dtc, pciutils, dmidecode, iasl, libbsd }: stdenv.mkDerivation rec { name = "fwts-${version}"; - version = "18.07.00"; + version = "18.11.00"; src = fetchzip { url = "http://fwts.ubuntu.com/release/fwts-V${version}.tar.gz"; - sha256 = "11fc26k1k98i1rv1jw9ahbbal7p7cl6wxy967a7ixs330q5ry1lb"; + sha256 = "14dxw0ny5z681kz4dpm2phyanr2q4c8fqml3mhdr1mb2ndrrwqgz"; stripRoot = false; }; nativeBuildInputs = [ autoreconfHook pkgconfig libtool ]; - buildInputs = [ glib pcre json_c flex bison dtc pciutils dmidecode iasl ]; + buildInputs = [ glib pcre json_c flex bison dtc pciutils dmidecode iasl libbsd ]; postPatch = '' substituteInPlace src/lib/include/fwts_binpaths.h --replace "/usr/bin/lspci" "${pciutils}/bin/lspci" From 52d10bcdc6f6d1291a5b26d6775b14876ae907c0 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 17 Nov 2018 23:47:18 +0100 Subject: [PATCH 07/10] =?UTF-8?q?feedreader:=202.2=20=E2=86=92=202.4.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/feedreaders/feedreader/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/feedreaders/feedreader/default.nix b/pkgs/applications/networking/feedreaders/feedreader/default.nix index 158b02cff5b9..bb64c8378969 100644 --- a/pkgs/applications/networking/feedreaders/feedreader/default.nix +++ b/pkgs/applications/networking/feedreaders/feedreader/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchFromGitHub, meson, ninja, pkgconfig, vala_0_40, gettext, python3 , appstream-glib, desktop-file-utils, glibcLocales, wrapGAppsHook -, curl, glib, gnome3, gst_all_1, json-glib, libnotify, libsecret, sqlite +, curl, glib, gnome3, gst_all_1, json-glib, libnotify, libsecret, sqlite, gumbo }: let pname = "FeedReader"; - version = "2.2"; + version = "2.4.1"; in stdenv.mkDerivation { name = "${pname}-${version}"; @@ -13,7 +13,7 @@ in stdenv.mkDerivation { owner = "jangernert"; repo = pname; rev = "v" + version; - sha256 = "17588hsa7xv92ba55kmbyvnijypp373yrly48kbc391wadp1z939"; + sha256 = "1fk2iiqwvrw58hpp96xypr4wh1sq15aixnz4760mnfynhjq5s3jh"; }; nativeBuildInputs = [ @@ -22,7 +22,7 @@ in stdenv.mkDerivation { ]; buildInputs = [ - curl glib json-glib libnotify libsecret sqlite + curl glib json-glib libnotify libsecret sqlite gumbo ] ++ (with gnome3; [ gtk libgee libpeas libsoup rest webkitgtk gnome-online-accounts gsettings-desktop-schemas From 8c10401e69c8fbf5b720c4c3cacff5d698a55414 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 18 Nov 2018 00:11:58 +0100 Subject: [PATCH 08/10] =?UTF-8?q?createrepo=5Fc:=200.11.0=20=E2=86=92=200.?= =?UTF-8?q?11.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../package-management/createrepo_c/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/package-management/createrepo_c/default.nix b/pkgs/tools/package-management/createrepo_c/default.nix index f6314b655294..0a0cae32dcf5 100644 --- a/pkgs/tools/package-management/createrepo_c/default.nix +++ b/pkgs/tools/package-management/createrepo_c/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, bzip2, expat, glib, curl, libxml2, python2, rpm, openssl, sqlite, file, xz, pcre, bash-completion }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, bzip2, expat, glib, curl, libxml2, python3, rpm, openssl, sqlite, file, xz, pcre, bash-completion }: stdenv.mkDerivation rec { - rev = "0.11.0"; - name = "createrepo_c-${rev}"; + name = "createrepo_c-${version}"; + version = "0.11.1"; src = fetchFromGitHub { - inherit rev; owner = "rpm-software-management"; repo = "createrepo_c"; - sha256 = "1w9yynj8mxhw714gvgr0fibfks584b4y0n4vjckcf7y97cpdhjkn"; + rev = version; + sha256 = "0cmysc7gdd2czagl4drfh9gin6aa2847vgi30a3p0cfqvczf9cm6"; }; patches = [ @@ -20,12 +20,12 @@ stdenv.mkDerivation rec { substituteInPlace CMakeLists.txt \ --replace '@BASHCOMP_DIR@' "$out/share/bash-completion/completions" substituteInPlace src/python/CMakeLists.txt \ - --replace "@PYTHON_INSTALL_PATH@" "$out/${python2.sitePackages}" + --replace "@PYTHON_INSTALL_DIR@" "$out/${python3.sitePackages}" ''; nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ bzip2 expat glib curl libxml2 python2 rpm openssl sqlite file xz pcre bash-completion ]; + buildInputs = [ bzip2 expat glib curl libxml2 python3 rpm openssl sqlite file xz pcre bash-completion ]; meta = with stdenv.lib; { description = "C implementation of createrepo"; From 12134c74ef5003587d30cd2d43a308820d6e6384 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 18 Nov 2018 01:05:11 +0100 Subject: [PATCH 09/10] =?UTF-8?q?ario:=201.5.1=20=E2=86=92=201.6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/audio/ario/default.nix | 17 ++++---- .../audio/ario/glib-single-include.patch | 40 ------------------- 2 files changed, 7 insertions(+), 50 deletions(-) delete mode 100644 pkgs/applications/audio/ario/glib-single-include.patch diff --git a/pkgs/applications/audio/ario/default.nix b/pkgs/applications/audio/ario/default.nix index a99fb80df723..02d818410df4 100644 --- a/pkgs/applications/audio/ario/default.nix +++ b/pkgs/applications/audio/ario/default.nix @@ -1,27 +1,24 @@ -{ stdenv, fetchurl, pkgconfig, gettext, gtk2, expat, intltool, libgcrypt, - libunique, gnutls, libxml2, curl, mpd_clientlib, dbus-glib, libnotify, +{ stdenv, fetchurl, pkgconfig, gettext, gtk3, intltool, + wrapGAppsHook, libxml2, curl, mpd_clientlib, dbus-glib, libsoup, avahi, taglib }: stdenv.mkDerivation rec { - version = "1.5.1"; + version = "1.6"; name = "ario-${version}"; src = fetchurl { url = "mirror://sourceforge/ario-player/${name}.tar.gz"; - sha256 = "07n97618jv1ilxnm5c6qj9zjz0imw3p304mn4hjbjkk3p0d2hc88"; + sha256 = "16nhfb3h5pc7flagfdz7xy0iq6kvgy6h4bfpi523i57rxvlfshhl"; }; - patches = [ ./glib-single-include.patch ]; - - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig gettext intltool wrapGAppsHook ]; buildInputs = [ - gettext gtk2 expat intltool libgcrypt libunique gnutls - libxml2 curl mpd_clientlib dbus-glib libnotify libsoup avahi taglib + gtk3 libxml2 curl mpd_clientlib dbus-glib libsoup avahi taglib ]; meta = { - description = "GTK2 client for MPD (Music player daemon)"; + description = "GTK client for MPD (Music player daemon)"; homepage = http://ario-player.sourceforge.net/; license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.garrison ]; diff --git a/pkgs/applications/audio/ario/glib-single-include.patch b/pkgs/applications/audio/ario/glib-single-include.patch deleted file mode 100644 index 45e0a1738f8b..000000000000 --- a/pkgs/applications/audio/ario/glib-single-include.patch +++ /dev/null @@ -1,40 +0,0 @@ -From: Michael Biebl -Origin: vendor -Bug-Debian: http://bugs.debian.org/665506 -Subject: Including individual glib headers no longer supported - ---- a/src/ario-profiles.h -+++ b/src/ario-profiles.h -@@ -20,7 +20,7 @@ - #ifndef __ARIO_PROFILES_H - #define __ARIO_PROFILES_H - --#include -+#include - #include "servers/ario-server.h" - - G_BEGIN_DECLS ---- a/src/plugins/ario-plugin-info.c -+++ b/src/plugins/ario-plugin-info.c -@@ -27,7 +27,7 @@ - - #include - #include --#include -+#include - - #include "plugins/ario-plugin-info-priv.h" - #include "ario-debug.h" ---- a/src/ario-util.h -+++ b/src/ario-util.h -@@ -18,8 +18,8 @@ - */ - - #include "servers/ario-server.h" --#include "glib/gslist.h" --#include "gdk/gdkpixbuf.h" -+#include -+#include - - /* Number of covers used to generate the drag & drop image */ - #define MAX_COVERS_IN_DRAG 3 From 902ef17e05b8b0211ac310f6d73559b65408185b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 18 Nov 2018 01:35:34 +0100 Subject: [PATCH 10/10] gImageReader: remove enchant dependency --- pkgs/applications/misc/gImageReader/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gImageReader/default.nix b/pkgs/applications/misc/gImageReader/default.nix index ec867854dfb9..18998f1fe095 100644 --- a/pkgs/applications/misc/gImageReader/default.nix +++ b/pkgs/applications/misc/gImageReader/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, libuuid , sane-backends, podofo, libjpeg, djvulibre, libxmlxx3, libzip, tesseract -, enchant, intltool, poppler, json-glib +, intltool, poppler, json-glib , ninja , python3 @@ -37,7 +37,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - enchant libxmlxx3 libzip libuuid