Trim down flake-compat usage (#23)

srid · May 30, 2022 · 18b6248 · 18b6248
1 parent 1127faa
commit 18b6248
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 44 deletions.
diff --git a/default.nix b/default.nix
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -4,9 +4,6 @@
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
     flake-parts.url = "github:hercules-ci/flake-parts";
     flake-parts.inputs.nixpkgs.follows = "nixpkgs";
-    flake-compat.url = "github:edolstra/flake-compat";
-    flake-compat.flake = false;
-    flake-compat.inputs.nixpkgs.follows = "nixpkgs";
     haskell-flake.url = "github:srid/haskell-flake";
   };
 

diff --git a/shell.nix b/shell.nix
@@ -1,14 +1,10 @@
-# This file exists for legacy Nix installs (nix-build & nix-env)
-# https://nixos.wiki/wiki/Flakes#Using_flakes_project_from_a_legacy_Nix
-# You generally do *not* have to modify this ever.
+# TODO: Remove this after https://github.com/srid/haskell-template/issues/23
+
 (import
   (
-    let
-      lock = builtins.fromJSON (builtins.readFile ./flake.lock);
-    in
     fetchTarball {
-      url = "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
-      sha256 = lock.nodes.flake-compat.locked.narHash;
+      url = "https://github.com/edolstra/flake-compat/archive/b4a34015c698c7793d592d66adbab377907a2be8.tar.gz";
+      sha256 = "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=";
     }
   )
   {