From fcfe7cf955375311199ce615673de0768abf66ab Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Nov 2016 11:09:51 +0100 Subject: apitrace: use python2 --- pkgs/applications/graphics/apitrace/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/graphics/apitrace/default.nix b/pkgs/applications/graphics/apitrace/default.nix index e130b23a8aaa..a9b2eb1163af 100644 --- a/pkgs/applications/graphics/apitrace/default.nix +++ b/pkgs/applications/graphics/apitrace/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, libX11, procps, python, libdwarf, qtbase, qtwebkit }: +{ stdenv, fetchFromGitHub, cmake, libX11, procps, python2, libdwarf, qtbase, qtwebkit }: stdenv.mkDerivation rec { name = "apitrace-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { # LD_PRELOAD wrappers need to be statically linked to work against all kinds # of games -- so it's fine to use e.g. bundled snappy. - buildInputs = [ libX11 procps python libdwarf qtbase qtwebkit ]; + buildInputs = [ libX11 procps python2 libdwarf qtbase qtwebkit ]; nativeBuildInputs = [ cmake ]; -- cgit 1.4.1 From 24a495b7a674b246eaad5b43089dbc6fc98c5a7d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Nov 2016 11:27:22 +0100 Subject: cvs2svn: use python2 --- pkgs/applications/version-management/cvs2svn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/version-management/cvs2svn/default.nix b/pkgs/applications/version-management/cvs2svn/default.nix index 2bfde38af29d..90a9f26045f3 100644 --- a/pkgs/applications/version-management/cvs2svn/default.nix +++ b/pkgs/applications/version-management/cvs2svn/default.nix @@ -1,4 +1,4 @@ -{stdenv, lib, fetchurl, python, cvs, makeWrapper}: +{stdenv, lib, fetchurl, python2, cvs, makeWrapper}: stdenv.mkDerivation rec { name = "cvs2svn-2.4.0"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "05piyrcp81a1jgjm66xhq7h1sscx42ccjqaw30h40dxlwz1pyrx6"; }; - buildInputs = [python makeWrapper]; + buildInputs = [python2 makeWrapper]; dontBuild = true; installPhase = '' -- cgit 1.4.1 From 434f09c55f9cdd03e4974826f15b17eb8fd256a5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Nov 2016 11:33:10 +0100 Subject: fomp: use python2 --- pkgs/applications/audio/fomp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/audio/fomp/default.nix b/pkgs/applications/audio/fomp/default.nix index 00b6c3e0c677..bdac87aaf374 100644 --- a/pkgs/applications/audio/fomp/default.nix +++ b/pkgs/applications/audio/fomp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lv2, pkgconfig, python }: +{ stdenv, fetchurl, lv2, pkgconfig, python2 }: stdenv.mkDerivation rec { name = "fomp-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1hh2xhknanqn3iwp12ihl6bf8p7bqxryms9qk7mh21lixl42b8k5"; }; - buildInputs = [ lv2 pkgconfig python ]; + buildInputs = [ lv2 pkgconfig python2 ]; installPhase = '' python waf configure --prefix=$out -- cgit 1.4.1 From bea967016ea8acd276d0e0d2e826e2704bc3d63a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Nov 2016 11:36:17 +0100 Subject: git-hub: use python2 --- .../version-management/git-and-tools/git-hub/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix index d561f751cc97..f67d575b5b3a 100644 --- a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, docutils, python2 }: +{ stdenv, fetchFromGitHub, docutils, python2Packages }: stdenv.mkDerivation rec { name = "git-hub-${version}"; @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { owner = "sociomantic-tsunami"; }; - buildInputs = [ python2 ]; - nativeBuildInputs = [ docutils ]; + buildInputs = [ python2Packages.python ]; + nativeBuildInputs = [ python2Packages.docutils ]; postPatch = '' substituteInPlace Makefile --replace rst2man rst2man.py -- cgit 1.4.1 From 643b12221a2d1d09ef68e55f4a895afd29a05873 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Nov 2016 11:38:21 +0100 Subject: stgit: use python2 --- pkgs/applications/version-management/git-and-tools/stgit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/version-management/git-and-tools/stgit/default.nix b/pkgs/applications/version-management/git-and-tools/stgit/default.nix index f572dbcf9238..955fe90ff119 100644 --- a/pkgs/applications/version-management/git-and-tools/stgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/stgit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, git }: +{ stdenv, fetchurl, python2, git }: let name = "stgit-0.17.1"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "1pka0ns9x0kabn036zsf0mwmwiynckhnva51kgxsch9fqah6acyl"; }; - buildInputs = [ python git ]; + buildInputs = [ python2 git ]; makeFlags = "prefix=$$out"; -- cgit 1.4.1 From f1fbf0416280d05616a12295908bd6f3d9dac88a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Nov 2016 11:39:16 +0100 Subject: gitinspector: use python2 --- pkgs/applications/version-management/gitinspector/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/version-management/gitinspector/default.nix b/pkgs/applications/version-management/gitinspector/default.nix index 664f4d5147be..eea5242e6bcc 100644 --- a/pkgs/applications/version-management/gitinspector/default.nix +++ b/pkgs/applications/version-management/gitinspector/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchzip, pythonPackages}: +{ stdenv, fetchzip, python2Packages}: -pythonPackages.buildPythonApplication rec { +python2Packages.buildPythonApplication rec { name = "gitinspector-${version}"; version = "0.4.4"; namePrefix = ""; -- cgit 1.4.1 From fe24e93df85f4e41a37818c53f3a6b0146b9e069 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Nov 2016 11:52:53 +0100 Subject: rawdog: use python2 --- pkgs/applications/networking/feedreaders/rawdog/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/networking/feedreaders/rawdog/default.nix b/pkgs/applications/networking/feedreaders/rawdog/default.nix index eca53ccf2ec0..39543f256fa2 100644 --- a/pkgs/applications/networking/feedreaders/rawdog/default.nix +++ b/pkgs/applications/networking/feedreaders/rawdog/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, pythonPackages }: +{ stdenv, fetchurl, python2Packages }: -pythonPackages.buildPythonApplication rec { +python2Packages.buildPythonApplication rec { name = "rawdog-${version}"; version = "2.21"; @@ -9,7 +9,7 @@ pythonPackages.buildPythonApplication rec { sha256 = "0f5z7b70pyhjl6s28hgxninsr86s4dj5ycd50sv6bfz4hm1c2030"; }; - propagatedBuildInputs = with pythonPackages; [ feedparser ]; + propagatedBuildInputs = with python2Packages; [ feedparser ]; namePrefix = ""; -- cgit 1.4.1 From 99402f6a06646159cf02b4f344903786a40afba2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Nov 2016 13:52:11 +0100 Subject: twister: use python2 --- pkgs/applications/networking/p2p/twister/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/networking/p2p/twister/default.nix b/pkgs/applications/networking/p2p/twister/default.nix index 43ec9a5b022a..b6f4d8b5b19c 100644 --- a/pkgs/applications/networking/p2p/twister/default.nix +++ b/pkgs/applications/networking/p2p/twister/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, python +{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, python2 , boost, db, openssl, geoip, libiconv, miniupnpc , srcOnly, fetchgit }: @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ - autoconf automake libtool pkgconfig python + autoconf automake libtool pkgconfig python2 boost db openssl geoip miniupnpc libiconv ]; -- cgit 1.4.1 From 6be672a7cd4202a726fbff804bf75550fc8aea77 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Nov 2016 13:57:12 +0100 Subject: tailor: use python2 --- pkgs/applications/version-management/tailor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/version-management/tailor/default.nix b/pkgs/applications/version-management/tailor/default.nix index dde09dfe22d1..424a402780af 100644 --- a/pkgs/applications/version-management/tailor/default.nix +++ b/pkgs/applications/version-management/tailor/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, pythonPackages }: +{ stdenv, fetchurl, python2Packages }: -pythonPackages.buildPythonApplication rec { +python2Packages.buildPythonApplication rec { name = "tailor-${version}"; version = "0.9.35"; -- cgit 1.4.1 From 3cd2ca2751087a5f614baa0692ed595aae64498f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Nov 2016 15:39:43 +0100 Subject: tortoisehg: use python2 --- pkgs/applications/version-management/tortoisehg/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/version-management/tortoisehg/default.nix b/pkgs/applications/version-management/tortoisehg/default.nix index e5c704f71c71..fd61e4904025 100644 --- a/pkgs/applications/version-management/tortoisehg/default.nix +++ b/pkgs/applications/version-management/tortoisehg/default.nix @@ -1,6 +1,6 @@ -{lib, fetchurl, mercurial, pythonPackages}: +{lib, fetchurl, mercurial, python2Packages}: -pythonPackages.buildPythonApplication rec { +python2Packages.buildPythonApplication rec { name = "tortoisehg-${version}"; version = "3.9.2"; @@ -9,15 +9,15 @@ pythonPackages.buildPythonApplication rec { sha256 = "17wcsf91z7dnb7c8vyagasj5vvmas6ms5lx1ny4pnm94qzslkfh2"; }; - pythonPath = with pythonPackages; [ pyqt4 mercurial qscintilla iniparse ]; + pythonPath = with python2Packages; [ pyqt4 mercurial qscintilla iniparse ]; - propagatedBuildInputs = with pythonPackages; [ qscintilla iniparse ]; + propagatedBuildInputs = with python2Packages; [ qscintilla iniparse ]; doCheck = false; dontStrip = true; buildPhase = ""; installPhase = '' - ${pythonPackages.python.executable} setup.py install --prefix=$out + ${python2Packages.python.executable} setup.py install --prefix=$out ln -s $out/bin/thg $out/bin/tortoisehg #convenient alias ''; -- cgit 1.4.1 From fad1e442ad9230928712aaa7f1facd89f8236689 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Nov 2016 15:47:35 +0100 Subject: calibre: use python2 --- pkgs/applications/misc/calibre/default.nix | 17 ++++++++--------- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 9 insertions(+), 12 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 7b47b9fb3cb0..4fcb3a085bd0 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, fetchpatch, python, pyqt5, sip, poppler_utils, pkgconfig, libpng +{ stdenv, fetchurl, fetchpatch, poppler_utils, pkgconfig, libpng , imagemagick, libjpeg, fontconfig, podofo, qtbase, qmakeHook, icu, sqlite -, makeWrapper, unrarSupport ? false, chmlib, pythonPackages, xz, libusb1, libmtp +, makeWrapper, unrarSupport ? false, chmlib, python2Packages, xz, libusb1, libmtp , xdg_utils, makeDesktopItem }: @@ -13,8 +13,6 @@ stdenv.mkDerivation rec { sha256 = "18iv1c2nx93gkfqa3k2m42dk4p59b9zp08fggb6imc1xqh2icfch"; }; - inherit python; - patches = [ # Patches from Debian that: # - disable plugin installation (very insecure) @@ -39,7 +37,7 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch; prePatch = '' - sed -i "/pyqt_sip_dir/ s:=.*:= '${pyqt5}/share/sip/PyQt5':" \ + sed -i "/pyqt_sip_dir/ s:=.*:= '${python2Packages.pyqt5}/share/sip/PyQt5':" \ setup/build_environment.py # Remove unneeded files and libs @@ -56,10 +54,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper pkgconfig qmakeHook ]; buildInputs = [ - python pyqt5 sip poppler_utils libpng imagemagick libjpeg + poppler_utils libpng imagemagick libjpeg fontconfig podofo qtbase chmlib icu sqlite libusb1 libmtp xdg_utils - ] ++ (with pythonPackages; [ + ] ++ (with python2Packages; [ apsw beautifulsoup cssselect cssutils dateutil lxml mechanize netifaces pillow + python pyqt5 sip # the following are distributed with calibre, but we use upstream instead chardet cherrypy html5lib odfpy routes ]); @@ -74,8 +73,8 @@ stdenv.mkDerivation rec { export FC_LIB_DIR=${fontconfig.lib}/lib export PODOFO_INC_DIR=${podofo}/include/podofo export PODOFO_LIB_DIR=${podofo}/lib - export SIP_BIN=${sip}/bin/sip - python setup.py install --prefix=$out + export SIP_BIN=${python2Packages.sip}/bin/sip + ${python2Packages.python.interpreter} setup.py install --prefix=$out PYFILES="$out/bin/* $out/lib/calibre/calibre/web/feeds/*.py $out/lib/calibre/calibre/ebooks/metadata/*.py diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ccd9c30b385f..ebbeebaf1166 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12303,9 +12303,7 @@ in calcurse = callPackage ../applications/misc/calcurse { }; - calibre = qt5.callPackage ../applications/misc/calibre { - inherit (pythonPackages) pyqt5 sip; - }; + calibre = qt5.callPackage ../applications/misc/calibre { }; camlistore = callPackage ../applications/misc/camlistore { }; -- cgit 1.4.1 From a0fe37f43f2c6ba641ac5c0346527587c83f4986 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Nov 2016 15:48:49 +0100 Subject: electrum-dash: use python2 --- pkgs/applications/misc/electrum-dash/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/misc/electrum-dash/default.nix b/pkgs/applications/misc/electrum-dash/default.nix index 7abeaf57b64c..917d32e74afd 100644 --- a/pkgs/applications/misc/electrum-dash/default.nix +++ b/pkgs/applications/misc/electrum-dash/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, pythonPackages }: +{ stdenv, fetchurl, python2Packages }: -pythonPackages.buildPythonApplication rec { +python2Packages.buildPythonApplication rec { name = "electrum-dash-${version}"; version = "2.4.1"; @@ -9,7 +9,7 @@ pythonPackages.buildPythonApplication rec { sha256 = "02k7m7fyn0cvlgmwxr2gag7rf2knllkch1ma58shysp7zx9jb000"; }; - propagatedBuildInputs = with pythonPackages; [ + propagatedBuildInputs = with python2Packages; [ dns ecdsa pbkdf2 -- cgit 1.4.1 From 3829e93942ec87009fd6f5918ac8a8f99a2cbd32 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Nov 2016 16:39:54 +0100 Subject: pmenu: use python2 --- pkgs/applications/misc/pmenu/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/misc/pmenu/default.nix b/pkgs/applications/misc/pmenu/default.nix index 9b3766842845..da59f7f18867 100644 --- a/pkgs/applications/misc/pmenu/default.nix +++ b/pkgs/applications/misc/pmenu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, pythonPackages, gnome2 }: +{ stdenv, fetchFromGitLab, python2Packages, gnome2 }: stdenv.mkDerivation rec { name = "pmenu-${version}"; @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { sha256 = "15bkvadr7ab44mc8gkdqs3w14cm498mwf72w5rjm2rdh55357jjh"; }; - nativeBuildInputs = [ pythonPackages.wrapPython ]; + nativeBuildInputs = [ python2Packages.wrapPython ]; - buildInputs = [ pythonPackages.pygtk gnome2.gnome_menus ]; + buildInputs = [ python2Packages.pygtk gnome2.gnome_menus ]; - pythonPath = [ pythonPackages.pygtk ]; + pythonPath = [ python2Packages.pygtk ]; patchPhase = '' substituteInPlace install.sh --replace "/usr/local" "$out" -- cgit 1.4.1 From 659c5c4c625bff2e05db9c44d768dd83e263f962 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 9 Nov 2016 16:40:46 +0100 Subject: keepnote: use python2 --- pkgs/applications/office/keepnote/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/office/keepnote/default.nix b/pkgs/applications/office/keepnote/default.nix index b8d04baf356d..bb2c6adbf3b4 100644 --- a/pkgs/applications/office/keepnote/default.nix +++ b/pkgs/applications/office/keepnote/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, pythonPackages }: +{ stdenv, fetchurl, python2Packages }: -pythonPackages.buildPythonApplication { +python2Packages.buildPythonApplication { name = "keepnote-0.7.8"; namePrefix = ""; @@ -9,7 +9,7 @@ pythonPackages.buildPythonApplication { sha256 = "0nhkkv1n0lqf3zn17pxg5cgryv1wwlj4hfmhixwd76rcy8gs45dh"; }; - propagatedBuildInputs = with pythonPackages; [ pyGtkGlade ]; + propagatedBuildInputs = with python2Packages; [ pyGtkGlade ]; # Testing fails. doCheck = false; -- cgit 1.4.1 From 97259c811ea24745e1a9af3214b1ac6a617d2e56 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 14 Nov 2016 16:35:11 +0100 Subject: qemu: use python2 --- pkgs/applications/virtualization/qemu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index ad8f94b52af2..759f0a6ad332 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, python, zlib, pkgconfig, glib +{ stdenv, fetchurl, fetchpatch, python2, zlib, pkgconfig, glib , ncurses, perl, pixman, vde2, alsaLib, texinfo, libuuid, flex , bison, lzo, snappy, libaio, gnutls, nettle , makeWrapper @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ python zlib pkgconfig glib ncurses perl pixman + [ python2 zlib pkgconfig glib ncurses perl pixman vde2 texinfo libuuid flex bison makeWrapper lzo snappy gnutls nettle ] -- cgit 1.4.1 From 4383e20bb111ed1d10fd1020d90a7e176d558f7d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 14 Nov 2016 21:08:08 +0100 Subject: a2jmidid: use python2 --- pkgs/applications/audio/a2jmidid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/audio/a2jmidid/default.nix b/pkgs/applications/audio/a2jmidid/default.nix index 35954471877a..ddd34f1bfeb9 100644 --- a/pkgs/applications/audio/a2jmidid/default.nix +++ b/pkgs/applications/audio/a2jmidid/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, makeWrapper, pkgconfig, alsaLib, dbus, libjack2 -, pythonPackages}: +, python2Packages}: let - inherit (pythonPackages) python dbus-python; + inherit (python2Packages) python dbus-python; in stdenv.mkDerivation rec { name = "a2jmidid-${version}"; version = "8"; -- cgit 1.4.1 From eb926468e9743b40d6154511ee0f2e313f51afe5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 18 Nov 2016 13:16:36 +0100 Subject: mailpile: use python2 --- .../networking/mailreaders/mailpile/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/networking/mailreaders/mailpile/default.nix b/pkgs/applications/networking/mailreaders/mailpile/default.nix index 031e835d3f73..05fea05fd14e 100644 --- a/pkgs/applications/networking/mailreaders/mailpile/default.nix +++ b/pkgs/applications/networking/mailreaders/mailpile/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchgit, pythonPackages, gnupg1orig, makeWrapper, openssl }: +{ stdenv, fetchgit, python2Packages, gnupg1orig, makeWrapper, openssl }: -pythonPackages.buildPythonApplication rec { +python2Packages.buildPythonApplication rec { name = "mailpile-${version}"; version = "0.4.1"; @@ -11,11 +11,11 @@ pythonPackages.buildPythonApplication rec { }; patchPhase = '' - substituteInPlace setup.py --replace "data_files.append((dir" "data_files.append(('lib/${pythonPackages.python.libPrefix}/site-packages/' + dir" + substituteInPlace setup.py --replace "data_files.append((dir" "data_files.append(('lib/${python2Packages.python.libPrefix}/site-packages/' + dir" ''; - propagatedBuildInputs = with pythonPackages; [ - makeWrapper pillow jinja2 spambayes pythonPackages.lxml + propagatedBuildInputs = with python2Packages; [ + makeWrapper pillow jinja2 spambayes python2Packages.lxml pgpdump gnupg1orig ]; @@ -24,6 +24,9 @@ pythonPackages.buildPythonApplication rec { --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnupg1orig openssl ]}" ''; + # No tests were found + doCheck = false; + meta = with stdenv.lib; { description = "A modern, fast web-mail client with user-friendly encryption and privacy features"; homepage = https://www.mailpile.is/; -- cgit 1.4.1 From d1b6976edae5cdfb0a671456b33be20c9d0b4d67 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 18 Nov 2016 13:29:32 +0100 Subject: quodlibet: use python2 --- pkgs/applications/audio/quodlibet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index 00856721f95d..dd3a0b4a1c6d 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pythonPackages, intltool +{ stdenv, fetchurl, python2Packages, intltool , gst_python, withGstPlugins ? false, gst_plugins_base ? null , gst_plugins_good ? null, gst_plugins_ugly ? null, gst_plugins_bad ? null }: @@ -9,7 +9,7 @@ assert withGstPlugins -> gst_plugins_base != null let version = "2.6.3"; - inherit (pythonPackages) buildPythonApplication python mutagen pygtk pygobject2 dbus-python; + inherit (python2Packages) buildPythonApplication python mutagen pygtk pygobject2 dbus-python; in buildPythonApplication { # call the package quodlibet and just quodlibet name = "quodlibet${stdenv.lib.optionalString withGstPlugins "-with-gst-plugins"}-${version}"; -- cgit 1.4.1 From 2887a633f7dfa18af57ea05f96b0eee4deb5c0f6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 18 Nov 2016 13:30:42 +0100 Subject: mypaint: use python2 --- pkgs/applications/graphics/mypaint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/graphics/mypaint/default.nix b/pkgs/applications/graphics/mypaint/default.nix index 27d6c207e68a..db5e6e1a7e37 100644 --- a/pkgs/applications/graphics/mypaint/default.nix +++ b/pkgs/applications/graphics/mypaint/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, gettext, glib, gtk2, hicolor_icon_theme, json_c -, lcms2, libpng , makeWrapper, pkgconfig, pythonPackages +, lcms2, libpng , makeWrapper, pkgconfig, python2Packages , scons, swig }: let - inherit (pythonPackages) python pygtk numpy; + inherit (python2Packages) python pygtk numpy; in stdenv.mkDerivation rec { name = "mypaint-${version}"; version = "1.1.0"; -- cgit 1.4.1 From 8fb430ca86926d80caef0339a034c817c1e10854 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 18 Nov 2016 14:16:28 +0100 Subject: thunderbird: use python2 and remove pysqlite since its part of the standard library. --- pkgs/applications/networking/mailreaders/thunderbird/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 8e2e5a1be448..9e2baf94527f 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, pkgconfig, which, m4, gtk2, pango, perl, python, zip, libIDL +{ stdenv, fetchurl, pkgconfig, which, m4, gtk2, pango, perl, python2, zip, libIDL , libjpeg, libpng, zlib, dbus, dbus_glib, bzip2, xorg , freetype, fontconfig, file, alsaLib, nspr, nss, libnotify -, yasm, mesa, sqlite, unzip, makeWrapper, pysqlite +, yasm, mesa, sqlite, unzip, makeWrapper , hunspell, libevent, libstartup_notification, libvpx , cairo, gstreamer, gst_plugins_base, icu , debugBuild ? false @@ -26,10 +26,10 @@ stdenv.mkDerivation rec { buildInputs = # from firefox30Pkgs.xulrunner, without gstreamer and libvpx [ pkgconfig which libpng gtk2 perl zip libIDL libjpeg zlib bzip2 - python dbus dbus_glib pango freetype fontconfig xorg.libXi + python2 dbus dbus_glib pango freetype fontconfig xorg.libXi xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file alsaLib nspr nss libnotify xorg.pixman yasm mesa - xorg.libXScrnSaver xorg.scrnsaverproto pysqlite + xorg.libXScrnSaver xorg.scrnsaverproto xorg.libXext xorg.xextproto sqlite unzip makeWrapper hunspell libevent libstartup_notification cairo icu ] ++ [ m4 ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9559849d9057..805d5d5d5a01 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14825,7 +14825,6 @@ in thunderbird = callPackage ../applications/networking/mailreaders/thunderbird { inherit (gnome2) libIDL; - inherit (pythonPackages) pysqlite; libpng = libpng_apng; }; -- cgit 1.4.1 From fda03ec4bd0849cc5364a62c05ff55826b17f1a8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 18 Nov 2016 18:29:43 +0100 Subject: telepathy.glib: add python to passthru and let the telepathy plugins use it. --- .../networking/instant-messengers/telepathy/gabble/default.nix | 4 ++-- .../networking/instant-messengers/telepathy/haze/default.nix | 2 +- .../networking/instant-messengers/telepathy/idle/default.nix | 2 +- .../networking/instant-messengers/telepathy/logger/default.nix | 2 +- .../instant-messengers/telepathy/mission-control/default.nix | 2 +- .../networking/instant-messengers/telepathy/rakia/default.nix | 6 +++--- .../networking/instant-messengers/telepathy/salut/default.nix | 2 +- pkgs/development/libraries/telepathy/glib/default.nix | 2 ++ 8 files changed, 12 insertions(+), 10 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix index 971a834f4096..32266d7b42d5 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, libxslt, telepathy_glib, libxml2, dbus_glib, dbus_daemon -, sqlite, libsoup, libnice, gnutls }: +, sqlite, libsoup, libnice, gnutls}: stdenv.mkDerivation rec { name = "telepathy-gabble-0.18.2"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig libxslt ]; - buildInputs = [ libxml2 dbus_glib sqlite libsoup libnice telepathy_glib gnutls ] + buildInputs = [ libxml2 dbus_glib sqlite libsoup libnice telepathy_glib gnutls telepathy_glib.python ] ++ stdenv.lib.optional doCheck dbus_daemon; configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt"; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix index b1880be6562b..4e4a2a9b6a96 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1jgrp32p6rllj089ynbsk3n9xrvsvzmwzhf0ql05kkgj0nf08xiy"; }; - buildInputs = [ glib telepathy_glib dbus_glib pidgin ]; + buildInputs = [ glib telepathy_glib dbus_glib pidgin telepathy_glib.python ]; nativeBuildInputs = [ pkgconfig libxslt ]; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix index 16a31f6f3ba1..c29c6def2f60 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1argdzbif1vdmwp5vqbgkadq9ancjmgdm2ncp0qfckni715ss4rh"; }; - buildInputs = [ pkgconfig glib telepathy_glib dbus_glib libxslt ]; + buildInputs = [ pkgconfig glib telepathy_glib dbus_glib libxslt telepathy_glib.python ]; meta = { description = "IRC connection manager for the Telepathy framework"; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix index aaff39ccb44d..2ade2fd3edd0 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${dbus_glib.dev}/include/dbus-1.0 -I${dbus_libs.dev}/include/dbus-1.0"; buildInputs = [ dbus_glib libxml2 sqlite telepathy_glib pkgconfig intltool - gobjectIntrospection dbus_libs ]; + gobjectIntrospection dbus_libs telepathy_glib.python ]; nativeBuildInputs = [ libxslt ]; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix index aab7f84f467a..a8fc9477707d 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0zcbx69k0d3p2pjh3g7sa3q2zkd5xchxkqsmlfn3fwxaz0pmsmvi"; }; - buildInputs = [ telepathy_glib makeWrapper /*upower*/ ]; # ToDo: optional stuff missing + buildInputs = [ telepathy_glib telepathy_glib.python makeWrapper /*upower*/ ]; # ToDo: optional stuff missing # 5.16.3 won't build with upower-0.99. Arch and Debian choose to disable it nativeBuildInputs = [ pkgconfig libxslt ]; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/rakia/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/rakia/default.nix index 538a8d7f6d2b..7d06d57ca9ac 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/rakia/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/rakia/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfigUpstream, libxslt, telepathy_glib, libxml2, dbus_glib -, python, sofia_sip }: +, sofia_sip }: stdenv.mkDerivation rec { pname = "telepathy-rakia"; @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { sha256 = "18dxffa8hhjyvqkhhac05rrkx81vnncjrakg5ygikfp0j79vrbhv"; }; - nativeBuildInputs = [pkgconfigUpstream libxslt python]; - buildInputs = [ libxml2 dbus_glib telepathy_glib sofia_sip]; + nativeBuildInputs = [pkgconfigUpstream libxslt ]; + buildInputs = [ libxml2 dbus_glib telepathy_glib sofia_sip telepathy_glib.python ]; meta = { homepage = http://telepathy.freedesktop.org; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix index 918be4e9b83e..cbae6af97b85 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { # pcre needed because https://github.com/NixOS/nixpkgs/pull/15046 buildInputs = [ glib libxml2 telepathy_glib avahi libsoup libuuid openssl - sqlite pcre ]; + sqlite pcre telepathy_glib.python ]; nativeBuildInputs = [ libxslt pkgconfigUpstream ]; diff --git a/pkgs/development/libraries/telepathy/glib/default.nix b/pkgs/development/libraries/telepathy/glib/default.nix index bea07396b0cc..bc9e861df9c6 100644 --- a/pkgs/development/libraries/telepathy/glib/default.nix +++ b/pkgs/development/libraries/telepathy/glib/default.nix @@ -19,6 +19,8 @@ stdenv.mkDerivation rec { substituteInPlace telepathy-glib/telepathy-glib.pc.in --replace Requires.private Requires ''; + passthru.python = python2; + meta = { homepage = http://telepathy.freedesktop.org; platforms = stdenv.lib.platforms.unix; -- cgit 1.4.1 From b28689f453d506827b9449e070040320ea179be6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 19 Nov 2016 10:29:45 +0100 Subject: chromium: use python2 --- pkgs/applications/networking/browsers/chromium/common.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 07ad1bef25f0..ea66703f166d 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -7,7 +7,7 @@ , xdg_utils, yasm, minizip, libwebp , libusb1, pciutils, nss, re2, zlib, libvpx -, python, pythonPackages, perl, pkgconfig +, python2Packages, perl, pkgconfig , nspr, systemd, kerberos , utillinux, alsaLib , bison, gperf @@ -86,7 +86,7 @@ let src = upstream-info.main; - nativeBuildInputs = [ gn which python perl pkgconfig ]; + nativeBuildInputs = [ gn which python2Packages.python perl pkgconfig ]; buildInputs = defaultDependencies ++ [ nspr nss systemd @@ -95,7 +95,7 @@ let glib gtk2 dbus_glib libXScrnSaver libXcursor libXtst mesa pciutils protobuf speechd libXdamage - pythonPackages.ply pythonPackages.jinja2 + python2Packages.ply python2Packages.jinja2 ] ++ optional gnomeKeyringSupport libgnome_keyring3 ++ optionals gnomeSupport [ gnome.GConf libgcrypt ] ++ optional enableSELinux libselinux -- cgit 1.4.1