flake.lock: Update

Flake lock file updates:

• Removed input 'aeson'
• Updated input 'flake-utils':
    'github:numtide/flake-utils/cfacdce06f30d2b68473a46042957675eebb3401' (2023-04-11)
  → 'github:numtide/flake-utils/ff7b65b44d01cf9ba6a71320833626af21126384' (2023-09-12)
• Updated input 'ghc-tcplugins-extra':
    'github:clash-lang/ghc-tcplugins-extra/c2007b347c9cff4637709907010d309f68401f2a' (2023-02-20)
  → 'github:clash-lang/ghc-tcplugins-extra/92b5215273bc219da9550799e0869ea6934648f0' (2023-07-31)
• Updated input 'ghc-typelits-extra':
    'github:clash-lang/ghc-typelits-extra/d4a66e64944b7ab84d18450f2c9130a36e2c5917' (2023-02-20)
  → 'github:clash-lang/ghc-typelits-extra/bbe2a40d6bc640ab065dd87db74ba59e584aa9f2' (2023-07-31)
• Updated input 'ghc-typelits-knownnat':
    'github:clash-lang/ghc-typelits-knownnat/0cf1cc089db84431ecb54b5bfc6171375f1f6ec4' (2023-02-20)
  → 'github:clash-lang/ghc-typelits-knownnat/2b72c495b4158d49ef46609036b08e414bcdba5c' (2023-07-31)
• Updated input 'ghc-typelits-natnormalise':
    'github:clash-lang/ghc-typelits-natnormalise/f089f6bd91af2038cdc5b60f28d10bc8d1079a23' (2023-02-20)
  → 'github:clash-lang/ghc-typelits-natnormalise/3289e1a25df3d7752d6734aa83ba04782d6e43cd' (2023-07-31)
• Removed input 'integer-conversion'
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/7a288f777a58a0a962bdf5e03b7308f7f02fa149' (2023-05-20)
  → 'github:NixOS/nixpkgs/5148520bfab61f99fd25fb9ff7bfbb50dad3c9db' (2023-09-17)

flake.nix

@@ -9,12 +9,6 @@
       url = "github:edolstra/flake-compat";
       flake = false;
     };
-    # TODO: Package is not yet in 23.05 but it is in unstable. Once 23.11
-    #       Has been released remove this
-    attoparsec-aeson = {
-      url = "github:athanclark/aeson-attoparsec/v0.0.0";
-      flake = false;
-    };
 
     ghc-tcplugins-extra = {
       url = "github:clash-lang/ghc-tcplugins-extra";
@@ -42,22 +36,21 @@
       # The versions of GHC that we want to be able to build / develop against
       # within the nix environment. Since nix is lazy, only derivations for
       # versions of GHC which are used are actually evaluated.
-      ghcVersions = [ "ghc902" "ghc961" ];
+      ghcVersions = [ "ghc902" "ghc962" ];
 
       # We pick a single version of GHC to use by default within nix. This is
       # probably cleaner than always having N copies of each package / app and
       # being forced to refer to them by their GHC version.
-      defaultGhcVersion = "ghc961";
+      defaultGhcVersion = "ghc962";
 
       # Overlays are not per-system, so let's only compute them once.
       # For each version of GHC we produce a `pkgs.clashPackages-ghcVER`, e.g.
-      # `pkgs.clashPackages-ghc961`.
+      # `pkgs.clashPackages-ghc962`.
       overlays =
         let
           makeOverlay =
             import (./. + "/nix/overlay.nix") {
               inherit (args)
-                attoparsec-aeson
                 ghc-tcplugins-extra
                 ghc-typelits-extra
                 ghc-typelits-knownnat

nix/overlay-ghc961.nix → nix/overlay-ghc962.nix

@@ -12,9 +12,6 @@ in
   # .cabal file currently uploaded to hackage.
   concurrent-supply = doJailbreak (markUnbroken prev.concurrent-supply);
 
-  # Use a newer version than the default in nixpkgs.
-  doctest-parallel = prev.doctest-parallel_0_3_0_1;
-
   # Use a branch with changes to support GHC 9.6.1.
   hint =
     prev.hint.overrideAttrs (_: {
@@ -34,9 +31,6 @@ in
   # than the defaults in nixpkgs.
   rewrite-inspector = doJailbreak (markUnbroken prev.rewrite-inspector);
 
-  # Use a newer version than the default in nixpkgs.
-  singletons = prev.singletons_3_0_2;
-
   # We want a version that matches with singletons-th, but the tests in here
   # are also a bit flaky since GHC 9.6 isn't officially supported.
   singletons-base = dontCheck prev.singletons-base_3_2;
@@ -52,7 +46,4 @@ in
 
   # Needs a newer base than the .cabal file currently uploaded to hackage.
   vector-binary-instances = doJailbreak prev.vector-binary-instances;
-
-  # Use a newer version than the default in nixpkgs.
-  vty = prev.vty_5_38;
 }

nix/overlay.nix

@@ -6,8 +6,7 @@
 # packages to the environment, or need to change the configuration of the
 # different packages maintained by QBayLogic.
 
-{ attoparsec-aeson
-, ghc-tcplugins-extra
+{ ghc-tcplugins-extra
 , ghc-typelits-extra
 , ghc-typelits-knownnat
 , ghc-typelits-natnormalise
@@ -26,13 +25,6 @@ let
   # standalone repositories, e.g. the typechecker plugins needed for Clash.
   haskellExternalPackages =
     hfinal: hprev: {
-    # TODO: Package is not yet in 23.05 but it is in unstable. Once 23.11
-    #       Has been released remove this
-      attoparsec-aeson = hprev.callCabal2nix
-          "attoparsec-aeson"
-          "${attoparsec-aeson}"
-          { };
-
       ghc-tcplugins-extra =
         hprev.callCabal2nix
           "ghc-tcplugins-extra"