From dbd3a5ff20d446c134740a9e8d98bc1a0cf7f9b4 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 10 Jan 2016 11:07:15 +0100 Subject: [PATCH 1/4] qutebrowser: use correct plugin versions Since PyQt uses Qt 5.5, we need to use the Qt plugins from 5.5 as well, and gstreamer plugins from 1.0. --- .../networking/browsers/qutebrowser/default.nix | 10 ++++++---- pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index c1c7a1297ce2..957ba9885788 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, python, buildPythonPackage, qtmultimedia, pyqt5 -, jinja2, pygments, pyyaml, pypeg2, gst_plugins_base, gst_plugins_good -, gst_ffmpeg }: +, jinja2, pygments, pyyaml, pypeg2, gst-plugins-base, gst-plugins-good +, gst-plugins-bad, gst-libav, wrapGAppsHook, glib_networking }: let version = "0.4.1"; in @@ -17,13 +17,15 @@ buildPythonPackage { # Needs tox doCheck = false; + buildInputs = [ wrapGAppsHook + gst-plugins-base gst-plugins-good gst-plugins-bad gst-libav + glib_networking ]; + propagatedBuildInputs = [ python pyyaml pyqt5 jinja2 pygments pypeg2 ]; makeWrapperArgs = '' - --prefix GST_PLUGIN_PATH : "${stdenv.lib.makeSearchPath "lib/gstreamer-0.10" - [ gst_plugins_base gst_plugins_good gst_ffmpeg ]}" --prefix QT_PLUGIN_PATH : "${qtmultimedia}/lib/qt5/plugins" ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 85780ec218b1..009bb39761e4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12974,8 +12974,9 @@ let gst_plugins_bad = null; }; - qutebrowser = qt5.callPackage ../applications/networking/browsers/qutebrowser { + qutebrowser = qt55.callPackage ../applications/networking/browsers/qutebrowser { inherit (python34Packages) buildPythonPackage python pyqt5 jinja2 pygments pyyaml pypeg2; + inherit (gst_all_1) gst-plugins-base gst-plugins-good gst-plugins-bad gst-libav; }; rabbitvcs = callPackage ../applications/version-management/rabbitvcs {}; From 23b3e6430ebb6f69b91d699b705a66cbecd14e41 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 10 Jan 2016 12:04:16 +0100 Subject: [PATCH 2/4] qutebrowser: 0.4.1 -> 0.5.0 Fixes #8568 by using the release tarballs. --- .../networking/browsers/qutebrowser/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 957ba9885788..1d53ea2aceb3 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -1,17 +1,16 @@ -{ stdenv, fetchgit, python, buildPythonPackage, qtmultimedia, pyqt5 +{ stdenv, fetchurl, python, buildPythonPackage, qtmultimedia, pyqt5 , jinja2, pygments, pyyaml, pypeg2, gst-plugins-base, gst-plugins-good , gst-plugins-bad, gst-libav, wrapGAppsHook, glib_networking }: -let version = "0.4.1"; in +let version = "0.5.0"; in -buildPythonPackage { +buildPythonPackage rec { name = "qutebrowser-${version}"; namePrefix = ""; - src = fetchgit { - url = "https://github.com/The-Compiler/qutebrowser.git"; - rev = "8d9e9851f1dcff5deb6363586ad0f1edec040b72"; - sha256 = "1qsdad10swnk14qw4pfyvb94y6valhkscyvl46zbxxs7ck6llsm2"; + src = fetchurl { + url = "https://github.com/The-Compiler/qutebrowser/releases/download/v${version}/${name}.tar.gz"; + sha256 = "16cyw0jg6qg9ksr6xwgnkm1a2bwgii2s35nrgk3g705ywfsf02j7"; }; # Needs tox From e8980608c6c404fb4d41aff589d4e4a9a4a6287b Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Fri, 15 Jan 2016 19:55:40 +0100 Subject: [PATCH 3/4] glib-networking: 2.44.0 -> 2.46.1 --- pkgs/development/libraries/glib-networking/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix index a17b7a21409b..6bb3c8c1e5a2 100644 --- a/pkgs/development/libraries/glib-networking/default.nix +++ b/pkgs/development/libraries/glib-networking/default.nix @@ -2,15 +2,15 @@ , gsettings_desktop_schemas }: let - ver_maj = "2.44"; - ver_min = "0"; + ver_maj = "2.46"; + ver_min = "1"; in stdenv.mkDerivation rec { name = "glib-networking-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://gnome/sources/glib-networking/${ver_maj}/${name}.tar.xz"; - sha256 = "8f8a340d3ba99bfdef38b653da929652ea6640e27969d29f7ac51fbbe11a4346"; + sha256 = "1cchmi08jpjypgmm9i7xzh5qfg2q5k61kry9ns8mhw3z44a440ym"; }; configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt"; From c7e48a3eb8bea1feaa71fc70a6daa0a2e6bcfd71 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Fri, 15 Jan 2016 19:56:12 +0100 Subject: [PATCH 4/4] libsoup: 2.50.0 -> 2.52.2 --- pkgs/development/libraries/libsoup/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index f71cc77321a5..3d10e6135055 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -3,15 +3,15 @@ , libintlOrEmpty , intltool, python }: let - majorVersion = "2.50"; - version = "${majorVersion}.0"; + majorVersion = "2.52"; + version = "${majorVersion}.2"; in stdenv.mkDerivation { name = "libsoup-${version}"; src = fetchurl { url = "mirror://gnome/sources/libsoup/${majorVersion}/libsoup-${version}.tar.xz"; - sha256 = "1e01365ac4af3817187ea847f9d3588c27eee01fc519a5a7cb212bb78b0f667b"; + sha256 = "1p4k40y2gikr6m8p3hm0vswdzj2pj133dckipd2jk5bxbj5n4mfv"; }; patchPhase = '' @@ -25,7 +25,7 @@ stdenv.mkDerivation { passthru.propagatedUserEnvPackages = [ glib_networking ]; # glib_networking is a runtime dependency, not a compile-time dependency - configureFlags = "--disable-tls-check" + stdenv.lib.optionalString (!gnomeSupport) " --without-gnome"; + configureFlags = "--disable-tls-check --enable-vala=no" + stdenv.lib.optionalString (!gnomeSupport) " --without-gnome"; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-lintl";