Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump nixpkgs-unstable and default compiler in Nix to ghc94 #244

Merged
merged 2 commits into from
Jan 7, 2024
Merged

Bump nixpkgs-unstable and default compiler in Nix to ghc94 #244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
edbbedb
Bump nixpkgs-unstable and default compiler in Nix to ghc94
cdepillabout Jan 7, 2024
abfc28c
Rename pkgconfig to pkg-config
cdepillabout Jan 7, 2024
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 .nix-helpers/nixos-vm.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
jq
ltrace
nix-bash-completions
pkgconfig
pkg-config
psmisc
screen
strace
Expand Down
2 changes: 1 addition & 1 deletion .nix-helpers/overlays.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ let
#
# Either this, or termonadKnownWorkingHaskellPkgSet can be changed in an overlay
# if you want to use a different GHC to build Termonad.
termonadCompilerVersion = "ghc92";
termonadCompilerVersion = "ghc94";

# A Haskell package set where we know the GHC version works to compile
# Termonad. This is basically just a shortcut so that other Nix files
Expand Down
4 changes: 2 additions & 2 deletions .nix-helpers/simple-cabal-shell.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,8 @@ pkgs.mkShell {
ghc-real
cabal-install-real

# pkgconfig for linking pkgconfig deps
pkgs.pkgconfig
# pkg-config for linking pkg-config deps
pkgs.pkg-config

# Required system libraries
pkgs.gobject-introspection
Expand Down
6 changes: 3 additions & 3 deletions flake.lock
View file
Open in desktop

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

Loading