Skip to content

Commit 905f598

Browse files
committed
Try without ghcjs overrides for pre-existing package (might not be needed now)
1 parent b95d648 commit 905f598

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

overlays/haskell.nix

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -782,10 +782,7 @@ final: prev: {
782782
"ghc-bignum"]
783783
++ final.lib.optionals (builtins.compareVersions config.compiler.version "9.9" >= 0) [
784784
"ghc-internal"]
785-
++ final.lib.optionals (pkgs.stdenv.hostPlatform.isGhcjs) ([
786-
# ghci and its dependencies
787-
"ghci" "binary" "bytestring" "containers" "template-haskell" "array" "deepseq" "filepath" "ghc-boot" "ghc-boot-th" "ghc-heap" "transformers" "unix" "directory" "time" "ghc-platform" "os-string"
788-
] ++ final.lib.optionals (builtins.compareVersions config.compiler.version "8.11" < 0) [
785+
++ final.lib.optionals (builtins.compareVersions config.compiler.version "8.11" < 0) [
789786
"ghcjs-prim" "ghcjs-th"]);
790787
})
791788
({config, options, ...}: {

test/with-packages/default.nix

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,10 @@ in recurseIntoAttrs {
108108

109109
passthru = {
110110
# Used for debugging with nix repl
111-
inherit packages project;
111+
packages = packages false;
112+
project = project false;
113+
packages-exact = packages true;
114+
project-exact = project true;
112115
};
113116
};
114117
}

0 commit comments

Comments
 (0)