diff options
Diffstat (limited to 'pkgs/misc')
-rw-r--r-- | pkgs/misc/jackaudio/default.nix | 4 | ||||
-rw-r--r-- | pkgs/misc/jackaudio/git.nix | 4 | ||||
-rw-r--r-- | pkgs/misc/lilypond/default.nix | 4 | ||||
-rw-r--r-- | pkgs/misc/solfege/default.nix | 4 | ||||
-rw-r--r-- | pkgs/misc/themes/zuki/default.nix | 6 |
5 files changed, 11 insertions, 11 deletions
diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index 06389c01ce0c..a4e4e408fec5 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, pythonPackages, makeWrapper +{ stdenv, fetchFromGitHub, pkgconfig, python2Packages, makeWrapper , bash, libsamplerate, libsndfile, readline, gcc # Optional Dependencies @@ -11,7 +11,7 @@ with stdenv.lib; let - inherit (pythonPackages) python dbus-python; + inherit (python2Packages) python dbus-python; shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null; libOnly = prefix == "lib"; diff --git a/pkgs/misc/jackaudio/git.nix b/pkgs/misc/jackaudio/git.nix index 7deeaadbb10c..ac50b4c3d394 100644 --- a/pkgs/misc/jackaudio/git.nix +++ b/pkgs/misc/jackaudio/git.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, pythonPackages, makeWrapper +{ stdenv, fetchFromGitHub, pkgconfig, python2Packages, makeWrapper , bash, libsamplerate, libsndfile, readline # Optional Dependencies @@ -11,7 +11,7 @@ with stdenv.lib; let - inherit (pythonPackages) python dbus-python; + inherit (python2Packages) python dbus-python; shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null; libOnly = prefix == "lib"; diff --git a/pkgs/misc/lilypond/default.nix b/pkgs/misc/lilypond/default.nix index 731dc263a022..15481d74598f 100644 --- a/pkgs/misc/lilypond/default.nix +++ b/pkgs/misc/lilypond/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, ghostscript, texinfo, imagemagick, texi2html, guile -, python, gettext, flex, perl, bison, pkgconfig, dblatex +, python2, gettext, flex, perl, bison, pkgconfig, dblatex , fontconfig, freetype, pango, fontforge, help2man, zip, netpbm, groff , fetchsvn, makeWrapper, t1utils , texlive, tex ? texlive.combine { @@ -48,7 +48,7 @@ stdenv.mkDerivation rec{ buildInputs = [ ghostscript texinfo imagemagick texi2html guile dblatex tex zip netpbm - python gettext flex perl bison pkgconfig fontconfig freetype pango + python2 gettext flex perl bison pkgconfig fontconfig freetype pango fontforge help2man groff makeWrapper t1utils ]; diff --git a/pkgs/misc/solfege/default.nix b/pkgs/misc/solfege/default.nix index 8e9083d99229..114e18dc93f8 100644 --- a/pkgs/misc/solfege/default.nix +++ b/pkgs/misc/solfege/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, pythonPackages, gettext, texinfo -, ghostscript, pysqlite, librsvg, gdk_pixbuf, txt2man, timidity, mpg123 +, ghostscript, librsvg, gdk_pixbuf, txt2man, timidity, mpg123 , alsaUtils, vorbis-tools, csound, lilypond , makeWrapper }: @@ -15,7 +15,7 @@ in stdenv.mkDerivation rec { }; buildInputs = [ pkgconfig python pygtk gettext texinfo - ghostscript pysqlite librsvg gdk_pixbuf txt2man makeWrapper + ghostscript librsvg gdk_pixbuf txt2man makeWrapper ]; preBuild = '' diff --git a/pkgs/misc/themes/zuki/default.nix b/pkgs/misc/themes/zuki/default.nix index 73bc677854a1..6da6d24902ed 100644 --- a/pkgs/misc/themes/zuki/default.nix +++ b/pkgs/misc/themes/zuki/default.nix @@ -4,20 +4,20 @@ stdenv.mkDerivation rec { name = "zuki-themes-${version}"; version = "${gnome3.version}.${date}"; date = { - "3.18" = "2016-06-21"; "3.20" = "2016-07-01"; + "3.22" = "2016-10-20"; }."${gnome3.version}"; src = fetchFromGitHub { owner = "lassekongo83"; repo = "zuki-themes"; rev = { - "3.18" = "5c83a847ad8fab0fe0b82ed2a7db429655ac9c10"; "3.20" = "dda1726ac7b556df2ef9696e530f8c2eaa0aed37"; + "3.22" = "a48f0f12f81c49b480f82369ae45cfa49d78b143"; }."${gnome3.version}"; sha256 = { - "3.18" = "1x9zrx5dqq8kivhqj5kjwhy4vwr899pri6jvwxbff5hibvyc7ipy"; "3.20" = "0p7db8a2ni494vwp3b7av7d214fnynf6gr976qma6h9x4ck3phiz"; + "3.22" = "05sa5ighq01krbgfd4lddxvbhfqk5x5kgw6jnxwvx9rmmff713s1"; }."${gnome3.version}"; }; |