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: 7b449bcf039c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 90effb5c70cd
Choose a head ref
3 contributors

Commits on Sep 18, 2019

  1. LTS Haskell 14.6

    @peti
    peti committed Sep 18, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    dtzWill Will Dietz
    GPG key ID: EBB0EA4124809D02
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e04435a View commit details

  2. haskellPackages.scheduler: mark unbroken

    @jluttine @peti
    jluttine authored and peti committed Sep 18, 2019
    Copy the full SHA
    780cdeb View commit details

  3. haskellPackages.massiv: mark unbroken

    @jluttine @peti
    jluttine authored and peti committed Sep 18, 2019
    Copy the full SHA
    f56d16a View commit details

  4. Revert "haskell.packages.ghc881.cabal-doctest: use super.cabal-doctes… 

    …t_1_0_7"

This reverts commit 5e91bfa.
    @peti
    Luc Tielen authored and peti committed Sep 18, 2019
    Copy the full SHA
    168b39e View commit details

  5. haskell.packages.ghc881.yaml: fix missing attribute issue

    @peti
    Luc Tielen authored and peti committed Sep 18, 2019
    Copy the full SHA
    8a0c213 View commit details

  6. haskell.packages.ghc881.alex: apply temporary patch for ghc881

    @peti
    Luc Tielen authored and peti committed Sep 18, 2019
    Copy the full SHA
    9b23945 View commit details

  7. haskell.packages.ghc881.haskell-src-meta: fix build

    @peti
    Luc Tielen authored and peti committed Sep 18, 2019
    Copy the full SHA
    3ad5272 View commit details

  8. haskell.packages.ghc881.happy: fix build

    @peti
    Luc Tielen authored and peti committed Sep 18, 2019
    Copy the full SHA
    0b183e5 View commit details

  9. haskell.packages.ghc881.haskell-src-exts: fix build

    @peti
    Luc Tielen authored and peti committed Sep 18, 2019
    Copy the full SHA
    1135dd3 View commit details

  10. haskell.packages.ghc881.cabal-doctest: fix build

    @peti
    Luc Tielen authored and peti committed Sep 18, 2019
    Copy the full SHA
    230565a View commit details

  11. haskell.packages.ghc881.vector-th-unbox: fix build

    @peti
    Luc Tielen authored and peti committed Sep 18, 2019
    Copy the full SHA
    6a6b39b View commit details

  12. haskell.packages.ghc881.socks: fix issue with base dependency version

    @peti
    Luc Tielen authored and peti committed Sep 18, 2019
    Copy the full SHA
    de404e0 View commit details

  13. haskell.packages.ghc881.attoparsec: fix build issue

    @peti
    Luc Tielen authored and peti committed Sep 18, 2019
    Copy the full SHA
    a2b742f View commit details

  14. haskell.packages.ghc881.vault: avoid build issue with docs

    @peti
    Luc Tielen authored and peti committed Sep 18, 2019
    Copy the full SHA
    d0a1d73 View commit details

  15. haskell.packages.ghc881.hedgehog: fix build issue

    @peti
    Luc Tielen authored and peti committed Sep 18, 2019
    Copy the full SHA
    c120b69 View commit details

  16. haskell.packages.ghc881.tasty-hedgehog: fix dependency versioning issue

    @peti
    Luc Tielen authored and peti committed Sep 18, 2019
    Copy the full SHA
    fce1182 View commit details

  17. Update dhall: 1.25.0 -> 1.26.0

    @peti
    Luc Tielen authored and peti committed Sep 18, 2019
    Copy the full SHA
    b554479 View commit details

  18. Only patch alex for ghc881

    @peti
    Luc Tielen authored and peti committed Sep 18, 2019
    Copy the full SHA
    4ea67e4 View commit details

  19. Remove unneeded code

    @peti
    Luc Tielen authored and peti committed Sep 18, 2019
    Copy the full SHA
    fc06be9 View commit details

  20. ghc881 - alex: point directly to working commit

    @peti
    Luc Tielen authored and peti committed Sep 18, 2019
    Copy the full SHA
    6facf5b View commit details

  21. ghc881 - alex: try only applying relevant patch

    @peti
    Luc Tielen authored and peti committed Sep 18, 2019
    Copy the full SHA
    5ea256f View commit details

  22. ghc881 - alex: simplify override

    @peti
    Luc Tielen authored and peti committed Sep 18, 2019
    Copy the full SHA
    de05178 View commit details

  23. hackage2nix: disable builds that break evaluation on Hydra

    @peti
    peti committed Sep 18, 2019
    Copy the full SHA
    e405fe4 View commit details

