From cdddddd7cc772b297cc6fa688847efa0a2db66f2 Mon Sep 17 00:00:00 2001
From: Michiel Leenaars <ml.software@leenaa.rs>
Date: Tue, 10 Sep 2019 00:36:50 +0200
Subject: [PATCH 1/5] pythonPackages.msrplib: 0.19 -> 0.19.2
---
pkgs/development/python-modules/msrplib/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/msrplib/default.nix b/pkgs/development/python-modules/msrplib/default.nix
index 32a759a6a49..bba72ea62bb 100644
--- a/pkgs/development/python-modules/msrplib/default.nix
+++ b/pkgs/development/python-modules/msrplib/default.nix
@@ -8,12 +8,12 @@
buildPythonPackage rec {
pname = "python-msrplib";
- version = "0.19";
+ version = "0.19.2";
src = fetchdarcs {
url = "http://devel.ag-projects.com/repositories/${pname}";
rev = "release-${version}";
- sha256 = "0jqvvssbwzq7bwqn3wrjfnpj8zb558mynn2visnlrcma6b57yhwd";
+ sha256 = "0d0krwv4hhspjgppnvh0iz51bvdbz23cjasgrppip7x8b00514gz";
};
propagatedBuildInputs = [ eventlib application gnutls ];
From df25be6d7bc0df496cf0a611740791daf1361045 Mon Sep 17 00:00:00 2001
From: Michiel Leenaars <ml.software@leenaa.rs>
Date: Tue, 10 Sep 2019 00:37:32 +0200
Subject: [PATCH 2/5] pythonPackages.xcaplib: 1.2.0 -> 1.2.1
---
pkgs/development/python-modules/xcaplib/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/xcaplib/default.nix b/pkgs/development/python-modules/xcaplib/default.nix
index 7dc67072046..7002c43cf2b 100644
--- a/pkgs/development/python-modules/xcaplib/default.nix
+++ b/pkgs/development/python-modules/xcaplib/default.nix
@@ -8,13 +8,13 @@
buildPythonPackage rec {
pname = "python-xcaplib";
- version = "1.2.0";
+ version = "1.2.1";
disabled = isPy3k;
src = fetchdarcs {
url = "http://devel.ag-projects.com/repositories/${pname}";
rev = "release-${version}";
- sha256 = "0vna5r4ihv7z1yx6r93954jqskcxky77znzy1m9dg9vna1dgwfdn";
+ sha256 = "15ww8f0a9zh37mypw5s4q1qk44cwf7jlhc9q1z4vjlpvnzimg54v";
};
propagatedBuildInputs = [ eventlib application ];
From 88610926bbbf735c6c3c65667de02c9d3e45bef2 Mon Sep 17 00:00:00 2001
From: Michiel Leenaars <ml.software@leenaa.rs>
Date: Tue, 10 Sep 2019 07:58:38 +0200
Subject: [PATCH 3/5] pythonPackages.eventlib: 0.2.2 -> 0.2.4
---
pkgs/development/python-modules/eventlib/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/eventlib/default.nix b/pkgs/development/python-modules/eventlib/default.nix
index 147e18d45f4..837ffa0d86d 100644
--- a/pkgs/development/python-modules/eventlib/default.nix
+++ b/pkgs/development/python-modules/eventlib/default.nix
@@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "python-eventlib";
- version = "0.2.2";
+ version = "0.2.4";
# Judging from SyntaxError
disabled = isPy3k;
src = fetchdarcs {
url = "http://devel.ag-projects.com/repositories/${pname}";
rev = "release-${version}";
- sha256 = "1zxhpq8i4jwsk7wmfncqfm211hqikj3hp38cfv509924bi76wak8";
+ sha256 = "1w1axsm6w9bl2smzxmyk4in1lsm8gk8ma6y183m83cpj66aqxg4z";
};
propagatedBuildInputs = [ greenlet ];
From f075f52177da9a3b92834cf47abc8f46ed7b34a5 Mon Sep 17 00:00:00 2001
From: Michiel Leenaars <ml.software@leenaa.rs>
Date: Tue, 10 Sep 2019 07:59:25 +0200
Subject: [PATCH 4/5] pythonPackages.python-application: 2.0.2 -> 2.7.0
---
pkgs/development/python-modules/application/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/application/default.nix b/pkgs/development/python-modules/application/default.nix
index 520e01723e6..654567cc23f 100644
--- a/pkgs/development/python-modules/application/default.nix
+++ b/pkgs/development/python-modules/application/default.nix
@@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "python-application";
- version = "2.0.2";
+ version = "2.7.0";
disabled = isPy3k;
src = fetchdarcs {
url = "http://devel.ag-projects.com/repositories/${pname}";
rev = "release-${version}";
- sha256 = "19dszv44py8qrq0jcjdycxpa7z2p8hi3ijq9gnqdsazbbjzf9svn";
+ sha256 = "1xpyk2v3naxkjhpyris58dxg1lxbraxgjd6f7w1sah5j0sk7psla";
};
buildInputs = [ zope_interface ];
From 5c62f526d5b32af06553ab90deb6d638eb4024fd Mon Sep 17 00:00:00 2001
From: Michiel Leenaars <ml.software@leenaa.rs>
Date: Tue, 10 Sep 2019 08:00:20 +0200
Subject: [PATCH 5/5] blink: 3.0.3 -> 3.2.0
---
.../instant-messengers/blink/default.nix | 33 ++++++++++++++-----
pkgs/top-level/all-packages.nix | 2 +-
2 files changed, 26 insertions(+), 9 deletions(-)
diff --git a/pkgs/applications/networking/instant-messengers/blink/default.nix b/pkgs/applications/networking/instant-messengers/blink/default.nix
index 001eadbb01d..62d0d738b50 100644
--- a/pkgs/applications/networking/instant-messengers/blink/default.nix
+++ b/pkgs/applications/networking/instant-messengers/blink/default.nix
@@ -1,14 +1,15 @@
{ stdenv, fetchdarcs, pythonPackages, libvncserver, zlib
-, gnutls, libvpx, makeDesktopItem }:
+, gnutls, libvpx, makeDesktopItem, mkDerivationWith }:
+
+mkDerivationWith pythonPackages.buildPythonApplication rec {
-pythonPackages.buildPythonApplication rec {
pname = "blink";
- version = "3.0.3";
+ version = "3.2.0";
src = fetchdarcs {
url = http://devel.ag-projects.com/repositories/blink-qt;
rev = "release-${version}";
- sha256 = "1vj6zzfvxygz0fzr8bhymcw6j4v8xmr0kba53d6qg285j7hj1bdi";
+ sha256 = "19rcwr5scw48qnj79q1pysw95fz9h98nyc3161qy2kph5g7dwkc3";
};
patches = [ ./pythonpath.patch ];
@@ -16,9 +17,20 @@ pythonPackages.buildPythonApplication rec {
sed -i 's|@out@|'"''${out}"'|g' blink/resources.py
'';
- propagatedBuildInputs = with pythonPackages; [ pyqt5_with_qtwebkit cjson sipsimple twisted google_api_python_client ];
+ propagatedBuildInputs = with pythonPackages; [
+ pyqt5_with_qtwebkit
+ cjson
+ sipsimple
+ twisted
+ google_api_python_client
+ ];
- buildInputs = [ pythonPackages.cython zlib libvncserver libvpx ];
+ buildInputs = [
+ pythonPackages.cython
+ zlib
+ libvncserver
+ libvpx
+ ];
desktopItem = makeDesktopItem {
name = "Blink";
@@ -30,9 +42,14 @@ pythonPackages.buildPythonApplication rec {
categories = "Application;Internet;";
};
+ dontWrapQtApps = true;
+
+ makeWrapperArgs = [
+ "\${qtWrapperArgs[@]}"
+ "--prefix LD_LIBRARY_PATH: ${gnutls.out}/lib"
+ ];
+
postInstall = ''
- wrapProgram $out/bin/blink \
- --prefix LD_LIBRARY_PATH ":" ${gnutls.out}/lib
mkdir -p "$out/share/applications"
mkdir -p "$out/share/pixmaps"
cp "$desktopItem"/share/applications/* "$out/share/applications"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fd2c3cbe3e4..787d7bc9538 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1100,7 +1100,7 @@ in
bitbucket-cli = python2Packages.bitbucket-cli;
- blink = callPackage ../applications/networking/instant-messengers/blink { };
+ blink = libsForQt5.callPackage ../applications/networking/instant-messengers/blink { };
blockbook = callPackage ../servers/blockbook { };