Merge branch 'staging'
It contains security updates. I somehow forgot to push this yesterday.
This commit is contained in:
Vladimír Čunát
commit
6b6553c768
|
|
@ -1,9 +1,9 @@
|
|||
{ stdenv, fetchurl, pythonPackages, mygpoclient, intltool
|
||||
{ stdenv, fetchurl, python2Packages, mygpoclient, intltool
|
||||
, ipodSupport ? true, libgpod
|
||||
, gnome3
|
||||
}:
|
||||
|
||||
pythonPackages.buildPythonApplication rec {
|
||||
python2Packages.buildPythonApplication rec {
|
||||
name = "gpodder-${version}";
|
||||
|
||||
version = "3.9.1";
|
||||
|
|
@ -24,12 +24,12 @@ pythonPackages.buildPythonApplication rec {
|
|||
'';
|
||||
|
||||
buildInputs = [
|
||||
intltool pythonPackages.coverage pythonPackages.minimock
|
||||
intltool python2Packages.coverage python2Packages.minimock
|
||||
gnome3.gnome_themes_standard gnome3.defaultIconTheme
|
||||
gnome3.gsettings_desktop_schemas
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with pythonPackages; [
|
||||
propagatedBuildInputs = with python2Packages; [
|
||||
feedparser dbus-python mygpoclient pygtk eyeD3
|
||||
] ++ stdenv.lib.optional ipodSupport libgpod;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ stdenv, fetchurl, makeWrapper, pkgconfig, MMA, libjack2, libsmf, pythonPackages }:
|
||||
{ stdenv, fetchurl, makeWrapper, pkgconfig, MMA, libjack2, libsmf, python2Packages }:
|
||||
|
||||
let
|
||||
inherit (pythonPackages) pyGtkGlade pygtksourceview python;
|
||||
inherit (python2Packages) pyGtkGlade pygtksourceview python;
|
||||
in stdenv.mkDerivation rec {
|
||||
version = "12.02.1";
|
||||
name = "linuxband-${version}";
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
{ fetchurl, stdenv }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ed-1.13";
|
||||
name = "ed-${version}";
|
||||
version = "1.14.1";
|
||||
|
||||
src = fetchurl {
|
||||
# gnu only provides *.lz tarball, which is unfriendly for stdenv bootstrapping
|
||||
|
|
@ -9,13 +10,13 @@ stdenv.mkDerivation rec {
|
|||
# When updating, please make sure the sources pulled match those upstream by
|
||||
# Unpacking both tarballs and running `find . -type f -exec sha256sum \{\} \; | sha256sum`
|
||||
# in the resulting directory
|
||||
urls = let file_md5 = "fb8ffc8d8072e13dd5799131e889bfa5"; # for fedora mirror
|
||||
urls = let file_sha512 = "84396fe4e4f0bf0b591037277ff8679a08b2883207628aaa387644ad83ca5fbdaa74a581f33310e28222d2fea32a0b8ba37e579597cc7d6145df6eb956ea75db";
|
||||
in [
|
||||
("http://pkgs.fedoraproject.org/repo/extras/ed"
|
||||
+ "/${name}.tar.bz2/${file_md5}/${name}.tar.bz2")
|
||||
+ "/${name}.tar.bz2/sha512/${file_sha512}/${name}.tar.bz2")
|
||||
"http://fossies.org/linux/privat/${name}.tar.bz2"
|
||||
];
|
||||
sha256 = "1iym2fsamxr886l3sz8lqzgf00bip5cr0aly8jp04f89kf5mvl0j";
|
||||
sha256 = "1pk6qa4sr7qc6vgm34hjx44hsh8x2bwaxhdi78jhsacnn4zwi7bw";
|
||||
};
|
||||
|
||||
/* FIXME: Tests currently fail on Darwin:
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, lib, fetchurl, pythonPackages }:
|
||||
{ stdenv, lib, fetchurl, python2Packages }:
|
||||
|
||||
#
|
||||
# TODO: Declare configuration options for the following optional dependencies:
|
||||
|
|
@ -7,17 +7,16 @@
|
|||
# - pyxdg: Need to make it work first (see setupPyInstallFlags).
|
||||
#
|
||||
|
||||
pythonPackages.buildPythonApplication rec {
|
||||
python2Packages.buildPythonApplication rec {
|
||||
name = "zim-${version}";
|
||||
version = "0.65";
|
||||
namePrefix = "";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://zim-wiki.org/downloads/${name}.tar.gz";
|
||||
sha256 = "15pdq4fxag85qjsrdmmssiq85qsk5vnbp8mrqnpvx8lm8crz6hjl";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with pythonPackages; [ pyGtkGlade pyxdg pygobject2 ];
|
||||
propagatedBuildInputs = with python2Packages; [ pyGtkGlade pyxdg pygobject2 ];
|
||||
|
||||
preBuild = ''
|
||||
export HOME=$TMP
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ stdenv, fetchurl, pythonPackages, intltool, libxml2Python, curl
|
||||
, wrapGAppsHook, virtinst, gnome_python, gtkvnc, vte
|
||||
{ stdenv, fetchurl, python2Packages, intltool, curl
|
||||
, wrapGAppsHook, virtinst, gtkvnc, vte
|
||||
, gtk3, gobjectIntrospection, libvirt-glib, gsettings_desktop_schemas, glib
|
||||
, avahi, dconf, spiceSupport ? true, spice_gtk, libosinfo, gnome3, system-libvirt
|
||||
}:
|
||||
|
||||
with stdenv.lib;
|
||||
with pythonPackages;
|
||||
with python2Packages;
|
||||
|
||||
buildPythonApplication rec {
|
||||
name = "virt-manager-${version}";
|
||||
|
|
@ -21,8 +21,8 @@ buildPythonApplication rec {
|
|||
[ eventlet greenlet gflags netaddr carrot routes
|
||||
PasteDeploy m2crypto ipy twisted
|
||||
distutils_extra simplejson glanceclient cheetah lockfile httplib2
|
||||
urlgrabber virtinst pyGtkGlade dbus-python gnome_python pygobject3
|
||||
libvirt libxml2Python ipaddr vte libosinfo gobjectIntrospection gtk3 mox
|
||||
urlgrabber virtinst pyGtkGlade dbus-python /*gnome_python FIXME*/ pygobject3
|
||||
libvirt libxml2 ipaddr vte libosinfo gobjectIntrospection gtk3 mox
|
||||
gtkvnc libvirt-glib glib gsettings_desktop_schemas gnome3.defaultIconTheme
|
||||
wrapGAppsHook
|
||||
] ++ optional spiceSupport spice_gtk;
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ stdenv, fetchurl, perl, texinfo }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libtasn1-4.9";
|
||||
name = "libtasn1-4.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/libtasn1/${name}.tar.gz";
|
||||
sha256 = "0869cp6jx7cajgv6cnddsh3vc7bimmdkdjn80y1jpb4iss7plvsg";
|
||||
sha256 = "681a4d9a0d259f2125713f2e5766c5809f151b3a1392fd91390f780b4b8f5a02";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
|
|
|||
|
|
@ -11,6 +11,17 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "06ghqhr4db1ssq0acyyz49gr8k41gzw6pqb6mbn5r7jqp77s4hwz";
|
||||
};
|
||||
|
||||
prePatch =let
|
||||
# https://lwn.net/Vulnerabilities/711777/
|
||||
debian = fetchurl {
|
||||
url = http://http.debian.net/debian/pool/main/t/tiff/tiff_4.0.7-5.debian.tar.xz;
|
||||
sha256 = "1ribxdn89wx3nllcyh7ql3dx6wpr1h7z3waglz1w7dklxm43q67l";
|
||||
};
|
||||
in ''
|
||||
tar xf '${debian}'
|
||||
patches="$patches $(cat debian/patches/series | sed 's|^|debian/patches/|')"
|
||||
'';
|
||||
|
||||
outputs = [ "bin" "dev" "out" "doc" ];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ assert enableGeoLocation -> geoclue2 != null;
|
|||
with stdenv.lib;
|
||||
stdenv.mkDerivation rec {
|
||||
name = "webkitgtk-${version}";
|
||||
version = "2.14.2";
|
||||
version = "2.14.3";
|
||||
|
||||
meta = {
|
||||
description = "Web content rendering engine, GTK+ port";
|
||||
|
|
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "http://webkitgtk.org/releases/${name}.tar.xz";
|
||||
sha256 = "0mjmcxhafh6l6j062z2nwfqbbvfyx16iqrzrbajswijh23awpnrf";
|
||||
sha256 = "0v0hkvggxi38cdb3v672qwr0m0y3x2rmnwh8j3q28869li8d9shb";
|
||||
};
|
||||
|
||||
# see if we can clean this up....
|
||||
|
|
|
|||
33
pkgs/development/tools/misc/gperf/3.0.x.nix
Normal file
33
pkgs/development/tools/misc/gperf/3.0.x.nix
Normal file
|
|
@ -0,0 +1,33 @@
|
|||
{stdenv, fetchurl}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gperf-3.0.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/gperf/${name}.tar.gz";
|
||||
sha256 = "0gnnm8iqcl52m8iha3sxrzrl9mcyhg7lfrhhqgdn4zj00ji14wbn";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Perfect hash function generator";
|
||||
|
||||
longDescription = ''
|
||||
GNU gperf is a perfect hash function generator. For a given
|
||||
list of strings, it produces a hash function and hash table, in
|
||||
form of C or C++ code, for looking up a value depending on the
|
||||
input string. The hash function is perfect, which means that
|
||||
the hash table has no collisions, and the hash table lookup
|
||||
needs a single string comparison only.
|
||||
|
||||
GNU gperf is highly customizable. There are options for
|
||||
generating C or C++ code, for emitting switch statements or
|
||||
nested ifs instead of a hash table, and for tuning the algorithm
|
||||
employed by gperf.
|
||||
'';
|
||||
|
||||
license = stdenv.lib.licenses.gpl3Plus;
|
||||
|
||||
homepage = http://www.gnu.org/software/gperf/;
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,11 +1,11 @@
|
|||
{stdenv, fetchurl}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gperf-3.0.4";
|
||||
name = "gperf-3.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/gperf/${name}.tar.gz";
|
||||
sha256 = "0gnnm8iqcl52m8iha3sxrzrl9mcyhg7lfrhhqgdn4zj00ji14wbn";
|
||||
sha256 = "1qispg6i508rq8pkajh26cznwimbnj06wq9sd85vg95v8nwld1aq";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, python }:
|
||||
{ stdenv, fetchurl, python2 }:
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
name = "omniorb-${version}";
|
||||
|
|
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1g58xcw4641wyisp9wscrkzaqrz0vf123dgy52qq2a3wk7y77hkl";
|
||||
};
|
||||
|
||||
buildInputs = [ python ];
|
||||
buildInputs = [ python2 ];
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -4,12 +4,12 @@ stdenv.mkDerivation rec {
|
|||
name = "util-linux-${version}";
|
||||
version = lib.concatStringsSep "." ([ majorVersion ]
|
||||
++ lib.optional (patchVersion != "") patchVersion);
|
||||
majorVersion = "2.28";
|
||||
patchVersion = "1";
|
||||
majorVersion = "2.29";
|
||||
patchVersion = "";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/utils/util-linux/v${majorVersion}/${name}.tar.xz";
|
||||
sha256 = "03xnaw3c7pavxvvh1vnimcr44hlhhf25whawiyv8dxsflfj4xkiy";
|
||||
sha256 = "1rzrmdrz51p9sy7vlw5qmj8pmqazm7hgcch5yq242mkvrikyln9c";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -3,21 +3,17 @@ which isn't valid on NixOS (and a compatibility link on most other modern
|
|||
distros anyway).
|
||||
|
||||
-- nckx <tobias.geerinckx.rice@gmail.com>
|
||||
diff --git a/include/pathnames.h b/include/pathnames.h
|
||||
index de6a13c..0c1aeb9 100644
|
||||
--- a/include/pathnames.h
|
||||
+++ b/include/pathnames.h
|
||||
@@ -50,7 +50,7 @@
|
||||
#define _PATH_VAR_NOLOGIN "/var/run/nologin"
|
||||
|
||||
@@ -53,7 +53,7 @@
|
||||
#ifndef _PATH_LOGIN
|
||||
#define _PATH_LOGIN "/bin/login"
|
||||
#endif
|
||||
-#define _PATH_SHUTDOWN "/sbin/shutdown"
|
||||
+#define _PATH_SHUTDOWN "shutdown"
|
||||
|
||||
+#define _PATH_SHUTDOWN "shutdown"
|
||||
|
||||
#define _PATH_TERMCOLORS_DIRNAME "terminal-colors.d"
|
||||
#define _PATH_TERMCOLORS_DIR "/etc/" _PATH_TERMCOLORS_DIRNAME
|
||||
diff --git a/sys-utils/rtcwake.c b/sys-utils/rtcwake.c
|
||||
index 7c748dc..9a99a7c 100644
|
||||
--- a/sys-utils/rtcwake.c
|
||||
+++ b/sys-utils/rtcwake.c
|
||||
@@ -575,7 +575,7 @@ int main(int argc, char **argv)
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{ stdenv, fetchurl, imagemagickBig, pkgconfig, pythonPackages, perl
|
||||
{ stdenv, fetchurl, imagemagickBig, pkgconfig, python2Packages, perl
|
||||
, libX11, libv4l, qt4, lzma, gtk2, fetchpatch, autoreconfHook
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (pythonPackages) pygtk python;
|
||||
inherit (python2Packages) pygtk python;
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "zbar";
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
{ stdenv, fetchurl, pythonPackages
|
||||
{ stdenv, fetchurl, python2Packages
|
||||
, wpa_supplicant, dhcp, dhcpcd, wirelesstools
|
||||
, nettools, openresolv, iproute, iputils
|
||||
, locale ? "C" }:
|
||||
|
||||
let
|
||||
inherit (pythonPackages) python pygobject2 dbus-python pyGtkGlade pycairo;
|
||||
inherit (python2Packages) python pygobject2 dbus-python pyGtkGlade pycairo;
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "wicd-${version}";
|
||||
version = "1.7.2.4";
|
||||
|
|
@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
|
|||
sha256 = "15ywgh60xzmp5z8l1kzics7yi95isrjg1paz42dvp7dlpdfzpzfw";
|
||||
};
|
||||
|
||||
buildInputs = with pythonPackages; [
|
||||
buildInputs = with python2Packages; [
|
||||
python Babel urwid notify
|
||||
];
|
||||
|
||||
|
|
@ -42,11 +42,11 @@ in stdenv.mkDerivation rec {
|
|||
sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-client.in
|
||||
sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject2}):$(toPythonPath ${pygobject2})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${dbus-python})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-client.in
|
||||
sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-gtk.in
|
||||
sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject2}):$(toPythonPath ${pygobject2})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${dbus-python}):$(toPythonPath ${pythonPackages.notify})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-gtk.in
|
||||
sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject2}):$(toPythonPath ${pygobject2})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${dbus-python}):$(toPythonPath ${python2Packages.notify})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-gtk.in
|
||||
sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-cli.in
|
||||
sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject2}):$(toPythonPath ${pycairo}):$(toPythonPath ${dbus-python})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-cli.in
|
||||
sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-curses.in
|
||||
sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject2}):$(toPythonPath ${pycairo}):$(toPythonPath ${dbus-python}):$(toPythonPath ${pythonPackages.urwid})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-curses.in
|
||||
sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject2}):$(toPythonPath ${pycairo}):$(toPythonPath ${dbus-python}):$(toPythonPath ${python2Packages.urwid})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-curses.in
|
||||
rm po/ast.po
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{stdenv, fetchurl, lib, pkgconfig, glib, gtk2, python27, pythonPackages }:
|
||||
{stdenv, fetchurl, lib, pkgconfig, glib, gtk2, python27, python2Packages }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.14.7";
|
||||
|
|
@ -9,11 +9,11 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1abn4amsyys6vwn7csxsxny94n24ycca3xhqxqcmdc4j0dzn3kmb";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig glib gtk2 python27 pythonPackages.wrapPython pythonPackages.pygtk ];
|
||||
pythonPath = with pythonPackages; [ pygtk pycairo ];
|
||||
buildInputs = [ pkgconfig glib gtk2 python2Packages.python python2Packages.wrapPython python2Packages.pygtk ];
|
||||
pythonPath = with python2Packages; [ pygtk pycairo ];
|
||||
|
||||
installPhase = ''
|
||||
make install DESTDIR=$out BINDIR=/bin PY_LIBDIR=/lib/python2.7
|
||||
make install DESTDIR=$out BINDIR=/bin PY_LIBDIR=/lib/${python2Packages.python.libPrefix}
|
||||
wrapProgram $out/bin/pybootchartgui \
|
||||
--prefix PYTHONPATH : "$PYTHONPATH:$(toPythonPath $out)"
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -6364,6 +6364,8 @@ in
|
|||
gradle_2_5 = self.gradleGen.gradle_2_5;
|
||||
|
||||
gperf = callPackage ../development/tools/misc/gperf { };
|
||||
# 3.1 changed some parameters from int to size_t, leading to mismatches.
|
||||
gperf_3_0 = callPackage ../development/tools/misc/gperf/3.0.x.nix { };
|
||||
|
||||
grail = callPackage ../development/libraries/grail { };
|
||||
|
||||
|
|
@ -6421,7 +6423,9 @@ in
|
|||
|
||||
jenkins-job-builder = pythonPackages.jenkins-job-builder;
|
||||
|
||||
kconfig-frontends = callPackage ../development/tools/misc/kconfig-frontends { };
|
||||
kconfig-frontends = callPackage ../development/tools/misc/kconfig-frontends {
|
||||
gperf = gperf_3_0;
|
||||
};
|
||||
|
||||
kcov = callPackage ../development/tools/analysis/kcov { };
|
||||
|
||||
|
|
@ -8260,7 +8264,9 @@ in
|
|||
# On non-GNU systems we need GNU Gettext for libintl.
|
||||
libintlOrEmpty = stdenv.lib.optional (!stdenv.isLinux) gettext;
|
||||
|
||||
libid3tag = callPackage ../development/libraries/libid3tag { };
|
||||
libid3tag = callPackage ../development/libraries/libid3tag {
|
||||
gperf = gperf_3_0;
|
||||
};
|
||||
|
||||
libidn = callPackage ../development/libraries/libidn { };
|
||||
|
||||
|
|
@ -10429,7 +10435,9 @@ in
|
|||
|
||||
rspamd = callPackage ../servers/mail/rspamd { };
|
||||
|
||||
pfixtools = callPackage ../servers/mail/postfix/pfixtools.nix { };
|
||||
pfixtools = callPackage ../servers/mail/postfix/pfixtools.nix {
|
||||
gperf = gperf_3_0;
|
||||
};
|
||||
pflogsumm = callPackage ../servers/mail/postfix/pflogsumm.nix { };
|
||||
|
||||
postgrey = callPackage ../servers/mail/postgrey { };
|
||||
|
|
@ -11740,6 +11748,7 @@ in
|
|||
|
||||
systemd = callPackage ../os-specific/linux/systemd {
|
||||
utillinux = utillinuxMinimal; # break the cyclic dependency
|
||||
gperf = gperf_3_0; # fix build until v233
|
||||
}
|
||||
// {
|
||||
udev.bin = systemd; # ${systemd.udev.bin}/bin/udevadm
|
||||
|
|
@ -12529,7 +12538,9 @@ in
|
|||
|
||||
bibletime = callPackage ../applications/misc/bibletime { };
|
||||
|
||||
bitkeeper = callPackage ../applications/version-management/bitkeeper { };
|
||||
bitkeeper = callPackage ../applications/version-management/bitkeeper {
|
||||
gperf = gperf_3_0;
|
||||
};
|
||||
|
||||
bitlbee = callPackage ../applications/networking/instant-messengers/bitlbee { };
|
||||
bitlbee-plugins = callPackage ../applications/networking/instant-messengers/bitlbee/plugins.nix { };
|
||||
|
|
@ -15370,7 +15381,6 @@ in
|
|||
};
|
||||
|
||||
virtmanager = callPackage ../applications/virtualization/virt-manager {
|
||||
inherit (gnome2) gnome_python;
|
||||
vte = gnome3.vte;
|
||||
dconf = gnome3.dconf;
|
||||
spice_gtk = spice_gtk;
|
||||
|
|
|
|||
|
|
@ -6291,9 +6291,9 @@ in {
|
|||
sha256 = "05f49f6hnl7npmi7kigg0ibqk8s3fhzx1ivvz1kqvlv4ay3paajc";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
pkgs.glibcLocales
|
||||
];
|
||||
buildInputs = [ pkgs.glibcLocales ];
|
||||
|
||||
LC_ALL="en_US.UTF-8";
|
||||
|
||||
propagatedBuildInputs = with self; [
|
||||
six
|
||||
|
|
@ -6304,11 +6304,9 @@ in {
|
|||
docker_pycreds
|
||||
];
|
||||
|
||||
# Version conflict
|
||||
# Flake8 version conflict
|
||||
doCheck = false;
|
||||
|
||||
LC_ALL="en_US.UTF-8";
|
||||
|
||||
meta = {
|
||||
description = "An API client for docker written in Python";
|
||||
homepage = https://github.com/docker/docker-py;
|
||||
|
|
|
|||
Loading…
Reference in a new issue