Lock flake and make sure paths are named the same.

cdepillabout · Sep 8, 2021 · 36be8b0 · 36be8b0
1 parent d044a24
commit 36be8b0
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 8 deletions.
diff --git a/.nix-helpers/overlays.nix b/.nix-helpers/overlays.nix
@@ -8,22 +8,31 @@ let
           termonad =
             let
               filesToIgnore = [
+                "default.nix"
+                "flake.nix"
+                "flake.lock"
                 ".git"
                 ".nix-helpers"
                 "result"
+                "shell.nix"
                 ".stack-work"
                 "stack.yaml"
                 "stack-nightly.yaml"
                 ".travis.yml"
               ];
 
               src =
-                builtins.filterSource
-                  (path: type: with self.lib;
+                builtins.path {
+                  # Naming this path makes sure that people will get the same
+                  # hash even if they checkout the termonad repo into a
+                  # directory called something else.
+                  name = "termonad-src";
+                  path = ./..;
+                  filter = path: type:
+                    with self.lib;
                     ! elem (baseNameOf path) filesToIgnore &&
-                    ! any (flip hasPrefix (baseNameOf path)) [ "dist" ".ghc" ]
-                  )
-                  ./..;
+                    ! any (flip hasPrefix (baseNameOf path)) [ "dist" ".ghc" ];
+                };
 
               extraCabal2nixOptions =
                 self.lib.optionalString self.termonadBuildExamples "-fbuildexamples";

diff --git a/flake.lock b/flake.lock
diff --git a/termonad.cabal b/termonad.cabal
@@ -23,11 +23,14 @@ cabal-version:       1.12
 extra-source-files:  README.md
                    , CHANGELOG.md
                    , default.nix
+                   , flake.nix
+                   , flake.lock
                    , glade/preferences.glade
                    , glade/README.md
                    , img/termonad.png
                    , .nix-helpers/nixops.nix
                    , .nix-helpers/nixpkgs.nix
+                   , .nix-helpers/overlays.nix
                    , .nix-helpers/stack-shell.nix
                    , .nix-helpers/termonad-with-packages.nix
                    , shell.nix