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: 96f573300f85
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 990d12641e2f
Choose a head ref
  • 1 commit
  • 4 files changed
  • 1 contributor

Commits on May 4, 2021

  1. ihaskell: unbreak

    Use upstream release.nix as an inspiration for the correct overrides to
    fix RPATH issues and make tests run again.
    sternenseemann committed May 4, 2021
    Copy the full SHA
    990d126 View commit details
1 change: 0 additions & 1 deletion pkgs/development/haskell-modules/configuration-common.nix
Original file line number Diff line number Diff line change
@@ -291,7 +291,6 @@ self: super: {
htsn = dontCheck super.htsn;
htsn-import = dontCheck super.htsn-import;
http-link-header = dontCheck super.http-link-header; # non deterministic failure https://hydra.nixos.org/build/75041105
ihaskell = dontCheck super.ihaskell;
influxdb = dontCheck super.influxdb;
integer-roots = dontCheck super.integer-roots; # requires an old version of smallcheck, will be fixed in > 1.0
itanium-abi = dontCheck super.itanium-abi;
13 changes: 0 additions & 13 deletions pkgs/development/haskell-modules/configuration-hackage2nix.yaml
Original file line number Diff line number Diff line change
@@ -7153,22 +7153,9 @@ broken-packages:
- ige-mac-integration
- ignore
- igraph
- ihaskell
- ihaskell-aeson
- ihaskell-basic
- ihaskell-blaze
- ihaskell-charts
- ihaskell-diagrams
- ihaskell-display
- ihaskell-gnuplot
- ihaskell-graphviz
- ihaskell-hatex
- ihaskell-hvega
- ihaskell-inline-r
- ihaskell-juicypixels
- ihaskell-magic
- ihaskell-parsec
- ihaskell-plot
- ihaskell-rlangqq
- ihaskell-widgets
- ihttp
15 changes: 15 additions & 0 deletions pkgs/development/haskell-modules/configuration-nix.nix
Original file line number Diff line number Diff line change
@@ -826,4 +826,19 @@ self: super: builtins.intersectAttrs super {

# Tests access internet
prune-juice = dontCheck super.prune-juice;

# based on https://github.com/gibiansky/IHaskell/blob/aafeabef786154d81ab7d9d1882bbcd06fc8c6c4/release.nix
ihaskell = overrideCabal super.ihaskell (drv: {
configureFlags = (drv.configureFlags or []) ++ [
# ihaskell's cabal file forces building a shared executable,
# but without passing --enable-executable-dynamic, the RPATH
# contains /build/ and leads to a build failure with nix
"--enable-executable-dynamic"
];
preCheck = ''
export HOME=$TMPDIR/home
export PATH=$PWD/dist/build/ihaskell:$PATH
export GHC_PACKAGE_PATH=$PWD/dist/package.conf.inplace/:$GHC_PACKAGE_PATH
'';
});
}
26 changes: 0 additions & 26 deletions pkgs/development/haskell-modules/hackage-packages.nix

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.