Merge remote-tracking branch 'upstream/master' into staging-next

* upstream/master:
  vimPlugins: update (#67823)
  mattermost-desktop: 4.2.0 -> 4.2.3 (#67717)
  lightspark: init at 0.8.1 (#67425)
  anki: 2.1.11 -> 2.1.14 (#67738)
  nixos/{namecoind,bitcoind}: removing the altcoin prefix
  rust-cbindgen: 0.8.7 -> 0.9.0
This commit is contained in:
Samuel Leathers
2019-08-31 06:53:44 -04:00
8 changed files with 256 additions and 216 deletions
+6 -5
View File
@@ -18,6 +18,7 @@
, pytest
, glibcLocales
, nose
, jsonschema
, send2trash
, CoreAudio
# This little flag adds a huge number of dependencies, but we assume that
@@ -31,10 +32,10 @@ let
# when updating, also update rev-manual to a recent version of
# https://github.com/dae/ankidocs
# The manual is distributed independently of the software.
version = "2.1.11";
sha256-pkg = "0rcjam7f017yg0fx5apdc309lsx59lfw33nikczz7hrw6gby6z3q";
rev-manual = "f933104fecd8a83c33494bdb2b59817a3318202f";
sha256-manual = "12j4x1bh8x6yinym4d1ard32vfl22iq2wz1lfwz6s3ljhggkc52h";
version = "2.1.15";
sha256-pkg = "12dvyf3j9df4nrhhnqbzd9b21rpzkh4i6yhhangn2zf7ch0pclss";
rev-manual = "8f6387867ac37ef3fe9d0b986e70f898d1a49139";
sha256-manual = "0pm5slxn78r44ggvbksz7rv9hmlnsvn9z811r6f63dsc8vm6mfml";
manual = stdenv.mkDerivation {
pname = "anki-manual";
@@ -86,7 +87,7 @@ buildPythonApplication rec {
propagatedBuildInputs = [
pyqtwebengine sqlalchemy beautifulsoup4 send2trash pyaudio requests decorator
markdown
markdown jsonschema
]
++ lib.optional plotsSupport matplotlib
++ lib.optional stdenv.isDarwin [ CoreAudio ]