From 23f80cd25e3f0684bce165d291e8c06cafe94e79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?W=C3=B6lfchen?= Date: Thu, 10 Oct 2024 17:25:09 +0000 Subject: [PATCH] nix: update flake-compat (#1197) * nix: update flake-compat * nix: use edolstra/flake-compat#65 as input --- default.nix | 4 +++- flake.lock | 8 ++++---- flake.nix | 5 +---- shell.nix | 4 +++- 4 files changed, 11 insertions(+), 10 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..bdecde7c 100644 --- a/flake.lock +++ b/flake.lock @@ -1,17 +1,17 @@ { "nodes": { "flake-compat": { - "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1709944340, + "narHash": "sha256-xr54XK0SjczlUxRo5YwodibUSlpivS9bqHt8BNyWVQA=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "baa7aa7bd0a570b3b9edd0b8da859fee3ffaa4d4", "type": "github" }, "original": { "owner": "edolstra", + "ref": "refs/pull/65/head", "repo": "flake-compat", "type": "github" } diff --git a/flake.nix b/flake.nix index 8ddf1533..7c164ebb 100644 --- a/flake.nix +++ b/flake.nix @@ -1,9 +1,6 @@ { inputs = { - flake-compat = { - url = "github:edolstra/flake-compat"; - flake = false; - }; + flake-compat.url = "github:edolstra/flake-compat/refs/pull/65/head"; 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