diff --git a/flake.lock b/flake.lock index d28aa5f..09a5415 100644 --- a/flake.lock +++ b/flake.lock @@ -12,33 +12,30 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1687310026, - "narHash": "sha256-20RHFbrnC+hsG4Hyeg/58LvQAK7JWfFItTPFAFamu8E=", - "owner": "ipetkov", - "repo": "crane", - "rev": "116b32c30b5ff28e49f4fcbeeb1bbe3544593204", - "type": "github" + "lastModified": 1695511445, + "narHash": "sha256-mnE14re43v3/Jc50Jv0BKPMtEk7FEtDSligP6B5HwlI=", + "rev": "3de322e06fc88ada5e3589dc8a375b73e749f512", + "revCount": 411, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/ipetkov/crane/0.14.1/018ac45c-ff5e-7076-b956-d478a0336516/source.tar.gz" }, "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" + "type": "tarball", + "url": "https://flakehub.com/f/ipetkov/crane/0.14.1.tar.gz" } }, "flake-compat": { - "flake": false, "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "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" } }, "flake-utils": { @@ -79,18 +76,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1686960236, - "narHash": "sha256-AYCC9rXNLpUWzD9hm+askOfpliLEC9kwAo7ITJc4HIw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "04af42f3b31dba0ef742d254456dc4c14eedac86", - "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 a2c3822..fbc8285 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "GitHub Actions-powered Nix binary cache"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs.url = "https://flakehub.com/f/NixOS/nixpkgs/0.1.533189.tar.gz"; rust-overlay = { url = "github:oxalica/rust-overlay"; @@ -10,15 +10,12 @@ }; crane = { - url = "github:ipetkov/crane"; + url = "https://flakehub.com/f/ipetkov/crane/0.14.1.tar.gz"; inputs.nixpkgs.follows = "nixpkgs"; inputs.flake-compat.follows = "flake-compat"; }; - flake-compat = { - url = "github:edolstra/flake-compat"; - flake = false; - }; + flake-compat.url = "https://flakehub.com/f/edolstra/flake-compat/1.0.1.tar.gz"; }; outputs = { self, nixpkgs, ... }@inputs: diff --git a/shell.nix b/shell.nix index a63c7ee..942ce01 100644 --- a/shell.nix +++ b/shell.nix @@ -1,17 +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 // { - reproduce = flake.defaultNix.outputs.reproduce.${builtins.currentSystem}; - }; -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