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

Commits on Jan 29, 2021

  1. Stackage Nightly 2021-01-29

    @peti
    peti committed Jan 29, 2021
    Copy the full SHA
    f3b7bf4 View commit details

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

    @peti
    peti committed Jan 29, 2021
    Copy the full SHA
    22e3d5e View commit details

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

    This update was generated by hackage2nix v2.16.0-10-gabc66d1 from Hackage revision
commercialhaskell/all-cabal-hashes@f8773ab.
    @peti
    peti committed Jan 29, 2021

    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
    e5019a1 View commit details

  4. haskell-language-server: update overrides to the latest version of ls… 

    …p-test
    @peti
    peti committed Jan 29, 2021

    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
    5abc9ec View commit details

  5. Drop obsolete override for pandoc; the test suite has been fixed.

    @peti
    peti committed Jan 29, 2021
    Copy the full SHA
    51dd150 View commit details

  6. git-annex: update sha256 hash for the new 8.20210127 version

    @peti
    peti committed Jan 29, 2021
    Copy the full SHA
    5726a50 View commit details

  7. haskell-language-server: don't use the latest version of lsp-test for… 

    … building yet
    @peti
    peti committed Jan 29, 2021
    Copy the full SHA
    1afc215 View commit details

  8. cryptohash-sha256: the package is marked broken by hackage2nix, but i… 

    …t actually compiles fine
    @peti
    peti committed Jan 29, 2021
    Copy the full SHA
    02bf6b0 View commit details

  9. Merge pull request #111156 from NixOS/haskell-updates 

    Update Haskell package set to Stackage Nightly 2021-01-29 (plus other fixes)
    @peti
    peti authored Jan 29, 2021
    Copy the full SHA
    aba721a View commit details
20 changes: 7 additions & 13 deletions pkgs/development/haskell-modules/configuration-common.nix
View file
Original file line number Diff line number Diff line change
@@ -64,7 +64,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 = "0w71kbz127fcli24sxsvd48l5xamwamjwhr18x9alam5cldqkkz1";
sha256 = "1m9jfr5b0qwajwwmvcq02263bmnqgcqvpdr06sdwlfz3sxsjfp8r";
};
}).override {
dbus = if pkgs.stdenv.isLinux then self.dbus else null;
@@ -815,8 +815,9 @@ self: super: {
# https://github.com/haskell-hvr/cryptohash-sha512/pull/5#issuecomment-752796913
cryptohash-sha512 = dontCheck (doJailbreak super.cryptohash-sha512);

# Depends on tasty < 1.x, which we don't have.
cryptohash-sha256 = doJailbreak super.cryptohash-sha256;
# https://github.com/haskell-hvr/cryptohash-sha256/issues/11
# Jailbreak is necessary to break out of tasty < 1.x dependency.
cryptohash-sha256 = markUnbroken (doJailbreak super.cryptohash-sha256);

# Needs tasty-quickcheck ==0.8.*, which we don't have.
cryptohash-sha1 = doJailbreak super.cryptohash-sha1;
@@ -1377,11 +1378,6 @@ self: super: {
# jailbreaking pandoc-citeproc because it has not bumped upper bound on pandoc
pandoc-citeproc = doJailbreak super.pandoc-citeproc;

# 2021-01-17: Tests are broken because of a version mismatch.
# See here: https://github.com/jgm/pandoc/issues/7035
# This problem is fixed on master. Remove override when this assert fails.
pandoc = assert super.pandoc.version == "2.11.3.2"; dontCheck super.pandoc;

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

@@ -1417,7 +1413,7 @@ self: super: {
# https://github.com/haskell/haskell-language-server/issues/610
# https://github.com/haskell/haskell-language-server/issues/611
haskell-language-server = dontCheck (super.haskell-language-server.override {
lsp-test = dontCheck self.lsp-test_0_11_0_7;
lsp-test = dontCheck self.lsp-test;
fourmolu = self.fourmolu_0_3_0_0;
});
# 2021-01-20
@@ -1426,12 +1422,10 @@ self: super: {
apply-refact = super.apply-refact_0_8_2_1;

fourmolu = dontCheck super.fourmolu;

# 1. test requires internet
# 2. dependency shake-bench hasn't been published yet so we also need unmarkBroken and doDistribute
ghcide = doDistribute (unmarkBroken (dontCheck
(super.ghcide_0_7_0_0.override {
lsp-test = dontCheck self.lsp-test_0_11_0_7;
})));
ghcide = doDistribute (unmarkBroken (dontCheck (super.ghcide_0_7_0_0.override { lsp-test = dontCheck self.lsp-test; })));
refinery = doDistribute super.refinery_0_3_0_0;
data-tree-print = doJailbreak super.data-tree-print;

Loading