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

Merge pull request #37639 from Twey/plover-4.0.0.dev6

Browse Source 
Plover 4.0.0.dev6
This commit is contained in:
Matthew Justin Bauer 2018-05-02 12:49:02 -05:00 committed by GitHub
commit bead42df5d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 44 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
pkgs/applications/misc/plover/default.nix
View File

@ -1,8 +1,9 @@
{ stdenv, fetchurl, python27Packages, wmctrl }: { stdenv, fetchurl, python27Packages, python36Packages, wmctrl }:
python27Packages.buildPythonPackage rec { {
stable = with python27Packages; buildPythonPackage rec {
name = "plover-${version}"; name = "plover-${version}";
version = "3.1.0"; version = "3.1.1";
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "OpenSteno Plover stenography software"; description = "OpenSteno Plover stenography software";
@ -12,15 +13,35 @@ python27Packages.buildPythonPackage rec {
src = fetchurl { src = fetchurl {
url = "https://github.com/openstenoproject/plover/archive/v${version}.tar.gz"; url = "https://github.com/openstenoproject/plover/archive/v${version}.tar.gz";
sha256 = "1zdlgyjp93sfvk6by7rsh9hj4ijzplglrxpcpkcir6c3nq2bixl4"; sha256 = "1hdg5491phx6svrxxsxp8v6n4b25y7y4wxw7x3bxlbyhaskgj53r";
}; };
# This is a fix for https://github.com/pypa/pip/issues/3624 causing regression https://github.com/pypa/pip/issues/3781 buildInputs = [ pytest mock ];
postPatch = '' propagatedBuildInputs = [
substituteInPlace setup.py --replace " in sys_platform" " == sys_platform" six setuptools pyserial appdirs hidapi wxPython xlib wmctrl
''; ];
};
buildInputs = with python27Packages; [ pytest mock ]; dev = with python36Packages; buildPythonPackage rec {
propagatedBuildInputs = with python27Packages; [ six setuptools pyserial appdirs hidapi name = "plover-${version}";
wxPython xlib wmctrl ]; version = "4.0.0.dev6";
meta = with stdenv.lib; {
description = "OpenSteno Plover stenography software";
maintainers = with maintainers; [ twey kovirobi ];
license = licenses.gpl2;
};
src = fetchurl {
url = "https://github.com/openstenoproject/plover/archive/v${version}.tar.gz";
sha256 = "067rkpqnjjxwyv9cwh9i925ndba6fvj6q0r56lizy0l26b4jc8rp";
};
# I'm not sure why we don't find PyQt5 here but there's a similar
# sed on many of the platforms Plover builds for
postPatch = "sed -i /PyQt5/d setup.cfg";
buildInputs = [ pytest mock ];
propagatedBuildInputs = [ Babel pyqt5 xlib pyserial appdirs ];
};
} }

4
pkgs/development/python-modules/pyqt/5.x.nix
View File

@ -6,7 +6,7 @@
let let
pname = "PyQt"; pname = "PyQt";
version = "5.10"; version = "5.10.1";
inherit (pythonPackages) buildPythonPackage python dbus-python sip; inherit (pythonPackages) buildPythonPackage python dbus-python sip;
@ -25,7 +25,7 @@ in buildPythonPackage {
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/pyqt/PyQt5/PyQt-${version}/PyQt5_gpl-${version}.tar.gz"; url = "mirror://sourceforge/pyqt/PyQt5/PyQt-${version}/PyQt5_gpl-${version}.tar.gz";
sha256 = "0l2zy6b7bfjxmg4bb8yikg6i8iy2xdwmvk7knfmrzfpqbmkycbrl"; sha256 = "1vz9c4v0k8azk2b08swwybrshzw32x8djjpq13mf9v15x1qyjclr";
}; };
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];

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

@ -17367,7 +17367,7 @@ with pkgs;
gtksharp = gtk-sharp-2_0; gtksharp = gtk-sharp-2_0;
}; };
plover = callPackage ../applications/misc/plover { }; plover = recurseIntoAttrs (callPackage ../applications/misc/plover { });
plugin-torture = callPackage ../applications/audio/plugin-torture { }; plugin-torture = callPackage ../applications/audio/plugin-torture { };