diff options
| author | Joachim F <joachifm@users.noreply.github.com> | 2018-02-17 10:07:58 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-17 10:07:58 +0000 |
| commit | 67c5cb23e9231ebb302ce04e33f2045dbf288ec2 (patch) | |
| tree | cc0ab1d33917203053c842c8bfb09fa8007d442e /pkgs | |
| parent | 431c004fbd8f250c34ea876823e5d51890b84153 (diff) | |
| parent | 9b9cb0a0385d941b4fd70f19541fd5db7b218103 (diff) | |
| download | nixlib-67c5cb23e9231ebb302ce04e33f2045dbf288ec2.tar nixlib-67c5cb23e9231ebb302ce04e33f2045dbf288ec2.tar.gz nixlib-67c5cb23e9231ebb302ce04e33f2045dbf288ec2.tar.bz2 nixlib-67c5cb23e9231ebb302ce04e33f2045dbf288ec2.tar.lz nixlib-67c5cb23e9231ebb302ce04e33f2045dbf288ec2.tar.xz nixlib-67c5cb23e9231ebb302ce04e33f2045dbf288ec2.tar.zst nixlib-67c5cb23e9231ebb302ce04e33f2045dbf288ec2.zip | |
Merge pull request #30031 from dtzWill/update/leo-5.6
leo-editor: 5.5 -> 5.6, add docutils and use pyqt56
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/editors/leo-editor/default.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/applications/editors/leo-editor/default.nix b/pkgs/applications/editors/leo-editor/default.nix index b05bbd053c1f..924e662b8084 100644 --- a/pkgs/applications/editors/leo-editor/default.nix +++ b/pkgs/applications/editors/leo-editor/default.nix @@ -1,20 +1,20 @@ -{ stdenv, python3Packages, fetchFromGitHub, makeWrapper, makeDesktopItem }: +{ stdenv, python3, fetchFromGitHub, makeWrapper, makeDesktopItem }: stdenv.mkDerivation rec { name = "leo-editor-${version}"; - version = "5.5"; + version = "5.6"; src = fetchFromGitHub { owner = "leo-editor"; repo = "leo-editor"; rev = version; - sha256 = "0crzljirzfiy9xn02ydd23clmd8bzdjxkyxdqsvdkgfy9j41b8hr"; + sha256 = "1k6q3gvaf05bi0mzkmmb1p6wrgxwri7ivn38p6f0m0wfd3f70x2j"; }; dontBuild = true; - nativeBuildInputs = [ makeWrapper python3Packages.python ]; - propagatedBuildInputs = with python3Packages; [ pyqt5 ]; + nativeBuildInputs = [ makeWrapper python3 ]; + propagatedBuildInputs = with python3.pkgs; [ pyqt56 docutils ]; desktopItem = makeDesktopItem rec { name = "leo-editor"; @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { mkdir -p $out/share/leo-editor mv * $out/share/leo-editor - makeWrapper ${python3Packages.python.interpreter} $out/bin/leo \ + makeWrapper ${python3.interpreter} $out/bin/leo \ --set PYTHONPATH "$PYTHONPATH:$out/share/leo-editor" \ --add-flags "-O $out/share/leo-editor/launchLeo.py" ''; |