summaryrefslogtreecommitdiffstats
path: root/pkgs/servers
diff options
context:
space:
mode:
authorFrederik Rietdijk <freddyrietdijk@fridh.nl>2021-03-25 13:26:35 +0100
committerGitHub <noreply@github.com>2021-03-25 13:26:35 +0100
commit350f9bd822e1c5017482e6364dbafda36ff4157a (patch)
tree41f6c6c5f7ff38584f5091004c40cec14f908b00 /pkgs/servers
parentc0e881852006b132236cbf0301bd1939bb50867e (diff)
parentf0754b8ab8b4969ff49e2436c6c8f12120c13ad8 (diff)
Merge pull request #117570 from FRidh/python2alias
Python: be explicit on whether it is python2 or python3 that is used
Diffstat (limited to 'pkgs/servers')
-rw-r--r--pkgs/servers/dico/default.nix4
-rw-r--r--pkgs/servers/dict/dictd-wordnet.nix4
-rw-r--r--pkgs/servers/dict/wiktionary/default.nix4
-rw-r--r--pkgs/servers/foundationdb/default.nix2
-rw-r--r--pkgs/servers/foundationdb/vsmake.nix4
-rw-r--r--pkgs/servers/ldap/389/default.nix4
6 files changed, 11 insertions, 11 deletions
diff --git a/pkgs/servers/dico/default.nix b/pkgs/servers/dico/default.nix
index cf0417e332e8..6a8c6541c2cc 100644
--- a/pkgs/servers/dico/default.nix
+++ b/pkgs/servers/dico/default.nix
@@ -1,5 +1,5 @@
{ fetchurl, lib, stdenv, libtool, gettext, zlib, readline, gsasl
-, guile, python, pcre, libffi, groff }:
+, guile, python2, pcre, libffi, groff }:
stdenv.mkDerivation rec {
pname = "dico";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ];
buildInputs =
- [ libtool gettext zlib readline gsasl guile python pcre libffi groff ];
+ [ libtool gettext zlib readline gsasl guile python2 pcre libffi groff ];
doCheck = true;
diff --git a/pkgs/servers/dict/dictd-wordnet.nix b/pkgs/servers/dict/dictd-wordnet.nix
index 3f76d60233cc..8378102dac53 100644
--- a/pkgs/servers/dict/dictd-wordnet.nix
+++ b/pkgs/servers/dict/dictd-wordnet.nix
@@ -1,10 +1,10 @@
-{lib, stdenv, python, wordnet, writeScript}:
+{lib, stdenv, python2, wordnet, writeScript}:
stdenv.mkDerivation rec {
version = "542";
pname = "dict-db-wordnet";
- buildInputs = [python wordnet];
+ buildInputs = [python2 wordnet];
convert = ./wordnet_structures.py;
builder = writeScript "builder.sh" ''
diff --git a/pkgs/servers/dict/wiktionary/default.nix b/pkgs/servers/dict/wiktionary/default.nix
index cd0c9c6c24bc..3a01120f3a68 100644
--- a/pkgs/servers/dict/wiktionary/default.nix
+++ b/pkgs/servers/dict/wiktionary/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, python, dict, glibcLocales }:
+{ lib, stdenv, fetchurl, python2, dict, glibcLocales }:
stdenv.mkDerivation rec {
version = "20210201";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
convert = ./wiktionary2dict.py;
- buildInputs = [ python dict glibcLocales ];
+ buildInputs = [ python2 dict glibcLocales ];
builder = ./builder.sh;
passthru.updateScript = ./update.sh;
diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix
index 78addfc4aa2f..b3a876546e78 100644
--- a/pkgs/servers/foundationdb/default.nix
+++ b/pkgs/servers/foundationdb/default.nix
@@ -2,7 +2,7 @@
, lib, fetchurl, fetchpatch, fetchFromGitHub
, cmake, ninja, which, findutils, m4, gawk
-, python, python3, openjdk, mono, libressl, boost
+, python2, python3, openjdk, mono, libressl, boost
}@args:
let
diff --git a/pkgs/servers/foundationdb/vsmake.nix b/pkgs/servers/foundationdb/vsmake.nix
index aac9ab07c0f7..e171d7145647 100644
--- a/pkgs/servers/foundationdb/vsmake.nix
+++ b/pkgs/servers/foundationdb/vsmake.nix
@@ -4,7 +4,7 @@
{ gcc6Stdenv, lib, fetchurl, fetchFromGitHub
, which, findutils, m4, gawk
-, python, openjdk, mono, libressl
+, python2, openjdk, mono, libressl
, ...
}:
@@ -51,7 +51,7 @@ let
inherit rev sha256;
};
- nativeBuildInputs = [ python openjdk gawk which m4 findutils mono ];
+ nativeBuildInputs = [ python2 openjdk gawk which m4 findutils mono ];
buildInputs = [ libressl boost ];
inherit patches;
diff --git a/pkgs/servers/ldap/389/default.nix b/pkgs/servers/ldap/389/default.nix
index bfa372ed0692..90510d502525 100644
--- a/pkgs/servers/ldap/389/default.nix
+++ b/pkgs/servers/ldap/389/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, pkg-config, doxygen, perl, pam, nspr, nss, openldap
-, db, cyrus_sasl, svrcore, icu, net-snmp, kerberos, pcre, perlPackages, libevent, openssl, python
+, db, cyrus_sasl, svrcore, icu, net-snmp, kerberos, pcre, perlPackages, libevent, openssl, python3
}:
stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook pkg-config doxygen ];
buildInputs = [
perl pam nspr nss openldap db cyrus_sasl svrcore icu
- net-snmp kerberos pcre libevent openssl python
+ net-snmp kerberos pcre libevent openssl python3
] ++ (with perlPackages; [ MozillaLdap NetAddrIP DBFile ]);
patches = [