switch to flakehub

DeterminateSystems · Oct 3, 2023 · a04e627 · a04e627
1 parent 749fc5b
commit a04e627
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 40 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -2,12 +2,9 @@
   description = "Magic Nix Cache";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    nixpkgs.url = "https://flakehub.com/f/NixOS/nixpkgs/0.1.0.tar.gz";
 
-    flake-compat = {
-      url = "github:edolstra/flake-compat";
-      flake = false;
-    };
+    flake-compat.url = "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz";
   };
 
   outputs = { self, nixpkgs, ... }:

diff --git a/shell.nix b/shell.nix
@@ -1,15 +1,10 @@
-let
-  lock = builtins.fromJSON (builtins.readFile ./flake.lock);
-
-  flake-compat = builtins.fetchTarball {
-    url = "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
-    sha256 = lock.nodes.flake-compat.locked.narHash;
-  };
-
-  flake = import flake-compat {
-    src = ./.;
-  };
-
-  shell = flake.shellNix.default;
-in
-shell
+(import
+  (
+    let lock = builtins.fromJSON (builtins.readFile ./flake.lock); in
+    fetchTarball {
+      url = lock.nodes.flake-compat.locked.url or "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
+      sha256 = lock.nodes.flake-compat.locked.narHash;
+    }
+  )
+  { src = ./.; }
+).shellNix