diff options
| author | Will Dietz <w@wdtz.org> | 2018-02-18 16:24:59 -0600 |
|---|---|---|
| committer | Will Dietz <w@wdtz.org> | 2018-02-18 16:24:59 -0600 |
| commit | 4139a6f0e5109859bc5a5043dac9d878a6f0fa58 (patch) | |
| tree | 0b50793ac8dd4bb0dc0d337a29e6ead0b4b7f878 /pkgs | |
| parent | 3ab38ef086947822fbe2cffea071e1c508811990 (diff) | |
| download | nixpkgs-4139a6f0e5109859bc5a5043dac9d878a6f0fa58.tar nixpkgs-4139a6f0e5109859bc5a5043dac9d878a6f0fa58.tar.gz nixpkgs-4139a6f0e5109859bc5a5043dac9d878a6f0fa58.tar.bz2 nixpkgs-4139a6f0e5109859bc5a5043dac9d878a6f0fa58.tar.lz nixpkgs-4139a6f0e5109859bc5a5043dac9d878a6f0fa58.tar.xz nixpkgs-4139a6f0e5109859bc5a5043dac9d878a6f0fa58.tar.zst nixpkgs-4139a6f0e5109859bc5a5043dac9d878a6f0fa58.zip | |
Revert "Revert "Merge pull request #30031 from dtzWill/update/leo-5.6""
This reverts commit 05f5cdcf66ecc3e56df699c37bbdba7b1a8c107b.
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 b05bbd053c1..924e662b808 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" ''; |