about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorJoachim Fasting <joachifm@fastmail.fm>2018-02-17 12:20:41 +0100
committerJoachim Fasting <joachifm@fastmail.fm>2018-02-17 12:21:26 +0100
commit05f5cdcf66ecc3e56df699c37bbdba7b1a8c107b (patch)
treea2c1c9e6cdae4ab32e019bc9ca7131cbad485584 /pkgs
parent635011f219b0084279242dc664ce7efed5f30b24 (diff)
downloadnixlib-05f5cdcf66ecc3e56df699c37bbdba7b1a8c107b.tar
nixlib-05f5cdcf66ecc3e56df699c37bbdba7b1a8c107b.tar.gz
nixlib-05f5cdcf66ecc3e56df699c37bbdba7b1a8c107b.tar.bz2
nixlib-05f5cdcf66ecc3e56df699c37bbdba7b1a8c107b.tar.lz
nixlib-05f5cdcf66ecc3e56df699c37bbdba7b1a8c107b.tar.xz
nixlib-05f5cdcf66ecc3e56df699c37bbdba7b1a8c107b.tar.zst
nixlib-05f5cdcf66ecc3e56df699c37bbdba7b1a8c107b.zip
Revert "Merge pull request #30031 from dtzWill/update/leo-5.6"
This reverts commit 67c5cb23e9231ebb302ce04e33f2045dbf288ec2, reversing
changes made to 431c004fbd8f250c34ea876823e5d51890b84153.

I failed to notice that this depends on a package that had since
been removed. My bad :(
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/editors/leo-editor/default.nix12
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 924e662b8084..b05bbd053c1f 100644
--- a/pkgs/applications/editors/leo-editor/default.nix
+++ b/pkgs/applications/editors/leo-editor/default.nix
@@ -1,20 +1,20 @@
-{ stdenv, python3, fetchFromGitHub, makeWrapper, makeDesktopItem }:
+{ stdenv, python3Packages, fetchFromGitHub, makeWrapper, makeDesktopItem }:
 
 stdenv.mkDerivation rec {
   name = "leo-editor-${version}";
-  version = "5.6";
+  version = "5.5";
 
   src = fetchFromGitHub {
     owner = "leo-editor";
     repo = "leo-editor";
     rev = version;
-    sha256 = "1k6q3gvaf05bi0mzkmmb1p6wrgxwri7ivn38p6f0m0wfd3f70x2j";
+    sha256 = "0crzljirzfiy9xn02ydd23clmd8bzdjxkyxdqsvdkgfy9j41b8hr";
   };
 
   dontBuild = true;
 
-  nativeBuildInputs = [ makeWrapper python3 ];
-  propagatedBuildInputs = with python3.pkgs; [ pyqt56 docutils ];
+  nativeBuildInputs = [ makeWrapper python3Packages.python ];
+  propagatedBuildInputs = with python3Packages; [ pyqt5 ];
 
   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 ${python3.interpreter} $out/bin/leo \
+    makeWrapper ${python3Packages.python.interpreter} $out/bin/leo \
       --set PYTHONPATH "$PYTHONPATH:$out/share/leo-editor" \
       --add-flags "-O $out/share/leo-editor/launchLeo.py"
   '';