Commits on Sep 19, 2019

  1. hackage-packages.nix: automatic Haskell package set update 

    This update was generated by hackage2nix v2.14.4-9-g449ad2b from Hackage revision
commercialhaskell/all-cabal-hashes@ed250ea.
    @peti
    peti committed Sep 19, 2019
    Copy the full SHA
    0d67be0 View commit details

  2. git-annex: update sha256 hash for new release 7.20190912

    @peti
    peti committed Sep 19, 2019
    Copy the full SHA
    742348d View commit details

  3. Merge pull request #69087 from NixOS/haskell-updates 

    Merge haskell-updates into master.
    @peti
    peti authored Sep 19, 2019
    Copy the full SHA
    90effb5 View commit details
6 changes: 3 additions & 3 deletions pkgs/development/haskell-modules/configuration-common.nix
View file
Original file line number Diff line number Diff line change
@@ -69,7 +69,7 @@ self: super: {
name = "git-annex-${super.git-annex.version}-src";
url = "git://git-annex.branchable.com/";
rev = "refs/tags/" + super.git-annex.version;
sha256 = "1795sad0jr2da2pn28nbqsvpld6zw8gf9yscywixkbabf7ls66fn";
sha256 = "1ackqjkwkfm3kazlyy4nwdjf6wwjlajql1hrznaki5138nw4gxs4";
};
}).override {
dbus = if pkgs.stdenv.isLinux then self.dbus else null;
@@ -1197,8 +1197,8 @@ self: super: {
temporary-resourcet = doJailbreak super.temporary-resourcet;

# Requires dhall >= 1.23.0
ats-pkg = super.ats-pkg.override { dhall = self.dhall_1_25_0; };
dhall-to-cabal = super.dhall-to-cabal.override { dhall = self.dhall_1_25_0; };
ats-pkg = super.ats-pkg.override { dhall = self.dhall_1_26_0; };
dhall-to-cabal = super.dhall-to-cabal.override { dhall = self.dhall_1_26_0; };

# Test suite doesn't work with current QuickCheck
# https://github.com/pruvisto/heap/issues/11
36 changes: 15 additions & 21 deletions pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
View file
Original file line number Diff line number Diff line change
@@ -70,11 +70,10 @@ self: super: {
sha256 = "1p1pinca33vd10iy7hl20c1fc99vharcgcai6z3ngqbq50k2pd3q";
};
};
vector-th-unbox = appendPatch super.vector-th-unbox (pkgs.fetchpatch {
vector-th-unbox = appendPatch (doJailbreak super.vector-th-unbox) (pkgs.fetchpatch {
url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/vector-th-unbox-0.2.1.6.patch";
sha256 = "0169yf9ms1g5mmkc5l6hpffzm34zdrqdng4df02nbdmfgba45h19";
});
cabal-doctest = super.cabal-doctest_1_0_7;
regex-base = overrideCabal (appendPatch super.regex-base (pkgs.fetchpatch {
url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/regex-base-0.93.2.patch";
sha256 = "01d1plrdx6hcspwn2h6y9pyi5366qk926vb5cl5qcl6x4m23l6y1";
@@ -85,10 +84,6 @@ self: super: {
url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/regex-posix-0.95.2.patch";
sha256 = "006yli58jpqp786zm1xlncjsilc38iv3a09r4pv94l587sdzasd2";
});
haskell-src-exts = appendPatch super.haskell-src-exts (pkgs.fetchpatch {
url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/haskell-src-exts-1.21.0.patch";
sha256 = "0alb28hcsp774c9s73dgrajcb44vgv1xqfg2n5a9y2bpyngqscs3";
});
optparse-applicative = appendPatch (doJailbreak super.optparse-applicative) (pkgs.fetchpatch {
url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/optparse-applicative-0.14.3.0.patch";
sha256 = "068sjj98jqiq3h8h03mg4w2pa11q8lxkx2i4lmxivq77xyhlwq3y";
@@ -97,23 +92,15 @@ self: super: {
url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/hackage-security-0.5.3.0.patch";
sha256 = "0l8x0pbsn18fj5ak5q0g5rva4xw1s9yc4d86a1pfyaz467b9i5a4";
});
happy = appendPatch super.happy (pkgs.fetchpatch {
url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/happy-1.19.11.patch";
sha256 = "16m659kxbq0s87ak2y1pqggfy67yfvcwc0zi3hcphf3v8735xhkk";
});
hedgehog = appendPatch super.hedgehog (pkgs.fetchpatch {
url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/hedgehog-0.6.1.patch";
sha256 = "04xwznd3lfgracfz68ls6vfm19rhq8fb74r6ii0grpv6cx4rr21i";
hedgehog = appendPatch (doJailbreak super.hedgehog) (pkgs.fetchpatch {
url = "https://gitlab.haskell.org/ghc/head.hackage/raw/master/patches/hedgehog-1.0.patch";
sha256 = "16gadh1hb74jqvzc9c893sffb1y2vjglblyrqjwp7xfhccq7g8yw";
});
easytest = self.easytest_0_3;
regex-tdfa = appendPatch super.regex-tdfa (pkgs.fetchpatch {
url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/regex-tdfa-1.2.3.1.patch";
sha256 = "1lhas4s2ms666prb475gaw2bqw1v4y8cxi66sy20j727sx7ppjs7";
});
attoparsec = appendPatch (doJailbreak super.attoparsec) (pkgs.fetchpatch {
url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/attoparsec-0.13.2.2.patch";
sha256 = "13i1p5g0xzxnv966nlyb77mfmxvg9jzbym1d36h1ajn045yf4igl";
});
cassava = appendPatch super.cassava (pkgs.fetchpatch {
url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/cassava-0.5.1.0.patch";
sha256 = "11scwwjp94si90vb8v5yr291g9qwv5l223z8y0g0lc63932bp63g";
@@ -122,7 +109,7 @@ self: super: {
url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/shakespeare-2.0.20.patch";
sha256 = "1dgx41ylahj4wk8r422aik0d7qdpawdga4gqz905nvlnhqjla58y";
});
socks = appendPatch super.socks (pkgs.fetchpatch {
socks = appendPatch (doJailbreak super.socks) (pkgs.fetchpatch {
url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/socks-0.6.0.patch";
sha256 = "1dsqmx0sw62x4glh43c0sbizd2y00v5xybiqadn96v6pmfrap5cp";
});
@@ -159,14 +146,21 @@ self: super: {
'';
});
system-fileio = doJailbreak super.system-fileio;
yaml = self.yaml_0_11_1_2;
tasty-hedgehog = doJailbreak super.tasty-hedgehog;
haskell-src-meta = appendPatch (dontCheck (doJailbreak super.haskell-src-meta)) (pkgs.fetchpatch {
url = "https://gitlab.haskell.org/ghc/head.hackage/raw/master/patches/haskell-src-meta-0.8.2.patch";
sha256 = "146im1amywyl29kcldvgrxpwj22lrpzxysl7vc8rmn3hrq130dyc";
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/master/patches/asn1-encoding-0.9.5.patch";
sha256 = "0a3159rnaw6shjzdm46799crd4pxh33s23qy51xa7z6nv5q8wsb5";
});
tls = self.tls_1_5_1;
vault = dontHaddock super.vault;

# TODO dont fetch patch if https://github.com/simonmar/alex/issues/140 is resolved
alex = appendPatch super.alex (pkgs.fetchpatch {
url = "https://github.com/simonmar/alex/commit/deaae6eddef5186bfd0e42e2c3ced39e26afa4d6.patch";
sha256 = "1v40gmnw4lqyk271wngdwz8whpfdhmza58srbkka8icwwwrck3l5";
});
}
Loading