Merge pull request #116538 from helsinki-systems/sogo-py3

sogo: python2 -> python3
This commit is contained in:
ajs124 2021-03-17 00:49:08 +01:00 committed by GitHub
commit 31ced622fa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,4 +1,4 @@
{ gnustep, lib, fetchFromGitHub, fetchpatch, makeWrapper, python2, lndir { gnustep, lib, fetchFromGitHub, fetchpatch, makeWrapper, python3, lndir
, openssl_1_1, openldap, sope, libmemcached, curl, libsodium, libzip, pkg-config }: , openssl_1_1, openldap, sope, libmemcached, curl, libsodium, libzip, pkg-config }:
with lib; gnustep.stdenv.mkDerivation rec { with lib; gnustep.stdenv.mkDerivation rec {
pname = "SOGo"; pname = "SOGo";
@ -11,7 +11,7 @@ with lib; gnustep.stdenv.mkDerivation rec {
sha256 = "145hdlwnqds5zmpxbh4yainsbv5vy99ji93d6pl7xkbqwncfi80i"; sha256 = "145hdlwnqds5zmpxbh4yainsbv5vy99ji93d6pl7xkbqwncfi80i";
}; };
nativeBuildInputs = [ gnustep.make makeWrapper python2 ]; nativeBuildInputs = [ gnustep.make makeWrapper python3 ];
buildInputs = [ gnustep.base sope openssl_1_1 libmemcached (curl.override { openssl = openssl_1_1; }) libsodium libzip pkg-config ] buildInputs = [ gnustep.base sope openssl_1_1 libmemcached (curl.override { openssl = openssl_1_1; }) libsodium libzip pkg-config ]
++ optional (openldap != null) openldap; ++ optional (openldap != null) openldap;