weechat: build with python3 by default

WeeChat also supports Python3 for scripts which should be preferred as
CPython2 is about to get EOLed soon: https://weechat.org/scripts/python3/
This commit is contained in:
Maximilian Bosch
2019-09-05 20:03:45 +02:00
parent a7c12f59f8
commit 689a50f3a2
5 changed files with 16 additions and 20 deletions
@@ -1,4 +1,4 @@
{ callPackage, luaPackages, pythonPackages }:
{ callPackage, luaPackages }:
{
weechat-xmpp = callPackage ./weechat-xmpp {
@@ -9,13 +9,9 @@
inherit (luaPackages) cjson luaffi;
};
wee-slack = callPackage ./wee-slack {
inherit pythonPackages;
};
wee-slack = callPackage ./wee-slack { };
weechat-autosort = callPackage ./weechat-autosort { };
weechat-otr = callPackage ./weechat-otr {
inherit pythonPackages;
};
weechat-otr = callPackage ./weechat-otr { };
}
@@ -1,4 +1,4 @@
{ stdenv, substituteAll, buildEnv, fetchFromGitHub, pythonPackages }:
{ stdenv, substituteAll, buildEnv, fetchFromGitHub, python3Packages }:
stdenv.mkDerivation rec {
pname = "wee-slack";
@@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
src = ./libpath.patch;
env = "${buildEnv {
name = "wee-slack-env";
paths = with pythonPackages; [ websocket_client six ];
}}/${pythonPackages.python.sitePackages}";
paths = with python3Packages; [ websocket_client six ];
}}/${python3Packages.python.sitePackages}";
})
];
@@ -1,4 +1,4 @@
{ stdenv, substituteAll, buildEnv, fetchgit, fetchFromGitHub, pythonPackages, gmp }:
{ stdenv, substituteAll, buildEnv, fetchgit, fetchFromGitHub, python3Packages, gmp }:
let
# pure-python-otr (potr) requires an older version of pycrypto, which is
@@ -6,7 +6,7 @@ let
# of pycrypto will be fetched from the Debian project.
# https://security-tracker.debian.org/tracker/source-package/python-crypto
pycrypto = pythonPackages.buildPythonPackage rec {
pycrypto = python3Packages.buildPythonPackage rec {
pname = "pycrypto";
version = "2.6.1-10";
@@ -24,7 +24,7 @@ let
'';
};
potr = pythonPackages.potr.overridePythonAttrs (oldAttrs: {
potr = python3Packages.potr.overridePythonAttrs (oldAttrs: {
propagatedBuildInputs = [ pycrypto ];
});
in stdenv.mkDerivation rec {
@@ -44,7 +44,7 @@ in stdenv.mkDerivation rec {
env = "${buildEnv {
name = "weechat-otr-env";
paths = [ potr pycrypto ];
}}/${pythonPackages.python.sitePackages}";
}}/${python3Packages.python.sitePackages}";
})
];