Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 153ad8bc1e09
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0f972a253468
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Jan 21, 2021

  1. scons: 4.0.1 -> 4.1.0

    @primeos
    primeos committed Jan 21, 2021

    Verified

    This commit was signed with the committer’s verified signature.
    holymonson Monson Shao
    GPG key ID: 163271C707982C65
    Verified
    Learn about vigilant mode
    Copy the full SHA
    9d8900b View commit details

Commits on Jan 22, 2021

  1. Merge pull request #110328 from primeos/scons 

    scons: 4.0.1 -> 4.1.0
    @primeos
    primeos authored Jan 22, 2021
    Copy the full SHA
    0f972a2 View commit details
Showing with 10 additions and 2 deletions.
  1. +8 −0 pkgs/development/tools/build-managers/scons/common.nix
  2. +2 −2 pkgs/development/tools/build-managers/scons/default.nix
8 changes: 8 additions & 0 deletions pkgs/development/tools/build-managers/scons/common.nix
View file
Original file line number Diff line number Diff line change
@@ -16,11 +16,19 @@ python3Packages.buildPythonApplication rec {
postPatch = lib.optionalString (lib.versionAtLeast version "4.0.0") ''
substituteInPlace setup.cfg \
--replace "build/dist" "dist"
'' + lib.optionalString (lib.versionAtLeast version "4.1.0") ''
substituteInPlace setup.cfg \
--replace "build/doc/man/" ""
'';

# The release tarballs don't contain any tests (runtest.py and test/*):
doCheck = lib.versionOlder version "4.0.0";

postInstall = lib.optionalString (lib.versionAtLeast version "4.1.0") ''
mkdir -p "$out/share/man/man1"
mv "$out/"*.1 "$out/share/man/man1/"
'';

meta = with stdenv.lib; {
description = "An improved, cross-platform substitute for Make";
longDescription = ''
4 changes: 2 additions & 2 deletions pkgs/development/tools/build-managers/scons/default.nix
View file
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ in {
sha256 = "1yzq2gg9zwz9rvfn42v5jzl3g4qf1khhny6zfbi2hib55zvg60bq";
}).override { python3Packages = python2Packages; };
scons_latest = mkScons {
version = "4.0.1";
sha256 = "0z00l9wzaiqyjq0hapbvsjclvcfjjjq04kmxi7ffq966nl2d2bkj";
version = "4.1.0";
sha256 = "11axk03142ziax6i3wwy9qpqp7r3i7h5jg9y2xzph9i15rv8vlkj";
};
}