Upgrade to lts 20.23 and nixos 23.05

.github/workflows/nix-build.yml

@@ -1,37 +0,0 @@
-name: "Nix Build"
-on:
-  pull_request:
-  push:
-    branches: [development, master]
-jobs:
-  build:
-    name: ${{ matrix.attribute }} / ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os:
-          - ubuntu-latest
-        attribute:
-          - .#devShells.x86_64-linux.default
-          - .#packages.x86_64-linux.default
-          - .#checks.x86_64-linux.pre-commit
-          - .#checks.x86_64-linux.nixpkgs-22_05
-    steps:
-    - uses: actions/checkout@v2.5.0
-    - uses: cachix/install-nix-action@v18
-      with:
-        extra_nix_config: |
-          access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
-    - name: free disk space
-      run: |
-        if [[ "${{matrix.os}}" == "ubuntu-latest" ]]
-        then
-          sudo rm -rf /opt
-        fi
-    - uses: cachix/cachix-action@v11
-      with:
-        name: autodocodec
-        extraPullNames: validity,safe-coloured-text,sydtest
-        signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
-    - run: nix build "${{matrix.attribute}}"

autodocodec/src/Autodocodec/Class.hs

@@ -4,6 +4,8 @@
 {-# LANGUAGE OverloadedLists #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE ScopedTypeVariables #-}
+-- Because Eq is a superclass of Hashable in newer versions.
+{-# OPTIONS_GHC -Wno-redundant-constraints #-}
 
 module Autodocodec.Class where
 

autodocodec/src/Autodocodec/Codec.hs

@@ -10,6 +10,8 @@
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TypeApplications #-}
+-- Because Eq is a superclass of Hashable in newer versions.
+{-# OPTIONS_GHC -Wno-redundant-constraints #-}
 
 module Autodocodec.Codec where
 

flake.lock

@@ -54,16 +54,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1676177817,
-        "narHash": "sha256-OQnBnuKkpwkfNY31xQyfU5hNpLs1ilWt+hVY6ztEEOM=",
+        "lastModified": 1685533922,
+        "narHash": "sha256-y4FCQpYafMQ42l1V+NUrMel9RtFtZo59PzdzflKR/lo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "1b82144edfcd0c86486d2e07c7298f85510e7fb8",
+        "rev": "3a70dd92993182f8e514700ccf5b1ae9fc8a3b8d",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-22.11",
+        "ref": "nixos-23.05",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -100,6 +100,22 @@
         "type": "github"
       }
     },
+    "nixpkgs-22_11": {
+      "locked": {
+        "lastModified": 1685468986,
+        "narHash": "sha256-YSj3K71KjRZgeL0hS3sYLYHI0g8aIVIf9lcsRMCIW2A=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "9af373a61647257d16ae6062cddaa9094d24920c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-22.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixpkgs-stable": {
       "locked": {
         "lastModified": 1673800717,
@@ -159,6 +175,7 @@
         "nixpkgs": "nixpkgs",
         "nixpkgs-21_11": "nixpkgs-21_11",
         "nixpkgs-22_05": "nixpkgs-22_05",
+        "nixpkgs-22_11": "nixpkgs-22_11",
         "pre-commit-hooks": "pre-commit-hooks",
         "safe-coloured-text": "safe-coloured-text",
         "sydtest": "sydtest",

flake.nix

@@ -5,7 +5,8 @@
     extra-trusted-public-keys = "autodocodec.cachix.org-1:UU3l42g+wSr6tzvawO/oDLo+5yC5BJiATnoV4/AViMs=";
   };
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs?ref=nixos-22.11";
+    nixpkgs.url = "github:NixOS/nixpkgs?ref=nixos-23.05";
+    nixpkgs-22_11.url = "github:NixOS/nixpkgs?ref=nixos-22.11";
     nixpkgs-22_05.url = "github:NixOS/nixpkgs?ref=nixos-22.05";
     nixpkgs-21_11.url = "github:NixOS/nixpkgs?ref=nixos-21.11";
     pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix";
@@ -20,6 +21,7 @@
   outputs =
     { self
     , nixpkgs
+    , nixpkgs-22_11
     , nixpkgs-22_05
     , nixpkgs-21_11
     , pre-commit-hooks
@@ -50,6 +52,7 @@
             in pkgs'.haskellPackages.autodocodecRelease;
           allNixpkgs = {
             inherit
+              nixpkgs-22_11
               nixpkgs-21_11
               nixpkgs-22_05;
           };

nix/overlay.nix

@@ -57,6 +57,13 @@ with final.haskell.lib;
                 name = "autodocodec-release";
                 paths = final.lib.attrValues self.autodocodecPackages;
               };
+
+            openapi3 =
+              if super.openapi3.meta.broken
+              then unmarkBroken super.openapi3
+              else if final.lib.versionAtLeast super.openapi3.version "3.2.3"
+              then final.lib.warn "Don't need this override openapi3 anymore." super.openapi3
+              else super.openapi3;
           } // autodocodecPackages
       );
   });