Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion compiler/ghc/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -546,7 +546,7 @@ stdenv.mkDerivation (rec {

checkTarget = "test";

hardeningDisable = [ "format" ]
hardeningDisable = [ "format" "stackprotector" ]
++ lib.optional stdenv.targetPlatform.isAarch32 "pic"
++ lib.optional stdenv.targetPlatform.isMusl "pie"
++ lib.optional enableDWARF "fortify";
Expand Down
2 changes: 1 addition & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@

ifdLevel = 3;
runningHydraEvalTest = false;
defaultCompiler = "ghc928";
defaultCompiler = "ghc966";
config = import ./config.nix;

inherit (nixpkgs) lib;
Expand Down
2 changes: 1 addition & 1 deletion hix/init/nix/hix.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{pkgs, ...}: {
# name = "project-name";
compiler-nix-name = "ghc92"; # Version of GHC to use
compiler-nix-name = "ghc96"; # Version of GHC to use

# Cross compilation support:
# crossPlatforms = p: pkgs.lib.optionals pkgs.stdenv.hostPlatform.isx86_64 ([
Expand Down
2 changes: 0 additions & 2 deletions overlays/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ let

bootstrap = import ./bootstrap.nix;
compiler-llvm = import ./compiler-llvm.nix;
ghc = import ./ghc.nix;
ghc-packages = import ./ghc-packages.nix;
darwin = import ./darwin.nix;
windows = import ./windows.nix;
Expand Down Expand Up @@ -114,7 +113,6 @@ let
nix-tools
bootstrap
compiler-llvm
ghc
ghc-packages
darwin
windows
Expand Down
29 changes: 0 additions & 29 deletions overlays/ghc.nix

This file was deleted.

Loading