alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

anki: update sqlalchemy build input and clean up the expression

Browse source 
SQLAlchemy-0.9.9 was broken recently, probably because of an sqlite
update. So we just use the latest version.

The build expression used to take the entire package set as an argument,
which is poor style because it hides the true dependencies from the
interface. I've change the code to expect the appropriate individual
packages instead.
This commit is contained in:
Peter Simons 2016-03-15 10:59:12 +01:00
parent 440b301d0a
commit fdcd875b0e
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/games/anki/default.nix
View file

@ -1,11 +1,12 @@
{ stdenv, lib, fetchurl, substituteAll, lame, mplayer { stdenv, lib, fetchurl, substituteAll, lame, mplayer
, libpulseaudio, python, pyqt4, qt4, pythonPackages , libpulseaudio, python, pyqt4, qt4, wrapPython
, pysqlite, sqlalchemy, pyaudio, beautifulsoup, httplib2, matplotlib
# This little flag adds a huge number of dependencies, but we assume that # This little flag adds a huge number of dependencies, but we assume that
# everyone wants Anki to draw plots with statistics by default. # everyone wants Anki to draw plots with statistics by default.
, plotsSupport ? true }: , plotsSupport ? true
}:
let let
py = pythonPackages;
version = "2.0.33"; version = "2.0.33";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -18,10 +19,10 @@ stdenv.mkDerivation rec {
sha256 = "1d5rf5gcw98m38wam6wh3hyh7qd78ws7zipm67xg744flqsjrzmr"; sha256 = "1d5rf5gcw98m38wam6wh3hyh7qd78ws7zipm67xg744flqsjrzmr";
}; };
pythonPath = [ pyqt4 py.pysqlite py.sqlalchemy9 py.pyaudio py.beautifulsoup py.httplib2 ] pythonPath = [ pyqt4 pysqlite sqlalchemy pyaudio beautifulsoup httplib2 ]
++ lib.optional plotsSupport py.matplotlib; ++ lib.optional plotsSupport matplotlib;
buildInputs = [ python py.wrapPython lame mplayer libpulseaudio ]; buildInputs = [ python wrapPython lame mplayer libpulseaudio ];
phases = [ "unpackPhase" "patchPhase" "installPhase" ]; phases = [ "unpackPhase" "patchPhase" "installPhase" ];

4
pkgs/top-level/all-packages.nix
View file

@ -14540,7 +14540,9 @@ let
andyetitmoves = if stdenv.isLinux then callPackage ../games/andyetitmoves {} else null; andyetitmoves = if stdenv.isLinux then callPackage ../games/andyetitmoves {} else null;
anki = callPackage ../games/anki { }; anki = callPackage ../games/anki {
inherit (pythonPackages) wrapPython pysqlite sqlalchemy pyaudio beautifulsoup httplib2 matplotlib;
};
armagetronad = callPackage ../games/armagetronad { }; armagetronad = callPackage ../games/armagetronad { };