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: be2e4fb48786
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 143650958ca6
Choose a head ref
  • 8 commits
  • 8 files changed
  • 3 contributors

Commits on Oct 9, 2020

  1. LTS Haskell 16.17

    @peti
    peti committed Oct 9, 2020
    Copy the full SHA
    48659e9 View commit details

  2. hackage2nix: update list of broken builds to fix evaluation

    @peti
    peti committed Oct 9, 2020
    Copy the full SHA
    3f3b006 View commit details

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

    This update was generated by hackage2nix v2.15.5-17-g25ee725 from Hackage revision
commercialhaskell/all-cabal-hashes@6abe394.
    @peti
    peti committed Oct 9, 2020
    Copy the full SHA
    d948d97 View commit details

  4. haskell-language-server: 0.4.0 -> 0.5.0 (#99508)

    @maralorn @peti
    maralorn authored and peti committed Oct 9, 2020
    Copy the full SHA
    9bf8b98 View commit details

  5. haskellPackages.domain-auth: disable test suite

    @peti
    Malte Voos authored and peti committed Oct 9, 2020
    Copy the full SHA
    7526fbe View commit details

  6. git-annex: update to new version 8.20201007

    @peti
    peti committed Oct 9, 2020
    Copy the full SHA
    ec2d05b View commit details

  7. haskell-ghcide: update overrides for the new version of lsp-test

    @peti
    peti committed Oct 9, 2020
    Copy the full SHA
    913923c View commit details

  8. couchdb: revert changes from 0da82de 

    These changes break evaluation and they frankly don't look correct here.
    @peti
    peti committed Oct 9, 2020
    Copy the full SHA
    1436509 View commit details
12 changes: 7 additions & 5 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 = "19ipaalp9g25zhg44rialwhp2fv5n8q5fzqw72rfcjcca5iy6r72";
sha256 = "05yvl09ksyvzykibs95996rni9x6w03yfqyv2fadd73z1m6lq5bf";
};
}).override {
dbus = if pkgs.stdenv.isLinux then self.dbus else null;
@@ -1211,7 +1211,7 @@ self: super: {
# we need an override because ghcide is tracking haskell-lsp closely.
ghcide = dontCheck (super.ghcide.overrideScope (self: super: {
hie-bios = dontCheck super.hie-bios_0_7_1;
lsp-test = dontCheck self.lsp-test_0_11_0_6;
lsp-test = dontCheck self.lsp-test_0_11_0_7;
}));

# hasn‘t bumped upper bounds
@@ -1471,6 +1471,9 @@ self: super: {
url = "https://github.com/jaspervdj/stylish-haskell/commit/9550aa1cd177aa6fe271d075177109d66a79e67f.patch";
sha256 = "1ffnbd2s4fx0ylnnlcyyag119yxb32p5r20b38l39lsa0jwv229f";
});

# The test suite attempts to read `/etc/resolv.conf`, which doesn't work in the sandbox.
domain-auth = dontCheck super.domain-auth;
# INSERT NEW OVERRIDES ABOVE THIS LINE

} // (let
@@ -1481,7 +1484,7 @@ self: super: {
ghcide = dontCheck hls-ghcide;
# we are faster than stack here
hie-bios = dontCheck super.hie-bios_0_7_1;
lsp-test = dontCheck super.lsp-test_0_11_0_6;
lsp-test = dontCheck super.lsp-test_0_11_0_7;
# fourmolu can‘t compile with an older aeson
aeson = dontCheck super.aeson_1_5_2_0;
# brittany has an aeson upper bound of 1.5
@@ -1490,8 +1493,7 @@ self: super: {
ghc-exactprint = dontCheck super.ghc-exactprint_0_6_3_2;
};
in {
# jailbreaking for hie-bios 0.7.0 (upstream PR: https://github.com/haskell/haskell-language-server/pull/357)
haskell-language-server = dontCheck (doJailbreak (super.haskell-language-server.overrideScope hlsScopeOverride));
haskell-language-server = dontCheck (super.haskell-language-server.overrideScope hlsScopeOverride);
hls-ghcide = dontCheck (super.hls-ghcide.overrideScope hlsScopeOverride);
hls-brittany = dontCheck (super.hls-brittany.overrideScope hlsScopeOverride);
fourmolu = dontCheck (super.fourmolu.overrideScope hlsScopeOverride);
Loading