diff options
author | Michael Weiss <dev.primeos@gmail.com> | 2020-03-27 14:47:48 +0100 |
---|---|---|
committer | Jon <jonringer@users.noreply.github.com> | 2020-03-27 10:49:52 -0700 |
commit | 0950324466d7d978dadccf8dee58c89344d8326b (patch) | |
tree | b631f3381f45c3af48c8344cae1a8a6e995323a4 /pkgs/development/tools/build-managers | |
parent | e9aa2ef64ac52d3dca00422a3dfb54dcc7e3cc93 (diff) | |
download | nixlib-0950324466d7d978dadccf8dee58c89344d8326b.tar nixlib-0950324466d7d978dadccf8dee58c89344d8326b.tar.gz nixlib-0950324466d7d978dadccf8dee58c89344d8326b.tar.bz2 nixlib-0950324466d7d978dadccf8dee58c89344d8326b.tar.lz nixlib-0950324466d7d978dadccf8dee58c89344d8326b.tar.xz nixlib-0950324466d7d978dadccf8dee58c89344d8326b.tar.zst nixlib-0950324466d7d978dadccf8dee58c89344d8326b.zip |
scons: Add passthru.py2 for backward compatibility
Not all packages build with Python 3, see #75877. The goal is to get rid of Python 2 but this approach ensures a smoother transition.
Diffstat (limited to 'pkgs/development/tools/build-managers')
-rw-r--r-- | pkgs/development/tools/build-managers/scons/common.nix | 9 | ||||
-rw-r--r-- | pkgs/development/tools/build-managers/scons/default.nix | 6 |
2 files changed, 9 insertions, 6 deletions
diff --git a/pkgs/development/tools/build-managers/scons/common.nix b/pkgs/development/tools/build-managers/scons/common.nix index 340364025a81..41ac16bed7a1 100644 --- a/pkgs/development/tools/build-managers/scons/common.nix +++ b/pkgs/development/tools/build-managers/scons/common.nix @@ -1,6 +1,6 @@ { version, sha256 }: -{ stdenv, fetchurl, python3Packages }: +{ stdenv, fetchurl, python3Packages, python2Packages, scons }: python3Packages.buildPythonApplication rec { pname = "scons"; @@ -13,10 +13,10 @@ python3Packages.buildPythonApplication rec { setupHook = ./setup-hook.sh; + passthru.py2 = scons.override { python3Packages = python2Packages; }; + meta = with stdenv.lib; { - homepage = http://scons.org/; description = "An improved, cross-platform substitute for Make"; - license = licenses.mit; longDescription = '' SCons is an Open Source software construction tool. Think of SCons as an improved, cross-platform substitute for the classic @@ -25,6 +25,9 @@ python3Packages.buildPythonApplication rec { SCons is an easier, more reliable and faster way to build software. ''; + homepage = "https://scons.org/"; + changelog = "https://raw.githubusercontent.com/SConsProject/scons/rel_${version}/src/CHANGES.txt"; + license = licenses.mit; platforms = platforms.all; maintainers = [ maintainers.primeos ]; }; diff --git a/pkgs/development/tools/build-managers/scons/default.nix b/pkgs/development/tools/build-managers/scons/default.nix index 0afe2fbe9281..19b092b86bab 100644 --- a/pkgs/development/tools/build-managers/scons/default.nix +++ b/pkgs/development/tools/build-managers/scons/default.nix @@ -1,12 +1,12 @@ -{ callPackage }: +{ callPackage, python2Packages }: let mkScons = args: callPackage (import ./common.nix args) { }; in { - scons_3_0_1 = mkScons { + scons_3_0_1 = (mkScons { version = "3.0.1"; sha256 = "0wzid419mlwqw9llrg8gsx4nkzhqy16m4m40r0xnh6cwscw5wir4"; - }; + }).override { python3Packages = python2Packages; }; scons_latest = mkScons { version = "3.1.2"; sha256 = "1yzq2gg9zwz9rvfn42v5jzl3g4qf1khhny6zfbi2hib55zvg60bq"; |