From cd1f659c30ef62bc1e800038e608523776e2a227 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?W=C3=B6lfchen?= <115360611+W-lfchen@users.noreply.github.com> Date: Mon, 16 Sep 2024 18:01:33 +0200 Subject: [PATCH] nix: update flake-compat --- default.nix | 4 +++- flake.lock | 12 +++++------- flake.nix | 5 +---- shell.nix | 4 +++- 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/default.nix b/default.nix index 6466507b..1d976a35 100644 --- a/default.nix +++ b/default.nix @@ -3,7 +3,9 @@ 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"; + 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 = ./.; }).defaultNix diff --git a/flake.lock b/flake.lock index ccf21d54..cc3caeee 100644 --- a/flake.lock +++ b/flake.lock @@ -1,19 +1,17 @@ { "nodes": { "flake-compat": { - "flake": false, "locked": { "lastModified": 1696426674, "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" + "revCount": 57, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz?rev=0f9255e01c2351cc7d116c072cb317785dd33b33&revCount=57" }, "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" + "type": "tarball", + "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" } }, "nixpkgs": { diff --git a/flake.nix b/flake.nix index 8ddf1533..89059ca8 100644 --- a/flake.nix +++ b/flake.nix @@ -1,9 +1,6 @@ { inputs = { - flake-compat = { - url = "github:edolstra/flake-compat"; - flake = false; - }; + flake-compat.url = "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"; nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; rust-overlay = { url = "github:oxalica/rust-overlay"; diff --git a/shell.nix b/shell.nix index 493783d0..d1783071 100644 --- a/shell.nix +++ b/shell.nix @@ -3,7 +3,9 @@ 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"; + 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