From 7afe93727cf03458df0a95b003851660bd9ca794 Mon Sep 17 00:00:00 2001
From: Paul Brinkmeier <hallo@pbrinkmeier.de>
Date: Tue, 26 Dec 2023 22:30:12 +0100
Subject: [PATCH] Update dependencies, remove Nix overlay

---
 flake.lock      |  8 ++++----
 flake.nix       |  7 +++----
 nix/overlay.nix | 23 -----------------------
 package.yaml    |  2 +-
 4 files changed, 8 insertions(+), 32 deletions(-)
 delete mode 100644 nix/overlay.nix

diff --git a/flake.lock b/flake.lock
index 89d85fa..8148e1b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,16 +2,16 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1680273054,
-        "narHash": "sha256-Bs6/5LpvYp379qVqGt9mXxxx9GSE789k3oFc+OAL07M=",
+        "lastModified": 1703588687,
+        "narHash": "sha256-yj/AFxJjW/aE0lmHz1wlTk3jScZqVjQQEeBOnhyroRc=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "3364b5b117f65fe1ce65a3cdd5612a078a3b31e3",
+        "rev": "ad9ca03be8aaf8d6e458102e7d77370b7fe71ccf",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixpkgs-unstable",
+        "ref": "release-23.11",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 095e2d8..d2abcde 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,15 +1,14 @@
 {
   description = "Unicode toy";
 
-  inputs.nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
+  inputs.nixpkgs.url = "github:nixos/nixpkgs/release-23.11";
 
   outputs = { self, nixpkgs }:
     let
-      overlay = import ./nix/overlay.nix;
       settings = import ./nix/settings.nix;
       haskellDeps = import ./nix/haskell-deps.nix;
 
-      pkgs = nixpkgs.legacyPackages.x86_64-linux.extend overlay;
+      pkgs = nixpkgs.legacyPackages.x86_64-linux;
       haskellPackages = pkgs.haskell.packages."${settings.ghc}";
 
       ghc = haskellPackages.ghcWithPackages haskellDeps;
@@ -37,7 +36,7 @@
         ({ mkDerivation }:
         mkDerivation {
           # Keep this in sync with package.yaml
-          version = "0.6";
+          version = "0.6.1";
           pname = "utoy";
           license = pkgs.lib.licenses.mit;
           src =
diff --git a/nix/overlay.nix b/nix/overlay.nix
deleted file mode 100644
index 21a2527..0000000
--- a/nix/overlay.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-let
-  settings = import ./settings.nix;
-
-  overlay = final: prev: {
-    haskell = prev.haskell // {
-      packages = prev.haskell.packages // {
-        "${settings.ghc}" = prev.haskell.packages."${settings.ghc}".override {
-          overrides = haskellOverlay prev;
-        };
-      };
-    };
-  };
-
-  haskellOverlay = pkgs: final: prev: {
-    attoparsec-iso8601 = prev.attoparsec-iso8601_1_1_0_0;
-    http-api-data = prev.http-api-data_0_5;
-    servant = pkgs.haskell.lib.doJailbreak prev.servant;
-    servant-server = pkgs.haskell.lib.doJailbreak prev.servant-server;
-    unicode-data = prev.unicode-data_0_4_0_1;
-    unicode-data-names = pkgs.haskell.lib.markUnbroken prev.unicode-data-names;
-  };
-in
-  overlay
diff --git a/package.yaml b/package.yaml
index 7dec226..5a26fda 100644
--- a/package.yaml
+++ b/package.yaml
@@ -2,7 +2,7 @@
 
 name:                utoy
 # Keep this in sync with the version in flake.nix.
-version:             0.6
+version:             0.6.1
 git:                 "https://git.pbrinkmeier.de/paul/utoy"
 license:             MIT
 author:              "Paul Brinkmeier"