Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a611ddf96e6d
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 36864d2bf74b
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Apr 5, 2018

  1. nix: fix conditional so brotli is used w/2.0 builds, needed for logs! 

    cc NixOS/nix#1951

(cherry picked from commit 7dafa09)
    @dtzWill @edolstra
    dtzWill authored and edolstra committed Apr 5, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    edolstra Eelco Dolstra
    GPG key ID: 8170B4726D7198DE
    Verified
    Learn about vigilant mode
    Copy the full SHA
    36864d2 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 pkgs/tools/package-management/nix/default.nix
2 changes: 1 addition & 1 deletion pkgs/tools/package-management/nix/default.nix
View file
Original file line number Diff line number Diff line change
@@ -42,7 +42,7 @@ let

buildInputs = [ curl openssl sqlite xz ]
++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium
++ lib.optionals fromGit [ brotli ] # Since 1.12
++ lib.optionals is20 [ brotli ] # Since 1.12
++ lib.optional stdenv.isLinux libseccomp
++ lib.optional ((stdenv.isLinux || stdenv.isDarwin) && is20)
(aws-sdk-cpp.override {