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: 8f374ba6312f
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: c11a4a5f4d0d
Choose a head ref
  • 3 commits
  • 3 files changed
  • 3 contributors

Commits on May 31, 2018

  1. haskell infra: Allow overriding haskellSrc2nix

    @Ericson2314
    Ericson2314 committed May 31, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    holymonson Monson Shao
    GPG key ID: 163271C707982C65
    Verified
    Learn about vigilant mode
    Copy the full SHA
    58ce59d View commit details

  2. Merge pull request #41331 from obsidiansystems/haskellSrc2nix-overriding 

    haskell infra: Allow overriding `haskellSrc2nix`
    @Ericson2314
    Ericson2314 authored May 31, 2018
    Copy the full SHA
    df1d6ac View commit details

  3. dd-agent: fix compatibility issue with iostat (#41035) 

    Applies a patch to the dd-agent derivation that fixes a compatibility
issue with the current version of iostat, which no longer contains a
colon after its table headers.

This patch is applied in order for the fix to be backportable to
existing stable releases. A final "proper" fix will be an upgrade to a
newer version of dd-agent, but that requires several other changes.

This fixes #40103.

(cherry picked from commit aee19ca)
    @xeji
    Vincent Ambo authored and xeji committed May 31, 2018
    Copy the full SHA
    c11a4a5 View commit details
Loading