From b462796dbde301046b611540d933db335e3f27f8 Mon Sep 17 00:00:00 2001
From: Paul Brinkmeier <hallo@pbrinkmeier.de>
Date: Wed, 1 Mar 2023 03:41:39 +0100
Subject: [PATCH] Add unicode-data-names dependency

---
 hie.yaml         | 7 +++++++
 nix/pkgs.nix     | 2 +-
 nix/sources.json | 8 ++++----
 package.yaml     | 1 -
 shell.nix        | 3 ++-
 stack-shell.nix  | 2 +-
 utoy.cabal       | 5 +----
 7 files changed, 16 insertions(+), 12 deletions(-)
 create mode 100644 hie.yaml

diff --git a/hie.yaml b/hie.yaml
new file mode 100644
index 0000000..af9c93d
--- /dev/null
+++ b/hie.yaml
@@ -0,0 +1,7 @@
+cradle:
+  stack:
+    - path: "./test/Spec.hs"
+      component: "utoy:test:utoy-test"
+
+    - path: "./app/Main.hs"
+      component: "utoy:exe:utoy-exe"
diff --git a/nix/pkgs.nix b/nix/pkgs.nix
index eeef947..de9cae8 100644
--- a/nix/pkgs.nix
+++ b/nix/pkgs.nix
@@ -14,7 +14,7 @@ let
   };
 
   haskellOverlay = pkgs: final: prev: {
-    unicode-data = prev.unicode-data_0_4_0_1;
+    unicode-data = prev.unicode-data_0_4_0;
     unicode-data-names = pkgs.haskell.lib.markUnbroken prev.unicode-data-names;
   };
 in
diff --git a/nix/sources.json b/nix/sources.json
index f7baa89..d486d47 100644
--- a/nix/sources.json
+++ b/nix/sources.json
@@ -12,15 +12,15 @@
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixpkgs": {
-        "branch": "nixpkgs-unstable",
+        "branch": "nixos-22.11",
         "description": "Nix Packages collection",
         "homepage": "",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9952d6bc395f5841262b006fbace8dd7e143b634",
-        "sha256": "0kvpf63dda6nzbqd2kyr99qh1av89mva26xykp3zb4diyicp7yji",
+        "rev": "7076110064c09f0b3942f609f2134c1358ef2e50",
+        "sha256": "0j7idx8vyb0spwxqb7rr8pk15wi7yfyf5hp608wkhaz7wjw8k9nf",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/9952d6bc395f5841262b006fbace8dd7e143b634.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/7076110064c09f0b3942f609f2134c1358ef2e50.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     }
 }
diff --git a/package.yaml b/package.yaml
index d3e3abe..a798d03 100644
--- a/package.yaml
+++ b/package.yaml
@@ -13,7 +13,6 @@ extra-source-files:
 
 dependencies:
 - base >= 4.7 && < 5
-- unicode-data-names
 
 ghc-options:
 - -Wall
diff --git a/shell.nix b/shell.nix
index 525a729..33ce29d 100644
--- a/shell.nix
+++ b/shell.nix
@@ -2,6 +2,7 @@
 let
   haskellDeps = import ./nix/haskell-deps.nix;
   settings = import ./nix/settings.nix;
+  haskellPackages = pkgs.haskell.packages."${settings.ghc}";
 
   tools = with pkgs; [
     # nix tools
@@ -10,8 +11,8 @@ let
 
     # haskell tools
     stack
-    haskell-language-server
     (pkgs.haskell.packages."${settings.ghc}".ghcWithPackages haskellDeps)
+    pkgs.haskell.packages."${settings.ghc}".haskell-language-server
   ];
 in
   pkgs.mkShellNoCC {
diff --git a/stack-shell.nix b/stack-shell.nix
index c96744d..b3a2c03 100644
--- a/stack-shell.nix
+++ b/stack-shell.nix
@@ -1,8 +1,8 @@
 {}:
 let
   pkgs = import ./nix/pkgs.nix {};
-  settings = import ./nix/settings.nix;
   haskellDeps = import ./nix/haskell-deps.nix;
+  settings = import ./nix/settings.nix;
 in
   pkgs.haskell.lib.buildStackProject {
     name = "utoy";
diff --git a/utoy.cabal b/utoy.cabal
index 5ca2818..9712630 100644
--- a/utoy.cabal
+++ b/utoy.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.35.2.
+-- This file has been generated from package.yaml by hpack version 0.35.0.
 --
 -- see: https://github.com/sol/hpack
 
@@ -27,7 +27,6 @@ library
   ghc-options: -Wall -Wcompat -Widentities -Wincomplete-record-updates -Wincomplete-uni-patterns -Wmissing-export-lists -Wmissing-home-modules -Wpartial-fields -Wredundant-constraints
   build-depends:
       base >=4.7 && <5
-    , unicode-data-names
   default-language: Haskell2010
 
 executable utoy-exe
@@ -37,7 +36,6 @@ executable utoy-exe
   ghc-options: -Wall -Wcompat -Widentities -Wincomplete-record-updates -Wincomplete-uni-patterns -Wmissing-export-lists -Wmissing-home-modules -Wpartial-fields -Wredundant-constraints -threaded -rtsopts -with-rtsopts=-N
   build-depends:
       base >=4.7 && <5
-    , unicode-data-names
     , utoy
   default-language: Haskell2010
 
@@ -51,6 +49,5 @@ test-suite utoy-test
   ghc-options: -Wall -Wcompat -Widentities -Wincomplete-record-updates -Wincomplete-uni-patterns -Wmissing-export-lists -Wmissing-home-modules -Wpartial-fields -Wredundant-constraints -threaded -rtsopts -with-rtsopts=-N
   build-depends:
       base >=4.7 && <5
-    , unicode-data-names
     , utoy
   default-language: Haskell2010