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: 141be5a74648
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5da10db0fd2a
Choose a head ref
  • 3 commits
  • 3 files changed
  • 1 contributor

Commits on Feb 7, 2020

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

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

  2. haskell-brick: update overrides to latest version

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

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

    @peti
    peti committed Feb 7, 2020
    Copy the full SHA
    5da10db View commit details
2 changes: 1 addition & 1 deletion pkgs/development/haskell-modules/configuration-common.nix
View file
Original file line number Diff line number Diff line change
@@ -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;
};
});

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;
3 changes: 3 additions & 0 deletions pkgs/development/haskell-modules/configuration-nix.nix
View file
Original file line number Diff line number Diff line change
@@ -530,6 +530,9 @@ self: super: builtins.intersectAttrs super {
'';
});

# Break infinite recursion cycle with criterion and network-uri.
js-flot = dontCheck super.js-flot;

# Break infinite recursion cycle between QuickCheck and splitmix.
splitmix = dontCheck super.splitmix;