From 89c314a0515cc2e51513f804ab4356e9c59225d8 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Thu, 5 Apr 2018 10:48:04 -0700
Subject: [PATCH] Pin insert-ordered-containers

---
 default.nix | 13 +++++++++---
 shell.nix   | 61 +----------------------------------------------------
 2 files changed, 11 insertions(+), 63 deletions(-)
 mode change 100644 => 120000 shell.nix

diff --git a/default.nix b/default.nix
index fc57a60..b4fa4c9 100644
--- a/default.nix
+++ b/default.nix
@@ -18,7 +18,7 @@ let
       , tasty, tasty-hunit, tasty-th, text, transformers, trifecta
       , unordered-containers, these, optparse-applicative, interpolate
       , process, exceptions, bytestring, mtl, monadlist, base16-bytestring
-      , cryptohash, template-haskell, syb, xml
+      , cryptohash, template-haskell, syb, xml, insert-ordered-containers
       }:
       mkDerivation {
         pname = "hnix";
@@ -31,7 +31,7 @@ let
           parsers regex-tdfa regex-tdfa-text semigroups text transformers
           trifecta unordered-containers these process directory filepath
           exceptions bytestring mtl monadlist base16-bytestring cryptohash
-          template-haskell syb xml
+          template-haskell syb xml insert-ordered-containers
         ];
         executableHaskellDepends = [
           ansi-wl-pprint base containers data-fix deepseq optparse-applicative
@@ -53,7 +53,14 @@ let
 
   variant = if doBenchmark then pkgs.haskell.lib.doBenchmark else pkgs.lib.id;
 
-  drv = variant (haskellPackages.callPackage f {});
+  drv = variant (haskellPackages.callPackage f {
+    insert-ordered-containers = pkgs.fetchFromGitHub {
+      owner = "mightybyte";
+      repo = "insert-ordered-containers";
+      rev = "842b32c012e01ba1930c34c367dab9a9412c332d";
+      sha256 = "182y5ffc68dgdrdkfq7w3zsj8xmig6hdnhv5wm866qcks49i2kn4";
+    };
+  });
 
 in
 
diff --git a/shell.nix b/shell.nix
deleted file mode 100644
index 46aa886..0000000
--- a/shell.nix
+++ /dev/null
@@ -1,60 +0,0 @@
-let
-  hostPkgs = import <nixpkgs> {};
-  pinnedPkgs = hostPkgs.fetchFromGitHub {
-    owner = "NixOS";
-    repo = "nixpkgs-channels";
-    rev = "ee28e35ba37ab285fc29e4a09f26235ffe4123e2";
-    sha256 = "0a6xrqjj2ihkz1bizhy5r843n38xgimzw5s2mfc42kk2rgc95gw5";
-  };
-in { nixpkgs ? import pinnedPkgs {}, compiler ? "default", doBenchmark ? false }:
-
-let
-
-  inherit (nixpkgs) pkgs;
-
-  f = { mkDerivation, ansi-wl-pprint, base, containers, criterion
-      , data-fix, deepseq, deriving-compat, directory, filepath, Glob
-      , parsers, regex-tdfa, regex-tdfa-text, semigroups, split, stdenv
-      , tasty, tasty-hunit, tasty-th, text, transformers, trifecta
-      , unordered-containers, these, optparse-applicative, free
-      , interpolate, process, exceptions, bytestring, mtl, monadlist
-      , base16-bytestring, cryptohash, template-haskell, syb, xml
-      }:
-      mkDerivation {
-        pname = "hnix";
-        version = "0.4.0";
-        src = ./.;
-        isLibrary = true;
-        isExecutable = true;
-        libraryHaskellDepends = [
-          ansi-wl-pprint base containers data-fix deepseq deriving-compat
-          parsers regex-tdfa regex-tdfa-text semigroups text transformers
-          trifecta unordered-containers these free process directory
-          filepath exceptions bytestring mtl monadlist base16-bytestring
-          cryptohash template-haskell syb xml
-        ];
-        executableHaskellDepends = [
-          ansi-wl-pprint base containers data-fix deepseq optparse-applicative
-          text transformers unordered-containers template-haskell
-        ];
-        testHaskellDepends = [
-          base containers data-fix directory filepath Glob split tasty
-          tasty-hunit tasty-th text transformers interpolate
-        ];
-        benchmarkHaskellDepends = [ base containers criterion text ];
-        homepage = "http://github.com/jwiegley/hnix";
-        description = "Haskell implementation of the Nix language";
-        license = stdenv.lib.licenses.bsd3;
-      };
-
-  haskellPackages = if compiler == "default"
-                       then pkgs.haskellPackages
-                       else pkgs.haskell.packages.${compiler};
-
-  variant = if doBenchmark then pkgs.haskell.lib.doBenchmark else pkgs.lib.id;
-
-  drv = variant (haskellPackages.callPackage f {});
-
-in
-
-  if pkgs.lib.inNixShell then drv.env else drv
diff --git a/shell.nix b/shell.nix
new file mode 120000
index 0000000..73537e4
--- /dev/null
+++ b/shell.nix
@@ -0,0 +1 @@
+default.nix
\ No newline at end of file