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: 055ffb0b23c9
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e23e9e6d5f30
Choose a head ref
  • 13 commits
  • 6 files changed
  • 2 contributors

Commits on Feb 7, 2020

  1. LTS Haskell 14.23

    @peti
    peti committed Feb 7, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    alyssais Alyssa Ross
    GPG key ID: F9DBED4859B271C0
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a87b506 View commit details

  2. haskellPackages.perhaps: jailbreak 

    It has an overly tight dependency on doctest.

I've removed it from the list of broken builds in the yaml and I've made
a PR upstream too.
    @peti
    Nathan van Doorn authored and peti committed Feb 7, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    alyssais Alyssa Ross
    GPG key ID: F9DBED4859B271C0
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    eaca900 View commit details

  3. hackage2nix: update list of broken packages

    @peti
    peti committed Feb 7, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    alyssais Alyssa Ross
    GPG key ID: F9DBED4859B271C0
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    86f1da3 View commit details

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

    This update was generated by hackage2nix v2.15.0-19-g1b9b3ef from Hackage revision
commercialhaskell/all-cabal-hashes@f57c80f.
    @peti
    peti committed Feb 7, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    alyssais Alyssa Ross
    GPG key ID: F9DBED4859B271C0
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    0358bc0 View commit details

  5. haskell-js-flot: disable test suite to break infinite evaluation cycle

    @peti
    peti committed Feb 7, 2020
    Copy the full SHA
    ddb6d70 View commit details

  6. haskell-brick: update overrides to latest version

    @peti
    peti committed Feb 7, 2020
    Copy the full SHA
    44d2587 View commit details

  7. haskell-lens: use latest version when building with ghc-8.8.x

    @peti
    peti committed Feb 7, 2020
    Copy the full SHA
    92f21f7 View commit details

  8. haskellPackages.perhaps: add link to pull request fixing dependencies

    @peti
    Nathan van Doorn authored and peti committed Feb 7, 2020
    Copy the full SHA
    c13abc9 View commit details

  9. ghc-lib-parser: update overrides for the latest version

    @peti
    peti committed Feb 7, 2020
    Copy the full SHA
    38784c7 View commit details

  10. git-annex: update sha256 hash for new version 7.20200204

    @peti
    peti committed Feb 7, 2020
    Copy the full SHA
    04e3f52 View commit details

  11. haskell-cabal2spec: override Cabal to version 3.0.x

    @peti
    peti committed Feb 7, 2020
    Copy the full SHA
    e7dce63 View commit details

  12. haskell-policeman: don't build this package with ghc-8.6.x

    @peti
    peti committed Feb 7, 2020
    Copy the full SHA
    abd5926 View commit details

  13. Merge pull request #79317 from NixOS/haskell-updates 

    Update Haskell package set to LTS 14.23 (plus other fixes)
    @peti
    peti authored Feb 7, 2020
    Copy the full SHA
    e23e9e6 View commit details
12 changes: 8 additions & 4 deletions pkgs/development/haskell-modules/configuration-common.nix
View file
Original file line number Diff line number Diff line change
@@ -74,7 +74,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 = "0s8sv6h90l2a9xdabj0nirhpr6d2k8s5cddjdkm50x395i014w31";
sha256 = "1shb1jgm78bx88rbsr1nmimjzzfqw96qdr38mcrr1c2qz5ky820v";
};
}).override {
dbus = if pkgs.stdenv.isLinux then self.dbus else null;
@@ -1236,7 +1236,7 @@ self: super: {
constraints-deriving = dontCheck super.constraints-deriving;

# Use a matching version of ghc-lib-parser.
ghc-lib-parser-ex = super.ghc-lib-parser-ex.override { ghc-lib-parser = self.ghc-lib-parser_8_8_2; };
ghc-lib-parser-ex = super.ghc-lib-parser-ex.override { ghc-lib-parser = self.ghc-lib-parser_8_8_2_20200205; };

# https://github.com/sol/hpack/issues/366
hpack = self.hpack_0_33_0;
@@ -1350,7 +1350,7 @@ self: super: {
# There are more complicated ways of doing this but I was able to make it fairly simple -- kiwi
matterhorn = doJailbreak (super.matterhorn.override {
brick-skylighting = self.brick-skylighting.override {
brick = self.brick_0_50_1;
brick = self.brick_0_51;
};
});

@@ -1380,7 +1380,7 @@ self: super: {

# Needs ghc-lib-parser 8.8.1 (does not build with 8.8.0)
ormolu = doJailbreak (super.ormolu.override {
ghc-lib-parser = self.ghc-lib-parser_8_8_2;
ghc-lib-parser = self.ghc-lib-parser_8_8_2_20200205;
});

# krank-0.1.0 does not accept PyF-0.9.0.0.
@@ -1389,4 +1389,8 @@ self: super: {
# prettyprinter-1.6.0 fails its doctest suite.
prettyprinter_1_6_0 = dontCheck super.prettyprinter_1_6_0;

# the test suite has an overly tight restriction on doctest
# See https://github.com/ekmett/perhaps/pull/5
perhaps = doJailbreak super.perhaps;

} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
6 changes: 6 additions & 0 deletions pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
View file
Original file line number Diff line number Diff line change
@@ -81,4 +81,10 @@ self: super: {
hackage-db = self.hackage-db_2_1_0;
});

# cabal2spec needs a recent version of Cabal
cabal2spec = super.cabal2spec.overrideScope (self: super: { Cabal = self.Cabal_3_0_0_0; });

# Builds only with ghc-8.8.x and beyond.
policeman = markBroken super.policeman;

}
4 changes: 2 additions & 2 deletions pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
View file
Original file line number Diff line number Diff line change
@@ -70,7 +70,7 @@ self: super: {
xmobar = doJailbreak super.xmobar;

# use latest version to fix the build
brick = self.brick_0_50_1;
brick = self.brick_0_51;
dbus = self.dbus_1_2_11;
doctemplates = self.doctemplates_0_8;
exact-pi = doJailbreak super.exact-pi;
@@ -82,7 +82,7 @@ self: super: {
HaTeX = self.HaTeX_3_22_0_0;
HsYAML = self.HsYAML_0_2_1_0;
json-autotype = doJailbreak super.json-autotype;
lens = self.lens_4_18_1;
lens = self.lens_4_19;
memory = self.memory_0_15_0;
microlens = self.microlens_0_4_11_2;
microlens-ghc = self.microlens-ghc_0_4_12;
Loading