public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #75668 from jtojnar/py2-cleanup

Browse Source 
Another batch of Python 2 removals
This commit is contained in:
Jan Tojnar 2019-12-19 01:24:00 +01:00 committed by GitHub
commit b171037944
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
27 changed files with 180 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/applications/misc/polybar/default.nix
View File

@ -24,8 +24,7 @@ assert nlSupport -> ! iwSupport && libnl != null;
assert i3Support -> ! i3GapsSupport && jsoncpp != null && i3 != null; assert i3Support -> ! i3GapsSupport && jsoncpp != null && i3 != null;
assert i3GapsSupport -> ! i3Support && jsoncpp != null && i3-gaps != null; assert i3GapsSupport -> ! i3Support && jsoncpp != null && i3-gaps != null;
let xcbproto-py3 = xcbproto.override { python = python3; }; stdenv.mkDerivation rec {
in stdenv.mkDerivation rec {
pname = "polybar"; pname = "polybar";
version = "3.4.1"; version = "3.4.1";
@ -51,7 +50,7 @@ in stdenv.mkDerivation rec {
}; };
buildInputs = [ buildInputs = [
cairo libXdmcp libpthreadstubs libxcb pcre python3 xcbproto-py3 xcbutil cairo libXdmcp libpthreadstubs libxcb pcre python3 xcbproto xcbutil
xcbutilcursor xcbutilimage xcbutilrenderutil xcbutilwm xcbutilxrm xcbutilcursor xcbutilimage xcbutilrenderutil xcbutilwm xcbutilxrm
(if alsaSupport then alsaLib else null) (if alsaSupport then alsaLib else null)

4
pkgs/data/misc/cacert/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, nss, python { stdenv, fetchurl, nss, python3
, blacklist ? [] , blacklist ? []
, includeEmail ? false , includeEmail ? false
}: }:
@ -22,7 +22,7 @@ stdenv.mkDerivation {
outputs = [ "out" "unbundled" ]; outputs = [ "out" "unbundled" ];
nativeBuildInputs = [ python ]; nativeBuildInputs = [ python3 ];
configurePhase = '' configurePhase = ''
ln -s nss/lib/ckfw/builtins/certdata.txt ln -s nss/lib/ckfw/builtins/certdata.txt

34
pkgs/desktops/gnome-3/core/zenity/default.nix
View File

@ -1,5 +1,15 @@
{ stdenv, fetchurl, pkgconfig, libxml2, libxslt, gnome3, gtk3 { stdenv
, gnome-doc-utils, intltool, libX11, which, itstool, wrapGAppsHook }: , fetchurl
, pkgconfig
, libxml2
, gnome3
, gtk3
, yelp-tools
, gettext
, libX11
, itstool
, wrapGAppsHook
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "zenity"; pname = "zenity";
@ -10,13 +20,19 @@ stdenv.mkDerivation rec {
sha256 = "15fdh8xfdhnwcynyh4byx3mrjxbyprqnwxzi7qn3g5wwaqryg1p7"; sha256 = "15fdh8xfdhnwcynyh4byx3mrjxbyprqnwxzi7qn3g5wwaqryg1p7";
}; };
preBuild = '' nativeBuildInputs = [
mkdir -p $out/include pkgconfig
''; gettext
yelp-tools
itstool
libxml2
wrapGAppsHook
];
buildInputs = [ gtk3 libxml2 libxslt libX11 itstool ]; buildInputs = [
gtk3
nativeBuildInputs = [ pkgconfig intltool gnome-doc-utils which wrapGAppsHook ]; libX11
];
passthru = { passthru = {
updateScript = gnome3.updateScript { updateScript = gnome3.updateScript {
@ -26,6 +42,8 @@ stdenv.mkDerivation rec {
}; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Tool to display dialogs from the commandline and shell scripts";
homepage = "https://wiki.gnome.org/Projects/Zenity";
platforms = platforms.linux; platforms = platforms.linux;
maintainers = gnome3.maintainers; maintainers = gnome3.maintainers;
}; };

4
pkgs/development/compilers/rust/cargo.nix
View File

@ -1,4 +1,4 @@
{ stdenv, file, curl, pkgconfig, python, openssl, cmake, zlib { stdenv, file, curl, pkgconfig, python3, openssl, cmake, zlib
, makeWrapper, libiconv, cacert, rustPlatform, rustc, libgit2 , makeWrapper, libiconv, cacert, rustPlatform, rustc, libgit2
, CoreFoundation, Security , CoreFoundation, Security
}: }:
@ -18,7 +18,7 @@ rustPlatform.buildRustPackage {
dontUpdateAutotoolsGnuConfigScripts = true; dontUpdateAutotoolsGnuConfigScripts = true;
nativeBuildInputs = [ pkgconfig cmake makeWrapper ]; nativeBuildInputs = [ pkgconfig cmake makeWrapper ];
buildInputs = [ cacert file curl python openssl zlib libgit2 ] buildInputs = [ cacert file curl python3 openssl zlib libgit2 ]
++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation Security libiconv ]; ++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation Security libiconv ];
LIBGIT2_SYS_USE_PKG_CONFIG = 1; LIBGIT2_SYS_USE_PKG_CONFIG = 1;

4
pkgs/development/compilers/rust/rustc.nix
View File

@ -1,5 +1,5 @@
{ stdenv, removeReferencesTo, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget { stdenv, removeReferencesTo, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget
, fetchurl, file, python2 , fetchurl, file, python3
, llvm_9, darwin, git, cmake, rust, rustPlatform , llvm_9, darwin, git, cmake, rust, rustPlatform
, pkgconfig, openssl , pkgconfig, openssl
, which, libffi , which, libffi
@ -121,7 +121,7 @@ in stdenv.mkDerivation rec {
dontUseCmakeConfigure = true; dontUseCmakeConfigure = true;
nativeBuildInputs = [ nativeBuildInputs = [
file python2 rustPlatform.rust.rustc git cmake file python3 rustPlatform.rust.rustc git cmake
which libffi removeReferencesTo pkgconfig which libffi removeReferencesTo pkgconfig
]; ];

6
pkgs/development/libraries/audio/lilv/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, lv2, pkgconfig, python, serd, sord, sratom, wafHook }: { stdenv, fetchurl, lv2, pkgconfig, python3, serd, sord, sratom, wafHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "lilv"; pname = "lilv";
@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "0f24cd7wkk5l969857g2ydz2kjjrkvvddg1g87xzzs78lsvq8fy3"; sha256 = "0f24cd7wkk5l969857g2ydz2kjjrkvvddg1g87xzzs78lsvq8fy3";
}; };
nativeBuildInputs = [ pkgconfig wafHook ]; nativeBuildInputs = [ pkgconfig python3 wafHook ];
buildInputs = [ lv2 python serd sord sratom ]; buildInputs = [ lv2 serd sord sratom ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://drobilla.net/software/lilv; homepage = http://drobilla.net/software/lilv;

4
pkgs/development/libraries/audio/lv2/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, gtk2, libsndfile, pkgconfig, python, wafHook }: { stdenv, fetchurl, gtk2, libsndfile, pkgconfig, python3, wafHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "lv2"; pname = "lv2";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ pkgconfig wafHook ]; nativeBuildInputs = [ pkgconfig wafHook ];
buildInputs = [ gtk2 libsndfile python ]; buildInputs = [ gtk2 libsndfile python3 ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://lv2plug.in; homepage = http://lv2plug.in;

6
pkgs/development/libraries/audio/sratom/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, lv2, pkgconfig, python, serd, sord, wafHook }: { stdenv, fetchurl, lv2, pkgconfig, python3, serd, sord, wafHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "sratom"; pname = "sratom";
@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "0lz883ravxjf7r9wwbx2gx9m8vhyiavxrl9jdxfppjxnsralll8a"; sha256 = "0lz883ravxjf7r9wwbx2gx9m8vhyiavxrl9jdxfppjxnsralll8a";
}; };
nativeBuildInputs = [ pkgconfig wafHook ]; nativeBuildInputs = [ pkgconfig wafHook python3 ];
buildInputs = [ lv2 python serd sord ]; buildInputs = [ lv2 serd sord ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://drobilla.net/software/sratom; homepage = http://drobilla.net/software/sratom;

4
pkgs/development/libraries/epoxy/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, utilmacros, python { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, utilmacros, python3
, libGL, libX11 , libGL, libX11
}: }:
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
nativeBuildInputs = [ autoreconfHook pkgconfig utilmacros python ]; nativeBuildInputs = [ autoreconfHook pkgconfig utilmacros python3 ];
buildInputs = [ libGL libX11 ]; buildInputs = [ libGL libX11 ];
preConfigure = optionalString stdenv.isDarwin '' preConfigure = optionalString stdenv.isDarwin ''

49
pkgs/development/libraries/farstream/default.nix
View File

@ -1,11 +1,19 @@
{ stdenv, fetchurl, libnice, pkgconfig, pythonPackages, gstreamer, gst-plugins-base { stdenv
, gst-python, gupnp-igd, gobject-introspection , fetchurl
, gst-plugins-good, gst-plugins-bad, gst-libav , fetchpatch
, libnice
, pkgconfig
, autoreconfHook
, gstreamer
, gst-plugins-base
, gupnp-igd
, gobject-introspection
, gst-plugins-good
, gst-plugins-bad
, gst-libav
}: }:
let stdenv.mkDerivation rec {
inherit (pythonPackages) python pygobject2;
in stdenv.mkDerivation rec {
name = "farstream-0.2.8"; name = "farstream-0.2.8";
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
@ -15,17 +23,36 @@ in stdenv.mkDerivation rec {
sha256 = "0249ncd20x5mf884fd8bw75c3118b9fdml837v4fib349xmrqfrb"; sha256 = "0249ncd20x5mf884fd8bw75c3118b9fdml837v4fib349xmrqfrb";
}; };
buildInputs = [ libnice python pygobject2 gupnp-igd libnice ]; patches = [
# Python has not been used for ages
(fetchpatch {
url = "https://gitlab.freedesktop.org/farstream/farstream/commit/73891c28fa27d5e65a71762e826f13747d743588.patch";
sha256 = "19pw1m8xhxyf5yhl6k898w240ra2k0m28gfv858x70c4wl786lrn";
})
];
nativeBuildInputs = [ pkgconfig gobject-introspection ]; buildInputs = [
libnice
gupnp-igd
libnice
];
nativeBuildInputs = [
pkgconfig
autoreconfHook
gobject-introspection
];
propagatedBuildInputs = [ propagatedBuildInputs = [
gstreamer gst-plugins-base gst-python gstreamer
gst-plugins-good gst-plugins-bad gst-libav gst-plugins-base
gst-plugins-good
gst-plugins-bad
gst-libav
]; ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://www.freedesktop.org/wiki/Software/Farstream; homepage = "https://www.freedesktop.org/wiki/Software/Farstream";
description = "Audio/Video Communications Framework formely known as farsight"; description = "Audio/Video Communications Framework formely known as farsight";
platforms = platforms.linux; platforms = platforms.linux;
license = licenses.lgpl21; license = licenses.lgpl21;

7
pkgs/development/libraries/gamin/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchpatch, python, pkgconfig, glib }: { stdenv, fetchurl, fetchpatch, pkgconfig, glib }:
stdenv.mkDerivation (rec { stdenv.mkDerivation (rec {
name = "gamin-0.1.10"; name = "gamin-0.1.10";
@ -10,13 +10,13 @@ stdenv.mkDerivation (rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ python glib ]; buildInputs = [ glib ];
# `_GNU_SOURCE' is needed, e.g., to get `struct ucred' from # `_GNU_SOURCE' is needed, e.g., to get `struct ucred' from
# <sys/socket.h> with Glibc 2.9. # <sys/socket.h> with Glibc 2.9.
configureFlags = [ configureFlags = [
"--disable-debug" "--disable-debug"
"--with-python=${python}" "--without-python" # python3 not supported
"CPPFLAGS=-D_GNU_SOURCE" "CPPFLAGS=-D_GNU_SOURCE"
]; ];
@ -44,4 +44,3 @@ stdenv.mkDerivation (rec {
sed -i 's/,--version-script=.*$/\\/' libgamin/Makefile sed -i 's/,--version-script=.*$/\\/' libgamin/Makefile
''; '';
}) })

4
pkgs/development/libraries/git2/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, python { stdenv, fetchFromGitHub, cmake, pkgconfig, python3
, zlib, libssh2, openssl, http-parser, curl , zlib, libssh2, openssl, http-parser, curl
, libiconv, Security , libiconv, Security
}: }:
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
cmakeFlags = [ "-DTHREADSAFE=ON" ]; cmakeFlags = [ "-DTHREADSAFE=ON" ];
nativeBuildInputs = [ cmake python pkgconfig ]; nativeBuildInputs = [ cmake python3 pkgconfig ];
buildInputs = [ zlib libssh2 openssl http-parser curl ] buildInputs = [ zlib libssh2 openssl http-parser curl ]
++ stdenv.lib.optional stdenv.isDarwin Security; ++ stdenv.lib.optional stdenv.isDarwin Security;

4
pkgs/development/libraries/gstreamer/good/default.nix
View File

@ -3,7 +3,7 @@
, meson , meson
, ninja , ninja
, pkgconfig , pkgconfig
, python , python3
, gst-plugins-base , gst-plugins-base
, orc , orc
, bzip2 , bzip2
@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig pkgconfig
python python3
meson meson
ninja ninja
gettext gettext

4
pkgs/development/libraries/jbig2dec/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, python, autoconf }: { stdenv, fetchurl, python3, autoconf }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "jbig2dec-0.17"; name = "jbig2dec-0.17";
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
buildInputs = [ autoconf ]; buildInputs = [ autoconf ];
checkInputs = [ python ]; checkInputs = [ python3 ];
doCheck = true; doCheck = true;
meta = { meta = {

5
pkgs/development/libraries/libdbusmenu/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, lib, file { stdenv, fetchurl, lib, file
, pkgconfig, intltool , pkgconfig, intltool
, glib, dbus-glib, json-glib , glib, dbus-glib, json-glib
, gobject-introspection, vala, gnome-doc-utils , gobject-introspection, vala
, gtkVersion ? null, gtk2 ? null, gtk3 ? null }: , gtkVersion ? null, gtk2 ? null, gtk3 ? null }:
with lib; with lib;
@ -18,11 +18,10 @@ stdenv.mkDerivation rec {
sha256 = "12l7z8dhl917iy9h02sxmpclnhkdjryn08r8i4sr8l3lrlm4mk5r"; sha256 = "12l7z8dhl917iy9h02sxmpclnhkdjryn08r8i4sr8l3lrlm4mk5r";
}; };
nativeBuildInputs = [ vala pkgconfig intltool ]; nativeBuildInputs = [ vala pkgconfig intltool gobject-introspection ];
buildInputs = [ buildInputs = [
glib dbus-glib json-glib glib dbus-glib json-glib
gobject-introspection gnome-doc-utils
] ++ optional (gtkVersion != null) (if gtkVersion == "2" then gtk2 else gtk3); ] ++ optional (gtkVersion != null) (if gtkVersion == "2" then gtk2 else gtk3);
postPatch = '' postPatch = ''

4
pkgs/development/libraries/libevdev/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, python }: { stdenv, fetchurl, python3 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libevdev"; pname = "libevdev";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "04a2klvii0in9ln8r85mk2cm73jq8ry2m3yzmf2z8xyjxzjcmlr0"; sha256 = "04a2klvii0in9ln8r85mk2cm73jq8ry2m3yzmf2z8xyjxzjcmlr0";
}; };
buildInputs = [ python ]; buildInputs = [ python3 ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Wrapper library for evdev devices"; description = "Wrapper library for evdev devices";

4
pkgs/development/libraries/libglvnd/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, fetchpatch, autoreconfHook, python2, pkgconfig, libX11, libXext, xorgproto, addOpenGLRunpath }: { stdenv, lib, fetchFromGitHub, fetchpatch, autoreconfHook, python3, pkgconfig, libX11, libXext, xorgproto, addOpenGLRunpath }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libglvnd"; pname = "libglvnd";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "1hyywwjsmvsd7di603f7iznjlccqlc7yvz0j59gax7bljm9wb6ni"; sha256 = "1hyywwjsmvsd7di603f7iznjlccqlc7yvz0j59gax7bljm9wb6ni";
}; };
nativeBuildInputs = [ autoreconfHook pkgconfig python2 addOpenGLRunpath ]; nativeBuildInputs = [ autoreconfHook pkgconfig python3 addOpenGLRunpath ];
buildInputs = [ libX11 libXext xorgproto ]; buildInputs = [ libX11 libXext xorgproto ];
# The following 3 patches should be removed once libglvnd >1.2.0 is released # The following 3 patches should be removed once libglvnd >1.2.0 is released

4
pkgs/development/libraries/libgsf/default.nix
View File

@ -1,5 +1,5 @@
{ fetchurl, stdenv, pkgconfig, intltool, gettext, glib, libxml2, zlib, bzip2 { fetchurl, stdenv, pkgconfig, intltool, gettext, glib, libxml2, zlib, bzip2
, python, perl, gdk-pixbuf, libiconv, libintl, gnome3 }: , perl, gdk-pixbuf, libiconv, libintl, gnome3 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libgsf"; pname = "libgsf";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig intltool libintl ]; nativeBuildInputs = [ pkgconfig intltool libintl ];
buildInputs = [ gettext bzip2 zlib python ]; buildInputs = [ gettext bzip2 zlib ];
checkInputs = [ perl ]; checkInputs = [ perl ];
propagatedBuildInputs = [ libxml2 glib gdk-pixbuf libiconv ]; propagatedBuildInputs = [ libxml2 glib gdk-pixbuf libiconv ];

6
pkgs/development/libraries/libproxy/default.nix
View File

@ -11,7 +11,6 @@
, gsettings-desktop-schemas , gsettings-desktop-schemas
, glib , glib
, makeWrapper , makeWrapper
, python2
, python3 , python3
, SystemConfiguration , SystemConfiguration
, CoreFoundation , CoreFoundation
@ -29,7 +28,7 @@ stdenv.mkDerivation rec {
sha256 = "10swd3x576pinx33iwsbd4h15fbh2snmfxzcmab4c56nb08qlbrs"; sha256 = "10swd3x576pinx33iwsbd4h15fbh2snmfxzcmab4c56nb08qlbrs";
}; };
outputs = [ "out" "dev" "py2" "py3" ]; outputs = [ "out" "dev" "py3" ];
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig pkgconfig
@ -39,7 +38,6 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
pcre pcre
python2
python3 python3
zlib zlib
] ++ (if stdenv.hostPlatform.isDarwin then [ ] ++ (if stdenv.hostPlatform.isDarwin then [
@ -55,7 +53,7 @@ stdenv.mkDerivation rec {
cmakeFlags = [ cmakeFlags = [
"-DWITH_MOZJS=ON" "-DWITH_MOZJS=ON"
"-DPYTHON2_SITEPKG_DIR=${placeholder "py2"}/${python2.sitePackages}" "-DWITH_PYTHON2=OFF"
"-DPYTHON3_SITEPKG_DIR=${placeholder "py3"}/${python3.sitePackages}" "-DPYTHON3_SITEPKG_DIR=${placeholder "py3"}/${python3.sitePackages}"
]; ];

4
pkgs/development/libraries/serd/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, python, wafHook }: { stdenv, fetchurl, pkgconfig, python3, wafHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "serd"; pname = "serd";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1yyfyvc6kwagi5w43ljp1bbjdvdpmgpds74lmjxycm91bkx0xyvf"; sha256 = "1yyfyvc6kwagi5w43ljp1bbjdvdpmgpds74lmjxycm91bkx0xyvf";
}; };
nativeBuildInputs = [ pkgconfig python wafHook ]; nativeBuildInputs = [ pkgconfig python3 wafHook ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://drobilla.net/software/serd; homepage = http://drobilla.net/software/serd;

6
pkgs/development/libraries/sord/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, python, serd, pcre, wafHook }: { stdenv, fetchurl, pkgconfig, python3, serd, pcre, wafHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "sord"; pname = "sord";
@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "13fshxwpipjrvsah1m2jw1kf022z2q5vpw24bzcznglgvms13x89"; sha256 = "13fshxwpipjrvsah1m2jw1kf022z2q5vpw24bzcznglgvms13x89";
}; };
nativeBuildInputs = [ pkgconfig wafHook ]; nativeBuildInputs = [ pkgconfig python3 wafHook ];
buildInputs = [ python serd pcre ]; buildInputs = [ serd pcre ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://drobilla.net/software/sord; homepage = http://drobilla.net/software/sord;

22
pkgs/development/python-modules/anytree/default.nix
View File

@ -1,26 +1,25 @@
{ lib { lib
, buildPythonPackage , buildPythonPackage
, fetchFromGitHub , fetchPypi
, substituteAll , substituteAll
, fetchpatch , fetchpatch
, nose , nose
, six , six
, withGraphviz ? true
, graphviz , graphviz
, fontconfig , fontconfig
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "anytree"; pname = "anytree";
version = "2.7.2"; version = "2.7.3";
src = fetchFromGitHub { src = fetchPypi {
owner = "c0fec0de"; inherit pname version;
repo = pname; sha256 = "05736hamjv4f38jw6z9y4wckc7mz18ivbizm1s3pb0n6fp1sy4zk";
rev = version;
sha256 = "0ag5ir9h5p7rbm2pmpxlkflwigrm7z4afh24jvbhqj7pyrbjmk9w";
}; };
patches = [ patches = lib.optionals withGraphviz [
(substituteAll { (substituteAll {
src = ./graphviz.patch; src = ./graphviz.patch;
inherit graphviz; inherit graphviz;
@ -35,11 +34,14 @@ buildPythonPackage rec {
six six
]; ];
# Fontconfig error: Cannot load default config file # tests print “Fontconfig error: Cannot load default config file”
preCheck = '' preCheck = lib.optionalString withGraphviz ''
export FONTCONFIG_FILE=${fontconfig.out}/etc/fonts/fonts.conf export FONTCONFIG_FILE=${fontconfig.out}/etc/fonts/fonts.conf
''; '';
# circular dependency anytree → graphviz → pango → glib → gtk-doc → anytree
doCheck = withGraphviz;
checkPhase = '' checkPhase = ''
runHook preCheck runHook preCheck

12
pkgs/development/tools/documentation/doxygen/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, cmake, fetchurl, perl, python, flex, bison, qt4, CoreServices, libiconv }: { stdenv, cmake, fetchurl, python3, flex, bison, qt4, CoreServices, libiconv }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -12,11 +12,15 @@ stdenv.mkDerivation rec {
sha256 = "bd9c0ec462b6a9b5b41ede97bede5458e0d7bb40d4cfa27f6f622eb33c59245d"; sha256 = "bd9c0ec462b6a9b5b41ede97bede5458e0d7bb40d4cfa27f6f622eb33c59245d";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [
cmake
python3
flex
bison
];
buildInputs = buildInputs =
[ perl python flex bison ] stdenv.lib.optional (qt4 != null) qt4
++ stdenv.lib.optional (qt4 != null) qt4
++ stdenv.lib.optional stdenv.isSunOS libiconv ++ stdenv.lib.optional stdenv.isSunOS libiconv
++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices libiconv ]; ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices libiconv ];

37
pkgs/development/tools/documentation/gtk-doc/default.nix
View File

@ -2,9 +2,8 @@
, fetchFromGitLab , fetchFromGitLab
, meson , meson
, ninja , ninja
, pkgconfig , pkg-config
, python3 , python3
, libxml2Python
, docbook_xml_dtd_43 , docbook_xml_dtd_43
, docbook_xsl , docbook_xsl
, libxslt , libxslt
@ -13,10 +12,12 @@
, withDblatex ? false, dblatex , withDblatex ? false, dblatex
}: }:
stdenv.mkDerivation rec { python3.pkgs.buildPythonApplication rec {
pname = "gtk-doc"; pname = "gtk-doc";
version = "1.32"; version = "1.32";
format = "other";
src = fetchFromGitLab { src = fetchFromGitLab {
domain = "gitlab.gnome.org"; domain = "gitlab.gnome.org";
owner = "GNOME"; owner = "GNOME";
@ -32,37 +33,41 @@ stdenv.mkDerivation rec {
outputDevdoc = "out"; outputDevdoc = "out";
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config
gettext gettext
meson meson
ninja ninja
libxslt # for xsltproc
]; ];
buildInputs = [ buildInputs = [
docbook_xml_dtd_43 docbook_xml_dtd_43
docbook_xsl docbook_xsl
libxslt libxslt
pkgconfig ] ++ stdenv.lib.optionals withDblatex [
python3 dblatex
python3.pkgs.pygments # Needed for https://gitlab.gnome.org/GNOME/gtk-doc/blob/GTK_DOC_1_32/meson.build#L42 ];
libxml2Python
] pythonPath = with python3.pkgs; [
++ stdenv.lib.optional withDblatex dblatex pygments # Needed for https://gitlab.gnome.org/GNOME/gtk-doc/blob/GTK_DOC_1_32/meson.build#L42
; (anytree.override { withGraphviz = false; })
lxml
];
mesonFlags = [ mesonFlags = [
"-Dtests=false" "-Dtests=false"
"-Dyelp_manual=false" "-Dyelp_manual=false"
]; ];
# Make pygments available for binaries, python.withPackages creates a wrapper
# but scripts are not allowed in shebangs so we link it into sys.path.
postInstall = ''
ln -s ${python3.pkgs.pygments}/${python3.sitePackages}/* $out/share/gtk-doc/python/
'';
doCheck = false; # requires a lot of stuff doCheck = false; # requires a lot of stuff
doInstallCheck = false; # fails doInstallCheck = false; # fails
postFixup = ''
# Do not propagate Python
substituteInPlace $out/nix-support/propagated-build-inputs \
--replace "${python3}" ""
'';
passthru = { passthru = {
# Consumers are expected to copy the m4 files to their source tree, let them reuse the patch # Consumers are expected to copy the m4 files to their source tree, let them reuse the patch
respect_xml_catalog_files_var_patch = ./respect-xml-catalog-files-var.patch; respect_xml_catalog_files_var_patch = ./respect-xml-catalog-files-var.patch;

10
pkgs/servers/x11/xorg/overrides.nix
View File

@ -4,7 +4,7 @@
freetype, tradcpp, fontconfig, meson, ninja, ed, freetype, tradcpp, fontconfig, meson, ninja, ed,
libGL, spice-protocol, zlib, libGLU, dbus, libunwind, libdrm, libGL, spice-protocol, zlib, libGLU, dbus, libunwind, libdrm,
mesa, udev, bootstrap_cmds, bison, flex, clangStdenv, autoreconfHook, mesa, udev, bootstrap_cmds, bison, flex, clangStdenv, autoreconfHook,
mcpp, epoxy, openssl, pkgconfig, llvm_6, mcpp, epoxy, openssl, pkgconfig, llvm_6, python3,
ApplicationServices, Carbon, Cocoa, Xplugin ApplicationServices, Carbon, Cocoa, Xplugin
}: }:
@ -72,7 +72,9 @@ self: super:
mkfontdir = self.mkfontscale; mkfontdir = self.mkfontscale;
libxcb = super.libxcb.overrideAttrs (attrs: { libxcb = (super.libxcb.override {
python = python3;
}).overrideAttrs (attrs: {
configureFlags = [ "--enable-xkb" "--enable-xinput" ]; configureFlags = [ "--enable-xkb" "--enable-xinput" ];
outputs = [ "out" "dev" "man" "doc" ]; outputs = [ "out" "dev" "man" "doc" ];
}); });
@ -308,6 +310,10 @@ self: super:
buildInputs = attrs.buildInputs ++ [ freetype fontconfig ]; buildInputs = attrs.buildInputs ++ [ freetype fontconfig ];
}); });
xcbproto = super.xcbproto.override {
python = python3;
};
xcbutil = super.xcbutil.overrideAttrs (attrs: { xcbutil = super.xcbutil.overrideAttrs (attrs: {
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
}); });

23
pkgs/tools/security/fail2ban/default.nix
View File

@ -1,8 +1,8 @@
{ stdenv, fetchFromGitHub, python, pythonPackages, gamin }: { stdenv, fetchFromGitHub, fetchpatch, python3, gamin }:
let version = "0.10.4"; in let version = "0.10.4"; in
pythonPackages.buildPythonApplication { python3.pkgs.buildPythonApplication {
pname = "fail2ban"; pname = "fail2ban";
inherit version; inherit version;
@ -13,8 +13,19 @@ pythonPackages.buildPythonApplication {
sha256 = "07ik6rm856q0ic2r7vbg6j3hsdcdgkv44hh5ck0c2y21fqwrck3l"; sha256 = "07ik6rm856q0ic2r7vbg6j3hsdcdgkv44hh5ck0c2y21fqwrck3l";
}; };
propagatedBuildInputs = [ gamin ] patches = [
++ (stdenv.lib.optional stdenv.isLinux pythonPackages.systemd); # 0.10.3 supports Python 3 but somehow this got into the way
# https://github.com/fail2ban/fail2ban/issues/2255
(fetchpatch {
url = "https://github.com/fail2ban/fail2ban/commit/657b147c0d7830f3600f3dc7feaa4815a7e19fde.patch";
sha256 = "1hrk2x7ssrfhab1wrjk5xw1sxhiv2735glfcp6qcj8x4dss3q7f7";
})
];
pythonPath = with python3.pkgs;
stdenv.lib.optionals stdenv.isLinux [
systemd
];
preConfigure = '' preConfigure = ''
for i in config/action.d/sendmail*.conf; do for i in config/action.d/sendmail*.conf; do
@ -33,11 +44,11 @@ pythonPackages.buildPythonApplication {
substituteInPlace setup.py --replace /usr/share/doc/ share/doc/ substituteInPlace setup.py --replace /usr/share/doc/ share/doc/
# see https://github.com/NixOS/nixpkgs/issues/4968 # see https://github.com/NixOS/nixpkgs/issues/4968
${python}/bin/${python.executable} setup.py install_data --install-dir=$out --root=$out ${python3.interpreter} setup.py install_data --install-dir=$out --root=$out
''; '';
postInstall = let postInstall = let
sitePackages = "$out/lib/${python.libPrefix}/site-packages"; sitePackages = "$out/${python3.sitePackages}";
in '' in ''
# see https://github.com/NixOS/nixpkgs/issues/4968 # see https://github.com/NixOS/nixpkgs/issues/4968
rm -rf ${sitePackages}/etc ${sitePackages}/usr ${sitePackages}/var; rm -rf ${sitePackages}/etc ${sitePackages}/usr ${sitePackages}/var;

16
pkgs/top-level/all-packages.nix
View File

@ -3290,6 +3290,7 @@ in
fontforge = lowPrio (callPackage ../tools/misc/fontforge { fontforge = lowPrio (callPackage ../tools/misc/fontforge {
inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
python = python3;
}); });
fontforge-gtk = fontforge.override { fontforge-gtk = fontforge.override {
withSpiro = true; withSpiro = true;
@ -11146,7 +11147,6 @@ in
inherit (gst_all_1) inherit (gst_all_1)
gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad
gst-libav; gst-libav;
inherit (pythonPackages) gst-python;
}; };
fcgi = callPackage ../development/libraries/fcgi { }; fcgi = callPackage ../development/libraries/fcgi { };
@ -16565,9 +16565,13 @@ in
keyutils = callPackage ../os-specific/linux/keyutils { }; keyutils = callPackage ../os-specific/linux/keyutils { };
libselinux = callPackage ../os-specific/linux/libselinux { }; libselinux = callPackage ../os-specific/linux/libselinux {
python = python3;
};
libsemanage = callPackage ../os-specific/linux/libsemanage { }; libsemanage = callPackage ../os-specific/linux/libsemanage {
python = python3;
};
libraw = callPackage ../development/libraries/libraw { }; libraw = callPackage ../development/libraries/libraw { };
@ -25071,11 +25075,7 @@ in
seafile-shared = callPackage ../misc/seafile-shared { }; seafile-shared = callPackage ../misc/seafile-shared { };
serviio = callPackage ../servers/serviio {}; serviio = callPackage ../servers/serviio {};
selinux-python = callPackage ../os-specific/linux/selinux-python { selinux-python = callPackage ../os-specific/linux/selinux-python { };
# needs python3 bindings
libselinux = libselinux.override { python = python3; };
libsemanage = libsemanage.override { python = python3; };
};
slock = callPackage ../misc/screensavers/slock { slock = callPackage ../misc/screensavers/slock {
conf = config.slock.conf or null; conf = config.slock.conf or null;