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/nix
base: 95bdfaa8bdac
Choose a base ref
...
head repository: NixOS/nix
compare: a2f86ac647e4
Choose a head ref
  • 8 commits
  • 5 files changed
  • 4 contributors

Commits on May 29, 2019

  1. Replace type with command -v in install script 

    In POSIX sh, `type` is undefined.

cf. https://pubs.opengroup.org/onlinepubs/9699919799/utilities/command.html#tag_20_22_04
    @johannes-climacus
    johannes-climacus committed May 29, 2019
    Copy the full SHA
    a8251ba View commit details
    Browse the repository at this point in the history

Commits on May 30, 2019

  1. Merge pull request #2892 from johannes-climacus/master 

    Replace `type` with `command -v` in install script
    @edolstra
    edolstra committed May 30, 2019
    Copy the full SHA
    d8abee9 View commit details
    Browse the repository at this point in the history

  2. release-common: fix build with config.allowAliases = false 

    ```sh
> nix build -f release.nix build.x86_64-linux
error: undefined variable 'docbook5_xsl' at /vcs/nix/release-common.nix:45:7
```
    ln-nl committed May 30, 2019
    Copy the full SHA
    3b1cc8b View commit details
    Browse the repository at this point in the history

Commits on May 31, 2019

  1. Merge pull request #2905 from ln-nl/patch-1 

    release-common: fix build with `config.allowAliases = false`
    @edolstra
    edolstra committed May 31, 2019
    Copy the full SHA
    2b62928 View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2019

  1. Add .github/FUNDING.yml

    @worldofpeace
    worldofpeace committed Jun 1, 2019
    Copy the full SHA
    2d34028 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #2910 from worldofpeace/funding 

    Add .github/FUNDING.yml
    @edolstra
    edolstra committed Jun 1, 2019
    Copy the full SHA
    5450af5 View commit details
    Browse the repository at this point in the history

  3. Fix segfault in builtin fetchurl with hashed mirrors + SRI hashes

    @edolstra
    edolstra committed Jun 1, 2019
    Copy the full SHA
    aec545c View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2019

  1. Merge remote-tracking branch 'origin/master' into flakes

    @edolstra
    edolstra committed Jun 3, 2019
    Copy the full SHA
    a2f86ac View commit details
    Browse the repository at this point in the history