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

Commits on Apr 25, 2020

  1. haskell-dhall: disable the test suite 

    Dhall 1.31.x still attempts to access the network during its
test suite run, i.e. it attempts to connect to github.com.
    @peti
    peti committed Apr 25, 2020

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

  2. haskell-system-fileio: jailbreak out of dependency on chell 0.4.x

    @peti
    peti committed Apr 25, 2020
    Copy the full SHA
    f2aa6b4 View commit details

  3. configuration-ghc-8.10.x.nix: cosmetic

    @peti
    peti committed Apr 25, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    mrgrain Momo Kornher
    SSH Key Fingerprint: ofPj7x0gR7f06qjrpoigd8+i5DUfuCIY6OF1rH90+JI
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b24d2a9 View commit details

  4. haskell-dhall: use the latest version when building with ghc-8.10.x

    @peti
    peti committed Apr 25, 2020
    Copy the full SHA
    125ada1 View commit details

  5. haskell-pandoc: jailbreak out of haddock-library 1.8.x constraint

    @peti
    peti committed Apr 25, 2020
    Copy the full SHA
    6a6d017 View commit details
Showing with 6 additions and 4 deletions.
  1. +4 −1 pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
  2. +2 −3 pkgs/development/haskell-modules/configuration-nix.nix
5 changes: 4 additions & 1 deletion pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
View file
Original file line number Diff line number Diff line change
@@ -49,23 +49,26 @@ self: super: {
async = doJailbreak super.async;
ChasingBottoms = doJailbreak super.ChasingBottoms;
hashable = doJailbreak super.hashable;
pandoc = doJailbreak super.pandoc;
parallel = doJailbreak super.parallel;
regex-base = doJailbreak super.regex-base;
regex-compat = doJailbreak super.regex-compat;
regex-pcre-builtin = doJailbreak super.regex-pcre-builtin;
regex-posix = doJailbreak super.regex-posix;
regex-tdfa = doJailbreak super.regex-tdfa;
split = doJailbreak super.split;
system-fileio = doJailbreak super.system-fileio;
tar = doJailbreak super.tar;
tasty-expected-failure = doJailbreak super.tasty-expected-failure;
unliftio-core = doJailbreak super.unliftio-core;
vector = doJailbreak super.vector;
zlib = doJailbreak super.zlib;

# Use the latest version to fix the build.
dhall = self.dhall_1_31_1;
ghc-lib-parser-ex = self.ghc-lib-parser-ex_8_10_0_4;
optics-core = self.optics-core_0_3;
repline = self.repline_0_3_0_0;
ghc-lib-parser-ex = self.ghc-lib-parser-ex_8_10_0_4;
th-desugar = self.th-desugar_1_11;

# `ghc-lib-parser-ex` (see conditionals in its `.cabal` file) does not need
5 changes: 2 additions & 3 deletions pkgs/development/haskell-modules/configuration-nix.nix
View file
Original file line number Diff line number Diff line change
@@ -720,10 +720,9 @@ self: super: builtins.intersectAttrs super {
# break infinite recursion with base-orphans
primitive = dontCheck super.primitive;

# dhall-1.29.0 tests access the network. This override can be removed when
# dhall_1_29_0 is no longer used, since more recent versions of dhall don't
# access the network in checks.
# dhall's tests access the network.
dhall_1_29_0 = dontCheck super.dhall_1_29_0;
dhall_1_31_1 = dontCheck super.dhall_1_31_1;

cut-the-crap =
let path = pkgs.stdenv.lib.makeBinPath [ pkgs.ffmpeg ];