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
base: 1372aa414cef
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: dabcb87cd8e2
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Mar 21, 2021

  1. bash: don't rely on patch timestamps in build 

    When, after patching, `configure.ac` is newer than `configure`, the
Makefile will try to regenerate `configure` from `configure.ac`.

While that might usually be desirable, in this case we want to keep
bootstrapping simple and directly use the `configure` from the package
so we can avoid a dependency on automake.

Previously, we used the `-T` parameter to automake to make sure the
timestamps were okay. However, this is brittle when we update: when the
timestamp of the original file changes, and no longer matches the
timestamp of the original file in the patch, `patch` will show a warning
but otherwise continue without updating the timestamp.

This PR changes things so we only patch `configure`, so that will always
have a newer timestamp.

Refs #115177
    @raboof
    raboof committed Mar 21, 2021
    Copy the full SHA
    3f4ad3d View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2021

  1. Merge #117127: don't rely on patch timestamps in build 

    ...into staging
    @vcunat
    vcunat committed Mar 27, 2021
    Copy the full SHA
    dabcb87 View commit details
    Browse the repository at this point in the history