public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #68405 from leenaars/blink320

Browse Source 
Blink + dependencies: update 3.0.3 -> 3.2.0
This commit is contained in:
worldofpeace 2019-09-17 07:43:32 -04:00 committed by GitHub
commit 8f3421ec34
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 34 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
pkgs/applications/networking/instant-messengers/blink/default.nix
View File

@ -1,14 +1,15 @@
{ stdenv, fetchdarcs, pythonPackages, libvncserver, zlib { stdenv, fetchdarcs, pythonPackages, libvncserver, zlib
, gnutls, libvpx, makeDesktopItem }: , gnutls, libvpx, makeDesktopItem, mkDerivationWith }:
mkDerivationWith pythonPackages.buildPythonApplication rec {
pythonPackages.buildPythonApplication rec {
pname = "blink"; pname = "blink";
version = "3.0.3"; version = "3.2.0";
src = fetchdarcs { src = fetchdarcs {
url = http://devel.ag-projects.com/repositories/blink-qt; url = http://devel.ag-projects.com/repositories/blink-qt;
rev = "release-${version}"; rev = "release-${version}";
sha256 = "1vj6zzfvxygz0fzr8bhymcw6j4v8xmr0kba53d6qg285j7hj1bdi"; sha256 = "19rcwr5scw48qnj79q1pysw95fz9h98nyc3161qy2kph5g7dwkc3";
}; };
patches = [ ./pythonpath.patch ]; patches = [ ./pythonpath.patch ];
@ -16,9 +17,20 @@ pythonPackages.buildPythonApplication rec {
sed -i 's|@out@|'"''${out}"'|g' blink/resources.py 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 { desktopItem = makeDesktopItem {
name = "Blink"; name = "Blink";
@ -30,9 +42,14 @@ pythonPackages.buildPythonApplication rec {
categories = "Application;Internet;"; categories = "Application;Internet;";
}; };
dontWrapQtApps = true;
makeWrapperArgs = [
"\${qtWrapperArgs[@]}"
"--prefix LD_LIBRARY_PATH: ${gnutls.out}/lib"
];
postInstall = '' postInstall = ''
wrapProgram $out/bin/blink \
--prefix LD_LIBRARY_PATH ":" ${gnutls.out}/lib
mkdir -p "$out/share/applications" mkdir -p "$out/share/applications"
mkdir -p "$out/share/pixmaps" mkdir -p "$out/share/pixmaps"
cp "$desktopItem"/share/applications/* "$out/share/applications" cp "$desktopItem"/share/applications/* "$out/share/applications"

4
pkgs/development/python-modules/application/default.nix
View File

@ -2,13 +2,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "python-application"; pname = "python-application";
version = "2.0.2"; version = "2.7.0";
disabled = isPy3k; disabled = isPy3k;
src = fetchdarcs { src = fetchdarcs {
url = "http://devel.ag-projects.com/repositories/${pname}"; url = "http://devel.ag-projects.com/repositories/${pname}";
rev = "release-${version}"; rev = "release-${version}";
sha256 = "19dszv44py8qrq0jcjdycxpa7z2p8hi3ijq9gnqdsazbbjzf9svn"; sha256 = "1xpyk2v3naxkjhpyris58dxg1lxbraxgjd6f7w1sah5j0sk7psla";
}; };
buildInputs = [ zope_interface ]; buildInputs = [ zope_interface ];

4
pkgs/development/python-modules/eventlib/default.nix
View File

@ -7,14 +7,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "python-eventlib"; pname = "python-eventlib";
version = "0.2.2"; version = "0.2.4";
# Judging from SyntaxError # Judging from SyntaxError
disabled = isPy3k; disabled = isPy3k;
src = fetchdarcs { src = fetchdarcs {
url = "http://devel.ag-projects.com/repositories/${pname}"; url = "http://devel.ag-projects.com/repositories/${pname}";
rev = "release-${version}"; rev = "release-${version}";
sha256 = "1zxhpq8i4jwsk7wmfncqfm211hqikj3hp38cfv509924bi76wak8"; sha256 = "1w1axsm6w9bl2smzxmyk4in1lsm8gk8ma6y183m83cpj66aqxg4z";
}; };
propagatedBuildInputs = [ greenlet ]; propagatedBuildInputs = [ greenlet ];

4
pkgs/development/python-modules/msrplib/default.nix
View File

@ -8,12 +8,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "python-msrplib"; pname = "python-msrplib";
version = "0.19"; version = "0.19.2";
src = fetchdarcs { src = fetchdarcs {
url = "http://devel.ag-projects.com/repositories/${pname}"; url = "http://devel.ag-projects.com/repositories/${pname}";
rev = "release-${version}"; rev = "release-${version}";
sha256 = "0jqvvssbwzq7bwqn3wrjfnpj8zb558mynn2visnlrcma6b57yhwd"; sha256 = "0d0krwv4hhspjgppnvh0iz51bvdbz23cjasgrppip7x8b00514gz";
}; };
propagatedBuildInputs = [ eventlib application gnutls ]; propagatedBuildInputs = [ eventlib application gnutls ];

4
pkgs/development/python-modules/xcaplib/default.nix
View File

@ -8,13 +8,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "python-xcaplib"; pname = "python-xcaplib";
version = "1.2.0"; version = "1.2.1";
disabled = isPy3k; disabled = isPy3k;
src = fetchdarcs { src = fetchdarcs {
url = "http://devel.ag-projects.com/repositories/${pname}"; url = "http://devel.ag-projects.com/repositories/${pname}";
rev = "release-${version}"; rev = "release-${version}";
sha256 = "0vna5r4ihv7z1yx6r93954jqskcxky77znzy1m9dg9vna1dgwfdn"; sha256 = "15ww8f0a9zh37mypw5s4q1qk44cwf7jlhc9q1z4vjlpvnzimg54v";
}; };
propagatedBuildInputs = [ eventlib application ]; propagatedBuildInputs = [ eventlib application ];

2
pkgs/top-level/all-packages.nix
View File

@ -1098,7 +1098,7 @@ in
bitbucket-cli = python2Packages.bitbucket-cli; bitbucket-cli = python2Packages.bitbucket-cli;
blink = callPackage ../applications/networking/instant-messengers/blink { }; blink = libsForQt5.callPackage ../applications/networking/instant-messengers/blink { };
blockbook = callPackage ../servers/blockbook { }; blockbook = callPackage ../servers/blockbook { };