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: ae9119167ebb
Choose a base ref
...
head repository: NixOS/nix
compare: 0c2088d4386a
Choose a head ref
  • 13 commits
  • 26 files changed
  • 4 contributors

Commits on Mar 11, 2020

  1. README, error msg: http -> https

    @roberth
    roberth committed Mar 11, 2020
    Copy the full SHA
    9080d5d View commit details
    Browse the repository at this point in the history

  2. local.mk: fix user-env.cc dep on buildenv.nix.gen.hh, resolve occasio… 

    …nal build failure
    @dtzWill @edolstra
    dtzWill authored and edolstra committed Mar 11, 2020
    Copy the full SHA
    15edd23 View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2020

  1. pathInfoCache: Respect disk cache TTLs #3398

    @roberth
    roberth committed Mar 12, 2020
    Copy the full SHA
    3f55f8a View commit details
    Browse the repository at this point in the history

  2. Merge pull request #3403 from hercules-ci/issue-3398-path-info-cache-… 

    …ttls

pathInfoCache: Respect disk cache TTLs #3398
    @edolstra
    edolstra committed Mar 12, 2020
    Copy the full SHA
    d048577 View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2020

  1. Fix ca-references feature check 

    Fixes #3406.
    @edolstra
    edolstra committed Mar 13, 2020
    Copy the full SHA
    b816515 View commit details
    Browse the repository at this point in the history

  2. mk/README.md: Remove 

    The make-rules repo is not maintained.
    @edolstra
    edolstra committed Mar 13, 2020
    Copy the full SHA
    cc5c818 View commit details
    Browse the repository at this point in the history

  3. style.css: Remove 

    This file is licensed under the GPL. Originally, Nix was also
GPL-licensed so that was fine. However, we later changed the license
to the LGPL but missed the fact that style.css has an incompatible
license.

Since the Nix manual at nixos.org uses its own styling, we can remove
this file.

Fixes #3392.
    @edolstra
    edolstra committed Mar 13, 2020
    Copy the full SHA
    9c7e90f View commit details
    Browse the repository at this point in the history

  4. Add CI with github actions

    @domenkozar
    domenkozar committed Mar 13, 2020
    Copy the full SHA
    30962d2 View commit details
    Browse the repository at this point in the history

  5. Remove build and binaryTarball since they're included in installerScript

    @edolstra
    edolstra committed Mar 13, 2020
    Copy the full SHA
    90b805e View commit details
    Browse the repository at this point in the history

  6. Remove callout graphics 

    Fixes #3396.
    @edolstra
    edolstra committed Mar 13, 2020
    Copy the full SHA
    858ad7a View commit details
    Browse the repository at this point in the history

  7. Fix macOS

    @edolstra
    edolstra committed Mar 13, 2020
    Copy the full SHA
    c0a3ff7 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #3409 from NixOS/github-actions 

    Add CI with github actions
    @edolstra
    edolstra committed Mar 13, 2020
    Copy the full SHA
    eab7d79 View commit details
    Browse the repository at this point in the history

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

    @edolstra
    edolstra committed Mar 13, 2020
    Copy the full SHA
    0c2088d View commit details
    Browse the repository at this point in the history