diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2018-02-14 19:48:29 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-14 19:48:29 +0000 |
| commit | 9b9eeb53e806198c323f5c327b6d0ad2e6c1cf01 (patch) | |
| tree | 78c4082c57f47e1ae4938c09031fe44ce25f2974 | |
| parent | ef9666e0256bdb944901abd58fecd1d8f113f35b (diff) | |
| parent | d440ffab7d86fe5e10d7ece4b856634651600696 (diff) | |
| download | nixlib-9b9eeb53e806198c323f5c327b6d0ad2e6c1cf01.tar nixlib-9b9eeb53e806198c323f5c327b6d0ad2e6c1cf01.tar.gz nixlib-9b9eeb53e806198c323f5c327b6d0ad2e6c1cf01.tar.bz2 nixlib-9b9eeb53e806198c323f5c327b6d0ad2e6c1cf01.tar.lz nixlib-9b9eeb53e806198c323f5c327b6d0ad2e6c1cf01.tar.xz nixlib-9b9eeb53e806198c323f5c327b6d0ad2e6c1cf01.tar.zst nixlib-9b9eeb53e806198c323f5c327b6d0ad2e6c1cf01.zip | |
Merge pull request #32799 from dotlambda/mnemosyne
mnemosyne: 2.3.2 -> 2.6
| -rw-r--r-- | pkgs/games/mnemosyne/default.nix | 34 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 25 insertions, 13 deletions
diff --git a/pkgs/games/mnemosyne/default.nix b/pkgs/games/mnemosyne/default.nix index 02bd0ba78d18..a5b349334923 100644 --- a/pkgs/games/mnemosyne/default.nix +++ b/pkgs/games/mnemosyne/default.nix @@ -1,30 +1,40 @@ { stdenv , fetchurl -, pythonPackages +, python }: -let - version = "2.3.2"; -in pythonPackages.buildPythonApplication rec { - name = "mnemosyne-${version}"; + +python.pkgs.buildPythonApplication rec { + pname = "mnemosyne"; + version = "2.6"; + src = fetchurl { - url = "http://sourceforge.net/projects/mnemosyne-proj/files/mnemosyne/${name}/Mnemosyne-${version}.tar.gz"; - sha256 = "0jkrw45i4v24p6xyq94z7rz5948h7f5dspgs5mcdaslnlp2accfp"; + url = "mirror://sourceforge/project/mnemosyne-proj/mnemosyne/mnemosyne-${version}/Mnemosyne-${version}.tar.gz"; + sha256 = "0b7b5sk5bfbsg5cyybkv5xw9zw257v3khsn0lwlbxnlhakd0rsg4"; }; - propagatedBuildInputs = with pythonPackages; [ - pyqt4 + + propagatedBuildInputs = with python.pkgs; [ + pyqt5 matplotlib cherrypy + cheroot webob + pillow ]; - preConfigure = '' + + # No tests/ directrory in tarball + doCheck = false; + + prePatch = '' substituteInPlace setup.py --replace /usr $out find . -type f -exec grep -H sys.exec_prefix {} ';' | cut -d: -f1 | xargs sed -i s,sys.exec_prefix,\"$out\", ''; + postInstall = '' mkdir -p $out/share - mv $out/lib/python2.7/site-packages/$out/share/locale $out/share - rm -r $out/lib/python2.7/site-packages/nix + mv $out/${python.sitePackages}/$out/share/locale $out/share + rm -r $out/${python.sitePackages}/nix ''; + meta = { homepage = https://mnemosyne-proj.org/; description = "Spaced-repetition software"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b4c48fce84f0..fd308bcf483b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18567,7 +18567,9 @@ with pkgs; libpng = libpng12; }; - mnemosyne = callPackage ../games/mnemosyne { }; + mnemosyne = callPackage ../games/mnemosyne { + python = python3; + }; mrrescue = callPackage ../games/mrrescue { }; |