Merge pull request 'default.nix: Updated use of flake-compat' (#29) from aftix/hydra:main into main

Reviewed-on: https://git.lix.systems/lix-project/hydra/pulls/29
Reviewed-by: Maximilian Bosch <maximilian@mbosch.me>

default.nix

@@ -1,6 +1,13 @@
 # The `default.nix` in flake-compat reads `flake.nix` and `flake.lock` from `src` and
 # returns an attribute set of the shape `{ defaultNix, shellNix }`
 
-(import (fetchTarball https://github.com/edolstra/flake-compat/archive/master.tar.gz) {
-  src = ./.;
-}).defaultNix
+(import (
+  let
+    inherit (lock.nodes.flake-compat.locked) narHash rev;
+    lock = builtins.fromJSON (builtins.readFile ./flake.lock);
+  in
+  fetchTarball {
+    url = "https://github.com/nix-community/flake-compat/archive/${rev}.tar.gz";
+    sha256 = narHash;
+  }
+) { src = ./.; }).defaultNix

flake.lock

@@ -1,24 +1,25 @@
 {
   "nodes": {
     "flake-compat": {
-      "flake": false,
       "locked": {
-        "lastModified": 1696426674,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
-        "owner": "edolstra",
+        "lastModified": 1717312683,
+        "narHash": "sha256-FrlieJH50AuvagamEvWMIE6D2OAnERuDboFDYAED/dE=",
+        "owner": "nix-community",
         "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "rev": "38fd3954cf65ce6faf3d0d45cd26059e059f07ea",
         "type": "github"
       },
       "original": {
-        "owner": "edolstra",
+        "owner": "nix-community",
         "repo": "flake-compat",
         "type": "github"
       }
     },
     "lix": {
       "inputs": {
-        "flake-compat": "flake-compat",
+        "flake-compat": [
+          "flake-compat"
+        ],
         "nix2container": "nix2container",
         "nixpkgs": [
           "nixpkgs"
@@ -106,6 +107,7 @@
     },
     "root": {
       "inputs": {
+        "flake-compat": "flake-compat",
         "lix": "lix",
         "nixpkgs": "nixpkgs"
       }

flake.nix

@@ -5,8 +5,11 @@
 
   inputs.lix.url = "git+https://git.lix.systems/lix-project/lix";
   inputs.lix.inputs.nixpkgs.follows = "nixpkgs";
+  inputs.lix.inputs.flake-compat.follows = "flake-compat";
 
-  outputs = { self, nixpkgs, lix }:
+  inputs.flake-compat.url = "github:nix-community/flake-compat";
+
+  outputs = { self, nixpkgs, lix, ... }:
     let
       systems = [ "x86_64-linux" "aarch64-linux" ];
       forEachSystem = nixpkgs.lib.genAttrs systems;