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: b49f799a40f4
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6667f47c5bdd
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Jul 27, 2020

  1. haskellPackages.haskeline_0_8_0_0: add dontCheck 

    Testsuite is trying to access executable which is part of the package
being built.
    @sorki
    sorki committed Jul 27, 2020
    Copy the full SHA
    02fb63d View commit details

  2. haskellPackages.zre: use repline_0_4_0_0

    @sorki
    sorki committed Jul 27, 2020
    Copy the full SHA
    6bef529 View commit details

  3. Merge pull request #93957 from sorki/hask/haskeline-repline-zre 

    Fix haskellPackages.zre, dontCheck for haskellPackages.haskeline_0_8_0_0
    @cdepillabout
    cdepillabout authored Jul 27, 2020
    Copy the full SHA
    6667f47 View commit details
Showing with 10 additions and 0 deletions.
  1. +10 −0 pkgs/development/haskell-modules/configuration-common.nix
10 changes: 10 additions & 0 deletions pkgs/development/haskell-modules/configuration-common.nix
View file
Original file line number Diff line number Diff line change
@@ -1451,4 +1451,14 @@ self: super: {
};
};

# Testsuite trying to run `which haskeline-examples-Test`
haskeline_0_8_0_0 = dontCheck super.haskeline_0_8_0_0;

# Requires repline 0.4 which is the default only for ghc8101, override for the rest
zre = super.zre.override {
repline = self.repline_0_4_0_0.override {
haskeline = self.haskeline_0_8_0_0;
};
};

} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super