From fd2805dcbd787499ae1161c7a757fc0c66ad55c0 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Sat, 7 Jan 2023 13:14:05 +0000 Subject: [PATCH 1/2] sconsPackages.scons_3_0_1: drop --- pkgs/development/tools/build-managers/scons/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/tools/build-managers/scons/default.nix b/pkgs/development/tools/build-managers/scons/default.nix index da11bdb28aa1..551cb8f754a6 100644 --- a/pkgs/development/tools/build-managers/scons/default.nix +++ b/pkgs/development/tools/build-managers/scons/default.nix @@ -5,10 +5,6 @@ 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"; From e0487171e34611501a9c73e0f8f3e612877b9c49 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Sat, 7 Jan 2023 13:15:11 +0000 Subject: [PATCH 2/2] sconsPackages.scons_3_1_2: default to python3 --- pkgs/development/tools/build-managers/scons/default.nix | 2 +- pkgs/servers/nosql/mongodb/mongodb.nix | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/build-managers/scons/default.nix b/pkgs/development/tools/build-managers/scons/default.nix index 551cb8f754a6..b0d6085250d2 100644 --- a/pkgs/development/tools/build-managers/scons/default.nix +++ b/pkgs/development/tools/build-managers/scons/default.nix @@ -8,7 +8,7 @@ in { 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 2f06e8f42ce6..a253e6d7fbc9 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)";