From c13c3122f36a1388fd6fca634cb3c89a1d1075ce Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <sarah.vaupel@uniworx.de>
Date: Fri, 31 Mar 2023 21:21:18 +0000
Subject: [PATCH] chore(nix): update flake.nix

---
 flake.lock | 52 +++++++++++++++++++++++++++++++++++++++-------------
 flake.nix  | 27 ++++++++++++---------------
 2 files changed, 51 insertions(+), 28 deletions(-)

diff --git a/flake.lock b/flake.lock
index a76f4bc30..e7a89f7ca 100644
--- a/flake.lock
+++ b/flake.lock
@@ -325,6 +325,22 @@
       }
     },
     "flake-utils": {
+      "locked": {
+        "lastModified": 1678901627,
+        "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "ref": "main",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_2": {
       "locked": {
         "lastModified": 1679360468,
         "narHash": "sha256-LGnza3cfXF10Biw3ZTg0u9o9t7s680Ww200t5KkHTh8=",
@@ -340,7 +356,7 @@
         "type": "github"
       }
     },
-    "flake-utils_2": {
+    "flake-utils_3": {
       "locked": {
         "lastModified": 1653893745,
         "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=",
@@ -355,7 +371,7 @@
         "type": "github"
       }
     },
-    "flake-utils_3": {
+    "flake-utils_4": {
       "locked": {
         "lastModified": 1659877975,
         "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
@@ -430,7 +446,7 @@
         "cabal-36": "cabal-36",
         "cardano-shell": "cardano-shell",
         "flake-compat": "flake-compat",
-        "flake-utils": "flake-utils",
+        "flake-utils": "flake-utils_2",
         "ghc-8.6.5-iohk": "ghc-8.6.5-iohk",
         "hackage": "hackage",
         "hpc-coveralls": "hpc-coveralls",
@@ -697,7 +713,7 @@
     },
     "nix2container": {
       "inputs": {
-        "flake-utils": "flake-utils_2",
+        "flake-utils": "flake-utils_3",
         "nixpkgs": "nixpkgs_3"
       },
       "locked": {
@@ -924,6 +940,22 @@
         "type": "github"
       }
     },
+    "nixpkgs_5": {
+      "locked": {
+        "lastModified": 1680296362,
+        "narHash": "sha256-zI8rKfSoRf261clT5Fi5M+buLyN1z5FgWFgnPHgJd1Y=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "ff40c8086733f2104d416b6ffd4770068a1fd43f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "master",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nosys": {
       "locked": {
         "lastModified": 1667881534,
@@ -966,18 +998,12 @@
         "docker-nixpkgs": "docker-nixpkgs",
         "encoding": "encoding",
         "esqueleto": "esqueleto",
-        "flake-utils": [
-          "haskell-nix",
-          "flake-utils"
-        ],
+        "flake-utils": "flake-utils",
         "haskell-nix": "haskell-nix",
         "ldap-client": "ldap-client",
         "memcached-binary": "memcached-binary",
         "minio-hs": "minio-hs",
-        "nixpkgs": [
-          "haskell-nix",
-          "nixpkgs-unstable"
-        ],
+        "nixpkgs": "nixpkgs_5",
         "serversession": "serversession",
         "xss-sanitize": "xss-sanitize",
         "yesod": "yesod",
@@ -1028,7 +1054,7 @@
         "blank": "blank",
         "devshell": "devshell",
         "dmerge": "dmerge",
-        "flake-utils": "flake-utils_3",
+        "flake-utils": "flake-utils_4",
         "incl": "incl",
         "makes": [
           "haskell-nix",
diff --git a/flake.nix b/flake.nix
index c1c3b00b5..22409532d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -8,21 +8,18 @@ rec {
       url = "github:input-output-hk/haskell.nix";
     };
 
-    # nixpkgs = {
-    #   type = "github";
-    #   owner = "NixOS";
-    #   repo = "nixpkgs";
-    #   ref = "master";
-    # };
-    # flake-utils = {
-    #   type = "github";
-    #   owner = "numtide";
-    #   repo = "flake-utils";
-    #   ref = "main";
-    # };
-
-    nixpkgs.follows = "haskell-nix/nixpkgs-unstable";
-    flake-utils.follows = "haskell-nix/flake-utils";
+    nixpkgs = {
+      type = "github";
+      owner = "NixOS";
+      repo = "nixpkgs";
+      ref = "master";
+    };
+    flake-utils = {
+      type = "github";
+      owner = "numtide";
+      repo = "flake-utils";
+      ref = "main";
+    };
 
     docker-nixpkgs = {
       url = "github:nix-community/docker-nixpkgs";