Update to nixos-23.05

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "nixpkgs"]
 	path = nixpkgs
-	url = https://github.com/nh2/nixpkgs.git
+	url = https://github.com/NixOS/nixpkgs.git

README.md

@@ -104,6 +104,12 @@ Until Stack 2.3, the official static build of `stack` itself was built using thi
 The [`static-stack`](./static-stack) directory shows how Stack itself can be built statically with static-haskell-nix.
 `stack` is a big package with many dependencies, demonstrating that it works also for large projects.
 
+## Related important open issues
+
+You can contribute to these to help static Haskell executables:
+
+* https://github.com/haskell/cabal/issues/8455
+
 ## FAQ
 
 * I get `cannot find section .dynamic`. Is this an error?
@@ -116,6 +122,13 @@ The [`static-stack`](./static-stack) directory shows how Stack itself can be bui
     then `/nix/store/dax3wjbjfrcwj6r3mafxj5fx6wcg5zbp-stack-2.3.0.1` is your final output _store path_ whose `/bin` directory contains your static executable.
 * I get `stack2nix: user error (No such package mypackage-1.2.3 in the cabal database. Did you run cabal update?)`.
   * You most likely have to bump the date like `hackageSnapshot = "2019-05-08T00:00:00Z";` to a newer date (past the time that package-version was added to Hackage).
+* I get a linker error.
+  What's a good way to investigate what the linker invocation is?
+  * Pass `-v` to Cabal, and to GHC itself:
+    ```sh
+    nix-build --expr '(import ./survey/default.nix {}).haskellPackages.YOURPACKAGE.overrideAttrs (old: { configureFlags = (old.configureFlags or []) ++ ["-v" "--ghc-options=-v"]; })'
+    ```
+    Look for `*** Linker:` in the GHC output.
 * Can I build Stack projects with resolvers that are too old to be supported by Stack >= 2?
   * No. For that you need need to use an old `static-haskell-nix` version: The one before [this PR](https://github.com/nh2/static-haskell-nix/pull/98) was merged.
 * I get some other error. Can I just file an issue and have you help me with it?

default.nix

@@ -1,6 +1,6 @@
 # Note: This is just a minimal example. For proper usage, see the README.
 
-{ nixpkgs ? (import ./nixpkgs.nix).pkgsMusl, compiler ? "ghc864", strip ? true }:
+{ nixpkgs ? (import ./nixpkgs.nix).pkgsMusl, compiler ? "ghc8107", strip ? true }:
 
 
 let
@@ -12,7 +12,7 @@ let
         pname = "example-scotty-app";
         version = "0.1.0.0";
         src = pkgs.lib.sourceByRegex ./. [
-          ".*\.cabal$"
+          ".*\\.cabal$"
           "^Setup.hs$"
           "^Main.hs$"
         ];
@@ -21,7 +21,7 @@ let
         enableSharedExecutables = false;
         enableSharedLibraries = false;
         executableHaskellDepends = [ base scotty ];
-        license = stdenv.lib.licenses.bsd3;
+        license = pkgs.lib.licenses.bsd3;
         configureFlags = [
           "--ghc-option=-optl=-static"
           "--extra-lib-dirs=${pkgs.gmp6.override { withStatic = true; }}/lib"
@@ -37,7 +37,6 @@ let
   haskellPackages = with pkgs.haskell.lib; normalHaskellPackages.override {
     overrides = self: super: {
       # Dependencies we need to patch
-      hpc-coveralls = appendPatch super.hpc-coveralls (builtins.fetchurl https://github.com/guillaume-nargeot/hpc-coveralls/pull/73/commits/344217f513b7adfb9037f73026f5d928be98d07f.patch);
     };
   };
 

nixpkgs.nix

@@ -25,4 +25,5 @@ if builtins.getEnv "STATIC_HASKELL_NIX_CI_NIXPKGS_UNSTABLE_BUILD" == "1"
     if builtins.pathExists ./nixpkgs/pkgs
       then import ./nixpkgs {}
       # Pinned nixpkgs version; should be kept up-to-date with our submodule.
-      else import (fetchTarball https://github.com/NixOS/nixpkgs/archive/d00b5a5fa6fe8bdf7005abb06c46ae0245aec8b5.tar.gz) {}
+      # This is nixos-23.05 as of 2023-06-08, with minimal patches currently having open nixpkgs PR (see commits for PR links).
+      else import (fetchTarball https://github.com/nh2/nixpkgs/archive/9e49f8f1f37bc906cda1adb33064c325d760819a.tar.gz) {}