From ba9346d5013bad918ce70abc3a1689cb739732c6 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Giraudeau <jean-baptiste.giraudeau@iohk.io>
Date: Sat, 4 Sep 2021 06:15:31 +0200
Subject: [PATCH] Bump nixos-21.05 pin (bintools import fix) and use as
 default. (#1229)

---
 default.nix |  6 +++---
 flake.lock  | 26 ++++++--------------------
 flake.nix   |  4 ++--
 3 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/default.nix b/default.nix
index 8c2f0f1c..14f2c715 100644
--- a/default.nix
+++ b/default.nix
@@ -1,10 +1,10 @@
 {...}@args:
 
 let
-  nixpkgsSrc = 
+  nixpkgsSrc =
     builtins.fetchTarball {
-      url = "https://github.com/NixOS/nixpkgs/archive/3c6f3f84af60a8ed5b8a79cf3026b7630fcdefb8.tar.gz";
-      sha256 = "sha256:0jf9l6j60sa8cms7r4a02kr9j9884pwv1prf79b2ysnxmnhimnch";
+      url = "https://github.com/NixOS/nixpkgs/archive/110a2c9ebbf5d4a94486854f18a37a938cfacbbb.tar.gz";
+      sha256 = "sha256-leWXLchbAbqOlLT6tju631G40SzQWPqaAXQG3zH1Imw=";
     };
   pkgs = args.pkgs or (import nixpkgsSrc {});
   flake-compat =
diff --git a/flake.lock b/flake.lock
index a3eb7a7d..d18f9693 100644
--- a/flake.lock
+++ b/flake.lock
@@ -146,22 +146,6 @@
         "type": "github"
       }
     },
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1624291665,
-        "narHash": "sha256-kNkaoa3dai9WOi7fsPklCCWZ8hRAkXx0ZUhpYKShyUk=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "3c6f3f84af60a8ed5b8a79cf3026b7630fcdefb8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-20.09-darwin",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs-2003": {
       "locked": {
         "lastModified": 1620055814,
@@ -196,11 +180,11 @@
     },
     "nixpkgs-2105": {
       "locked": {
-        "lastModified": 1624291665,
-        "narHash": "sha256-kNkaoa3dai9WOi7fsPklCCWZ8hRAkXx0ZUhpYKShyUk=",
+        "lastModified": 1630481079,
+        "narHash": "sha256-leWXLchbAbqOlLT6tju631G40SzQWPqaAXQG3zH1Imw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "3c6f3f84af60a8ed5b8a79cf3026b7630fcdefb8",
+        "rev": "110a2c9ebbf5d4a94486854f18a37a938cfacbbb",
         "type": "github"
       },
       "original": {
@@ -254,7 +238,9 @@
         "hackage": "hackage",
         "hpc-coveralls": "hpc-coveralls",
         "nix-tools": "nix-tools",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": [
+          "nixpkgs-2105"
+        ],
         "nixpkgs-2003": "nixpkgs-2003",
         "nixpkgs-2009": "nixpkgs-2009",
         "nixpkgs-2105": "nixpkgs-2105",
diff --git a/flake.nix b/flake.nix
index f03efe1f..56cf0b38 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,7 +2,7 @@
   description = "Alternative Haskell Infrastructure for Nixpkgs";
 
   inputs = {
-    nixpkgs = { url = "github:NixOS/nixpkgs/nixpkgs-20.09-darwin"; };
+    nixpkgs.follows = "nixpkgs-2105";
     nixpkgs-2003 = { url = "github:NixOS/nixpkgs/nixpkgs-20.03-darwin"; };
     nixpkgs-2009 = { url = "github:NixOS/nixpkgs/nixpkgs-20.09-darwin"; };
     nixpkgs-2105 = { url = "github:NixOS/nixpkgs/nixpkgs-21.05-darwin"; };
@@ -64,7 +64,7 @@
           inherit config;
           overlays = [ self.overlay ];
         };
-      
+
         sources = inputs;
 
         overlaysOverrideable = import ./overlays;