Merge pull request #209474 from thiagokokada/scons

sconsPackages.scons_3_0_1: drop; sconsPackages.scons_3_1_2: default to python3
This commit is contained in:
Thiago Kenji Okada 2023-01-07 13:42:45 +00:00 committed by GitHub
commit c2094ffe92
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 9 deletions

View File

@ -5,14 +5,10 @@ let
python = python3;
};
in {
scons_3_0_1 = (mkScons {
version = "3.0.1";
sha256 = "0wzid419mlwqw9llrg8gsx4nkzhqy16m4m40r0xnh6cwscw5wir4";
}).override { python = python2; };
scons_3_1_2 = (mkScons {
version = "3.1.2";
sha256 = "1yzq2gg9zwz9rvfn42v5jzl3g4qf1khhny6zfbi2hib55zvg60bq";
}).override { python = python2; };
});
scons_latest = mkScons {
version = "4.1.0";
sha256 = "11axk03142ziax6i3wwy9qpqp7r3i7h5jg9y2xzph9i15rv8vlkj";

View File

@ -41,8 +41,7 @@ let
pymongo
]);
# 4.2 < mongodb <= 6.0.x needs scons 3.x built with python3
scons = sconsPackages.scons_3_1_2.override { python = python3; };
scons = sconsPackages.scons_3_1_2;
mozjsVersion = "60";
mozjsReplace = "defined(HAVE___SINCOS)";
@ -55,8 +54,7 @@ let
setuptools
]);
# 4.2 < mongodb <= 5.0.x needs scons 3.x built with python3
scons = sconsPackages.scons_3_1_2.override { python = python3; };
scons = sconsPackages.scons_3_1_2;
mozjsVersion = "60";
mozjsReplace = "defined(HAVE___SINCOS)";