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

Commits on Nov 9, 2020

  1. cachix: bump to 0.5.1

    @domenkozar
    domenkozar committed Nov 9, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    domenkozar Domen Kožar
    GPG key ID: C2FFBCAFD2C24246
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c1e5f87 View commit details
Showing with 9 additions and 1 deletion.
  1. +9 −1 pkgs/development/haskell-modules/configuration-nix.nix
10 changes: 9 additions & 1 deletion pkgs/development/haskell-modules/configuration-nix.nix
View file
Original file line number Diff line number Diff line change
@@ -95,7 +95,15 @@ self: super: builtins.intersectAttrs super {
sfml-audio = appendConfigureFlag super.sfml-audio "--extra-include-dirs=${pkgs.openal}/include/AL";

# profiling is disabled to allow C++/C mess to work, which is fixed in GHC 8.8
cachix = disableLibraryProfiling super.cachix;
cachix = overrideSrc (disableLibraryProfiling super.cachix) {
src = (pkgs.fetchFromGitHub {
owner = "cachix";
repo = "cachix";
rev = "1471050f5906ecb7cd0d72115503d07d2e3beb17";
sha256 = "1lkrmhv5x9dpy53w33kxnhv4x4qm711ha8hsgccrjmxaqcsdm59g";
}) + "/cachix";
version = "0.5.1";
};
hercules-ci-agent = disableLibraryProfiling super.hercules-ci-agent;

# avoid compiling twice by providing executable as a separate output (with small closure size)