Mechanical migration to FlakeHub

This commit is contained in:
Graham Christensen 2023-10-10 16:16:05 -04:00
parent 8f7cfe5b15
commit c055fa27f7
3 changed files with 37 additions and 52 deletions

View file

@ -12,33 +12,30 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1687310026, "lastModified": 1695511445,
"narHash": "sha256-20RHFbrnC+hsG4Hyeg/58LvQAK7JWfFItTPFAFamu8E=", "narHash": "sha256-mnE14re43v3/Jc50Jv0BKPMtEk7FEtDSligP6B5HwlI=",
"owner": "ipetkov", "rev": "3de322e06fc88ada5e3589dc8a375b73e749f512",
"repo": "crane", "revCount": 411,
"rev": "116b32c30b5ff28e49f4fcbeeb1bbe3544593204", "type": "tarball",
"type": "github" "url": "https://api.flakehub.com/f/pinned/ipetkov/crane/0.14.1/018ac45c-ff5e-7076-b956-d478a0336516/source.tar.gz"
}, },
"original": { "original": {
"owner": "ipetkov", "type": "tarball",
"repo": "crane", "url": "https://flakehub.com/f/ipetkov/crane/0.14.1.tar.gz"
"type": "github"
} }
}, },
"flake-compat": { "flake-compat": {
"flake": false,
"locked": { "locked": {
"lastModified": 1673956053, "lastModified": 1696426674,
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "edolstra", "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"repo": "flake-compat", "revCount": 57,
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", "type": "tarball",
"type": "github" "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz"
}, },
"original": { "original": {
"owner": "edolstra", "type": "tarball",
"repo": "flake-compat", "url": "https://flakehub.com/f/edolstra/flake-compat/1.0.1.tar.gz"
"type": "github"
} }
}, },
"flake-utils": { "flake-utils": {
@ -79,18 +76,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1686960236, "lastModified": 1696604326,
"narHash": "sha256-AYCC9rXNLpUWzD9hm+askOfpliLEC9kwAo7ITJc4HIw=", "narHash": "sha256-YXUNI0kLEcI5g8lqGMb0nh67fY9f2YoJsILafh6zlMo=",
"owner": "NixOS", "rev": "87828a0e03d1418e848d3dd3f3014a632e4a4f64",
"repo": "nixpkgs", "revCount": 533189,
"rev": "04af42f3b31dba0ef742d254456dc4c14eedac86", "type": "tarball",
"type": "github" "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.533189%2Brev-87828a0e03d1418e848d3dd3f3014a632e4a4f64/018b0dc8-e84f-7c59-b5d6-16849c3b2074/source.tar.gz"
}, },
"original": { "original": {
"owner": "NixOS", "type": "tarball",
"ref": "nixos-unstable", "url": "https://flakehub.com/f/NixOS/nixpkgs/0.1.533189.tar.gz"
"repo": "nixpkgs",
"type": "github"
} }
}, },
"root": { "root": {

View file

@ -2,7 +2,7 @@
description = "GitHub Actions-powered Nix binary cache"; description = "GitHub Actions-powered Nix binary cache";
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs.url = "https://flakehub.com/f/NixOS/nixpkgs/0.1.533189.tar.gz";
rust-overlay = { rust-overlay = {
url = "github:oxalica/rust-overlay"; url = "github:oxalica/rust-overlay";
@ -10,15 +10,12 @@
}; };
crane = { crane = {
url = "github:ipetkov/crane"; url = "https://flakehub.com/f/ipetkov/crane/0.14.1.tar.gz";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-compat.follows = "flake-compat"; inputs.flake-compat.follows = "flake-compat";
}; };
flake-compat = { flake-compat.url = "https://flakehub.com/f/edolstra/flake-compat/1.0.1.tar.gz";
url = "github:edolstra/flake-compat";
flake = false;
};
}; };
outputs = { self, nixpkgs, ... }@inputs: outputs = { self, nixpkgs, ... }@inputs:

View file

@ -1,17 +1,10 @@
let (import
lock = builtins.fromJSON (builtins.readFile ./flake.lock); (
let lock = builtins.fromJSON (builtins.readFile ./flake.lock); in
flake-compat = builtins.fetchTarball { 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; sha256 = lock.nodes.flake-compat.locked.narHash;
}; }
)
flake = import flake-compat { { src = ./.; }
src = ./.; ).shellNix
};
shell = flake.shellNix.default // {
reproduce = flake.defaultNix.outputs.reproduce.${builtins.currentSystem};
};
in
shell