Skip to content
Commit 54ce1a18 authored by Peter Simons's avatar Peter Simons
Browse files

Merge remote-tracking branch 'origin/master' into staging. 

Conflicts:
      pkgs/development/compilers/ghc/head.nix
      pkgs/top-level/haskell-ng.nix
parents db4cb021 bc4ffd6a
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment