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: 82e2e93f4b95
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a227fcf96d5f
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jan 1, 2021

  1. haskell: drop more obsolete overrides

    @peti
    peti committed Jan 1, 2021
    Copy the full SHA
    a227fcf View commit details
Showing with 2 additions and 8 deletions.
  1. +2 −8 pkgs/development/haskell-modules/configuration-common.nix
10 changes: 2 additions & 8 deletions pkgs/development/haskell-modules/configuration-common.nix
View file
Original file line number Diff line number Diff line change
@@ -216,11 +216,7 @@ self: super: {
# building of the executable has been disabled for ghc < 8.10 in hnix.
# Generating the completions should be activated again, once we default to
# ghc 8.10.
hnix = dontCheck (super.hnix.override {
# 2020-09-18: Those packages are all needed by hnix at versions newer than on stackage
prettyprinter = self.prettyprinter_1_7_0; # at least 1.7

});
hnix = dontCheck super.hnix;

# Fails for non-obvious reasons while attempting to use doctest.
search = dontCheck super.search;
@@ -396,7 +392,6 @@ self: super: {
xsd = dontCheck super.xsd;
zip-archive = dontCheck super.zip-archive; # https://github.com/jgm/zip-archive/issues/57

random_1_2_0 = super.random_1_2_0.override ({ splitmix = self.splitmix_0_1_0_3; });
# These test suites run for ages, even on a fast machine. This is nuts.
Random123 = dontCheck super.Random123;
systemd = dontCheck super.systemd;
@@ -1532,8 +1527,7 @@ self: super: {
yesod-core = dontCheck super.yesod-core;

# Add ApplicationServices on darwin
# use 0.4.5 instead of 0.4.4 to fix build with glibc >= 2.32
apecs-physics = addPkgconfigDepends super.apecs-physics_0_4_5
apecs-physics = addPkgconfigDepends super.apecs-physics
(pkgs.lib.optional pkgs.stdenv.isDarwin pkgs.darwin.apple_sdk.frameworks.ApplicationServices);

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