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

Commits on Oct 7, 2019

  1. Revert "ghc modules: use specific commit to fetch patches (#70546)" 

    This reverts commit dbb7230.
    @peti
    peti authored Oct 7, 2019
    Copy the full SHA
    3642089 View commit details

  2. Merge pull request #70582 from NixOS/revert-70546-ghc-patches 

    Revert "ghc modules: use specific commit to fetch patches"
    @peti
    peti authored Oct 7, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    dd37035 View commit details
Showing with 3 additions and 3 deletions.
  1. +3 −3 pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
6 changes: 3 additions & 3 deletions pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
View file
Original file line number Diff line number Diff line change
@@ -115,11 +115,11 @@ self: super: {
broken = false;
});
haskell-src-meta = appendPatch (dontCheck (doJailbreak super.haskell-src-meta)) (pkgs.fetchpatch {
url = "https://gitlab.haskell.org/ghc/head.hackage/raw/82d0fd9967af0699f0ccb5b38f2f0cbef6ed22de/patches/haskell-src-meta-0.8.3.patch";
url = "https://gitlab.haskell.org/ghc/head.hackage/raw/master/patches/haskell-src-meta-0.8.3.patch";
sha256 = "1asl932mibr5y057xx8v1a7n3qy87lcnclsfh8pbxq1m3iwjkxy8";
});
asn1-encoding = appendPatch (dontCheck (doJailbreak super.asn1-encoding)) (pkgs.fetchpatch {
url = "https://gitlab.haskell.org/ghc/head.hackage/raw/82d0fd9967af0699f0ccb5b38f2f0cbef6ed22de/patches/asn1-encoding-0.9.5.patch";
url = "https://gitlab.haskell.org/ghc/head.hackage/raw/master/patches/asn1-encoding-0.9.5.patch";
sha256 = "0a3159rnaw6shjzdm46799crd4pxh33s23qy51xa7z6nv5q8wsb5";
});
vault = dontHaddock super.vault;
@@ -139,7 +139,7 @@ self: super: {

# https://github.com/sol/hpack/issues/371
hpack = appendPatch super.hpack (pkgs.fetchpatch {
url = "https://gitlab.haskell.org/ghc/head.hackage/raw/82d0fd9967af0699f0ccb5b38f2f0cbef6ed22de/patches/hpack-0.32.0.patch";
url = "https://gitlab.haskell.org/ghc/head.hackage/raw/master/patches/hpack-0.32.0.patch";
sha256 = "11ccl9f7vwbf5cpzknlyvrwgkzpajk4vq9jk9yb5f9la9ggwb244";
});