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: 486626bd70a6
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ccee4117be08
Choose a head ref
  • 1 commit
  • 3 files changed
  • 1 contributor

Commits on Jun 16, 2019

  1. bmake: fix version/url, fix tests, remove unneeded deps 

    As noted by @jameysharp in #63181.

Signed-off-by: Austin Seipp <as@fastly.com>
    Austin Seipp committed Jun 16, 2019
    Copy the full SHA
    ccee411 View commit details
10 changes: 10 additions & 0 deletions pkgs/development/tools/build-managers/bmake/bootstrap-fix.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
--- bmake/make-bootstrap.sh.in.orig 2019-02-19 10:55:21.733606117 -0800
+++ bmake/make-bootstrap.sh.in 2019-02-19 10:56:02.150771541 -0800
@@ -4,6 +4,7 @@

srcdir=@srcdir@

+prefix="@prefix@"
DEFAULT_SYS_PATH="@default_sys_path@"

case "@use_meta@" in
25 changes: 8 additions & 17 deletions pkgs/development/tools/build-managers/bmake/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,31 +1,22 @@
{ stdenv, fetchurl
, gnugrep, coreutils, getopt
, getopt
}:

stdenv.mkDerivation rec {
name = "bmake-${version}";
version = "20121212";
version = "20181221";

src = fetchurl {
# really wish this URL was versioned. if this changes for some
# update in the future, we'll have to backport those updates to
# any stable branches so builds can continue to work. :(
url = "http://www.crufty.net/ftp/pub/sjg/bmake.tar.gz";
url = "http://www.crufty.net/ftp/pub/sjg/${name}.tar.gz";
sha256 = "0zp6yy27z52qb12bgm3hy1dwal2i570615pqqk71zwhcxfs4h2gw";
};

nativeBuildInputs =
[ gnugrep coreutils getopt
];
nativeBuildInputs = [ getopt ];

# unexport-env sets PATH to a bogus value that won't be
# possible to use inside the build sandbox. nuke that test;
# we could also re-construct the PATH variable a bit based on
# nativeBuildInputs, but not for now
patchPhase = ''
substituteInPlace ./unit-tests/Makefile.in \
--replace "unexport-env" ""
'';
patches = [
./bootstrap-fix.patch
./fix-unexport-env-test.patch
];

meta = with stdenv.lib; {
description = "Portable version of NetBSD 'make'";
13 changes: 13 additions & 0 deletions pkgs/development/tools/build-managers/bmake/fix-unexport-env-test.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
--- bmake/unit-tests/unexport-env.mk.orig 2019-02-19 10:24:14.356713136 -0800
+++ bmake/unit-tests/unexport-env.mk 2019-02-19 10:25:43.838775388 -0800
@@ -3,8 +3,8 @@
# pick up a bunch of exported vars
.include "export.mk"

-# an example of setting up a minimal environment.
-PATH = /bin:/usr/bin:/sbin:/usr/sbin
+# preserve PATH so commands used in the "all" target are still available
+PATH := ${PATH}

# now clobber the environment to just PATH and UT_TEST
UT_TEST = unexport-env