Merge pull request #7989 from sysedwinistrator/flake-compat-sha256-mr

add flake-compat to flake.nix and use sha256 in default.nix
NixOS · Mar 14, 2023 · 9ec1a3a · 9ec1a3a
2 parents a387f46 + 934431d
commit 9ec1a3a
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 4 deletions.
diff --git a/default.nix b/default.nix
@@ -1,3 +1,10 @@
-(import (fetchTarball "https://github.com/edolstra/flake-compat/archive/master.tar.gz") {
- src = ./.;
-}).defaultNix
+(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;
+ }
+ )
+ { src = ./.; }
+).defaultNix
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -4,8 +4,9 @@
  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11-small";
  inputs.nixpkgs-regression.url = "github:NixOS/nixpkgs/215d4d0fd80ca5163643b03a33fde804a29cc1e2";
  inputs.lowdown-src = { url = "github:kristapsdz/lowdown"; flake = false; };
+ inputs.flake-compat = { url = "github:edolstra/flake-compat"; flake = false; };
 
- outputs = { self, nixpkgs, nixpkgs-regression, lowdown-src }:
+ outputs = { self, nixpkgs, nixpkgs-regression, lowdown-src, flake-compat }:
 
  let
  inherit (nixpkgs) lib;