Merge pull request #244 from cdepillabout/bump-nixpkgs

Bump nixpkgs-unstable and default compiler in Nix to ghc94
cdepillabout · Jan 7, 2024 · e605fff · e605fff
2 parents d767c11 + abfc28c
commit e605fff
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/.nix-helpers/nixos-vm.nix b/.nix-helpers/nixos-vm.nix
@@ -37,7 +37,7 @@
     jq
     ltrace
     nix-bash-completions
-    pkgconfig
+    pkg-config
     psmisc
     screen
     strace

diff --git a/.nix-helpers/overlays.nix b/.nix-helpers/overlays.nix
@@ -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

diff --git a/.nix-helpers/simple-cabal-shell.nix b/.nix-helpers/simple-cabal-shell.nix
@@ -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

diff --git a/flake.lock b/flake.lock