Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
horizon-platform
Manage
Activity
Members
Labels
Plan
Issues
2
Issue boards
Milestones
Wiki
Code
Merge requests
1
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
package-sets
horizon-platform
Commits
512a75a0
Commit
512a75a0
authored
2 years ago
by
Daniel Firth
Browse files
Options
Downloads
Patches
Plain Diff
fix ghc 9.4 config
parent
e54aa123
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
configuration-ghc-9.4.x.nix
+51
-0
51 additions, 0 deletions
configuration-ghc-9.4.x.nix
flake.nix
+3
-2
3 additions, 2 deletions
flake.nix
with
54 additions
and
2 deletions
configuration-ghc-9.4.x.nix
0 → 100644
+
51
−
0
View file @
512a75a0
{
pkgs
,
haskellLib
}:
let
inherit
(
pkgs
)
fetchpatch
lib
;
inherit
(
lib
)
throwIfNot
versionOlder
;
in
self
:
super
:
{
llvmPackages
=
lib
.
dontRecurseIntoAttrs
self
.
ghc
.
llvmPackages
;
# Disable GHC core libraries.
array
=
null
;
base
=
null
;
binary
=
null
;
bytestring
=
null
;
Cabal
=
null
;
Cabal-syntax
=
null
;
containers
=
null
;
deepseq
=
null
;
directory
=
null
;
exceptions
=
null
;
filepath
=
null
;
ghc-bignum
=
null
;
ghc-boot
=
null
;
ghc-boot-th
=
null
;
ghc-compact
=
null
;
ghc-heap
=
null
;
ghc-prim
=
null
;
ghci
=
null
;
haskeline
=
null
;
hpc
=
null
;
integer-gmp
=
null
;
libiserv
=
null
;
mtl
=
null
;
parsec
=
null
;
pretty
=
null
;
process
=
null
;
rts
=
null
;
stm
=
null
;
system-cxx-std-lib
=
null
;
template-haskell
=
null
;
# GHC only builds terminfo if it is a native compiler
terminfo
=
if
pkgs
.
stdenv
.
hostPlatform
==
pkgs
.
stdenv
.
buildPlatform
then
null
else
self
.
terminfo_0_4_1_5
;
text
=
null
;
time
=
null
;
transformers
=
null
;
unix
=
null
;
# GHC only bundles the xhtml library if haddock is enabled, check if this is
# still the case when updating: https://gitlab.haskell.org/ghc/ghc/-/blob/0198841877f6f04269d6050892b98b5c3807ce4c/ghc.mk#L463
xhtml
=
if
self
.
ghc
.
hasHaddock
or
true
then
null
else
self
.
xhtml_3000_2_2_1
;
}
This diff is collapsed.
Click to expand it.
flake.nix
+
3
−
2
View file @
512a75a0
...
...
@@ -18,13 +18,14 @@
pkgs
=
import
nixpkgs
{
inherit
system
;
};
horizon-gen-nix-app
=
get-flake
horizon-gen-nix
;
configuration
=
import
./configuration.nix
{
inherit
inputs
pkgs
;
};
haskellLib
=
pkgs
.
haskell
.
lib
.
compose
;
hsPkgs
=
pkgs
.
callPackage
(
nixpkgs
+
/pkgs/development/haskell-modules
)
{
buildHaskellPackages
=
pkgs
.
haskell
.
packages
.
ghc942
;
configurationCommon
=
{
pkgs
,
haskellLib
}:
self
:
super
:
{
};
configurationCommon
=
{
pkgs
,
haskellLib
}:
self
:
super
:
{
};
ghc
=
pkgs
.
haskell
.
compiler
.
ghc942
;
haskellLib
=
pkgs
.
haskell
.
lib
.
compose
;
initialPackages
=
import
./overlay.nix
;
compilerConfig
=
pkgs
.
callPackage
(
nixpkgs
+
/pkgs/development/haskell-modules
/configuration-ghc-9.4.x.nix
)
{
haskellLib
=
pkgs
.
haskell
.
lib
.
compose
;
};
compilerConfig
=
pkgs
.
callPackage
.
/configuration-ghc-9.4.x.nix
{
haskellLib
=
haskell
Lib
;
};
};
hp
'
=
pkgs
.
lib
.
filterAttrs
(
n
:
v
:
v
!=
null
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment