diff options
| author | Thiago Kenji Okada <thiagokokada@gmail.com> | 2023-01-07 13:42:45 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-07 13:42:45 +0000 |
| commit | c2094ffe92b5a3b1fe0af2f04cccff95ba43e0a1 (patch) | |
| tree | 994e4005eededd7134c28449156da10d7b4673ad /pkgs | |
| parent | 7808480f16d83b91c95409cfb1b652f1bb7bb5fb (diff) | |
| parent | e0487171e34611501a9c73e0f8f3e612877b9c49 (diff) | |
Merge pull request #209474 from thiagokokada/scons
sconsPackages.scons_3_0_1: drop; sconsPackages.scons_3_1_2: default to python3
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/tools/build-managers/scons/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/servers/nosql/mongodb/mongodb.nix | 6 |
2 files changed, 3 insertions, 9 deletions
diff --git a/pkgs/development/tools/build-managers/scons/default.nix b/pkgs/development/tools/build-managers/scons/default.nix index da11bdb28aa12..b0d6085250d22 100644 --- a/pkgs/development/tools/build-managers/scons/default.nix +++ b/pkgs/development/tools/build-managers/scons/default.nix @@ -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"; diff --git a/pkgs/servers/nosql/mongodb/mongodb.nix b/pkgs/servers/nosql/mongodb/mongodb.nix index 2f06e8f42ce61..a253e6d7fbc9c 100644 --- a/pkgs/servers/nosql/mongodb/mongodb.nix +++ b/pkgs/servers/nosql/mongodb/mongodb.nix @@ -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)"; |