From 55f62d32a25e709337cab557a0aeb795e620d704 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Tue, 10 Oct 2023 16:15:40 -0400 Subject: [PATCH] Mechanical migration to FlakeHub --- default.nix | 2 +- flake.lock | 36 ++++++++++++++++-------------------- flake.nix | 7 ++----- shell.nix | 2 +- 4 files changed, 20 insertions(+), 27 deletions(-) diff --git a/default.nix b/default.nix index 2cccff2..f620865 100644 --- a/default.nix +++ b/default.nix @@ -2,7 +2,7 @@ ( 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"; + 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; } ) diff --git a/flake.lock b/flake.lock index 0125692..7842e03 100644 --- a/flake.lock +++ b/flake.lock @@ -1,35 +1,31 @@ { "nodes": { "flake-compat": { - "flake": false, "locked": { - "lastModified": 1650374568, - "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "b4a34015c698c7793d592d66adbab377907a2be8", - "type": "github" + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "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" }, "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" + "type": "tarball", + "url": "https://flakehub.com/f/edolstra/flake-compat/1.0.1.tar.gz" } }, "nixpkgs": { "locked": { - "lastModified": 1654682581, - "narHash": "sha256-Jb1PQCwKgwdNAp907eR5zPzuxV+kRroA3UIxUxCMJ9s=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "e0169d7a9d324afebf5679551407756c77af8930", - "type": "github" + "lastModified": 1696604326, + "narHash": "sha256-YXUNI0kLEcI5g8lqGMb0nh67fY9f2YoJsILafh6zlMo=", + "rev": "87828a0e03d1418e848d3dd3f3014a632e4a4f64", + "revCount": 533189, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.533189%2Brev-87828a0e03d1418e848d3dd3f3014a632e4a4f64/018b0dc8-e84f-7c59-b5d6-16849c3b2074/source.tar.gz" }, "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" + "type": "tarball", + "url": "https://flakehub.com/f/NixOS/nixpkgs/0.1.533189.tar.gz" } }, "root": { diff --git a/flake.nix b/flake.nix index 9a11f25..6af1c30 100644 --- a/flake.nix +++ b/flake.nix @@ -1,12 +1,9 @@ { description = "zpool_part_disks"; - inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + inputs.nixpkgs.url = "https://flakehub.com/f/NixOS/nixpkgs/0.1.533189.tar.gz"; - inputs.flake-compat = { - url = github:edolstra/flake-compat; - flake = false; - }; + inputs.flake-compat.url = "https://flakehub.com/f/edolstra/flake-compat/1.0.1.tar.gz"; outputs = { self diff --git a/shell.nix b/shell.nix index 6234bb4..942ce01 100644 --- a/shell.nix +++ b/shell.nix @@ -2,7 +2,7 @@ ( 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"; + 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; } )