Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions pkgs/by-name/sc/scons/no-man-pages.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
--- a/setup.cfg
+++ b/setup.cfg
@@ -67,11 +67,6 @@ console_scripts =
SCons.Tool.docbook = *.*


-[options.data_files]
-. = scons.1
- scons-time.1
- sconsign.1
-
[sdist]
dist_dir=build/dist

Original file line number Diff line number Diff line change
@@ -1,34 +1,32 @@
{ lib, fetchFromGitHub, python3 }:

let
{ lib, fetchFromGitHub, python3Packages }:
python3Packages.buildPythonApplication rec {
pname = "scons";
version = "3.1.2";
version = "4.7.0";

src = fetchFromGitHub {
owner = "Scons";
repo = "scons";
rev = version;
hash = "sha256-C3U4N7+9vplzoJoevQe5Zeuz0TDmB6/miMwBJLzA3WA=";
hash = "sha256-7VzGuz9CAUF6MRCEpj5z1FkZD19/Ic+YBukYQocvkr0=";
};
in
python3.pkgs.buildPythonApplication {
inherit pname version src;

outputs = [ "out" "man" ];
pyproject = true;

preConfigure = ''
python bootstrap.py
cd build/scons
'';
patches = [
./env.patch
./no-man-pages.patch
];

setupHook = ./setup-hook.sh;
build-system = [
python3Packages.setuptools
];

doCheck = true;
setupHook = ./setup-hook.sh;

passthru = {
# expose the used python version so tools using this (and extensing scos
# with other python modules) can use the exact same python version.
inherit python3;
python = python3;
inherit (python3Packages) python;
};

meta = {
Expand All @@ -45,4 +43,3 @@ python3.pkgs.buildPythonApplication {
maintainers = with lib.maintainers; [ AndersonTorres ];
};
}
# TODO: patch to get rid of distutils and other deprecations
2 changes: 1 addition & 1 deletion pkgs/development/libraries/openvino/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ let
stdenv = gcc12Stdenv;

# prevent scons from leaking in the default python version
scons' = scons.override { python3 = python3Packages.python; };
scons' = scons.override { inherit python3Packages; };

tbbbind_version = "2_5";
tbbbind = fetchurl {
Expand Down
57 changes: 0 additions & 57 deletions pkgs/development/tools/build-managers/scons/4.1.0.nix

This file was deleted.

62 changes: 0 additions & 62 deletions pkgs/development/tools/build-managers/scons/4.5.2.nix

This file was deleted.

2 changes: 1 addition & 1 deletion pkgs/os-specific/linux/ffado/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ mkDerivation rec {

nativeBuildInputs = [
desktop-file-utils
(scons.override { python3 = python311; })
(scons.override { python3Packages = python311.pkgs; })
pkg-config
which
python
Expand Down
5 changes: 0 additions & 5 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -19309,11 +19309,6 @@ with pkgs;

sca2d = callPackage ../development/tools/sca2d { };

scons = scons_4_5_2;
scons_3_1_2 = callPackage ../development/tools/build-managers/scons/3.1.2.nix { };
scons_4_1_0 = callPackage ../development/tools/build-managers/scons/4.1.0.nix { };
scons_4_5_2 = callPackage ../development/tools/build-managers/scons/4.5.2.nix { };

mill = callPackage ../development/tools/build-managers/mill { };

sbt = callPackage ../development/tools/build-managers/sbt { };
Expand Down