diff options
| -rw-r--r-- | flake.lock | 20 | ||||
| -rw-r--r-- | flake.nix | 7 | ||||
| -rw-r--r-- | nix/common.nix | 21 |
3 files changed, 26 insertions, 22 deletions
@@ -2,7 +2,9 @@ "nodes": { "cargo2nix": { "inputs": { - "flake-compat": "flake-compat", + "flake-compat": [ + "flake-compat" + ], "flake-utils": "flake-utils", "nixpkgs": [ "nixpkgs" @@ -25,17 +27,16 @@ } }, "flake-compat": { - "flake": false, "locked": { - "lastModified": 1650374568, - "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", - "owner": "edolstra", + "lastModified": 1688025799, + "narHash": "sha256-ktpB4dRtnksm9F5WawoIkEneh1nrEvuxb5lJFt1iOyw=", + "owner": "nix-community", "repo": "flake-compat", - "rev": "b4a34015c698c7793d592d66adbab377907a2be8", + "rev": "8bf105319d44f6b9f0d764efa4fdef9f1cc9ba1c", "type": "github" }, "original": { - "owner": "edolstra", + "owner": "nix-community", "repo": "flake-compat", "type": "github" } @@ -111,10 +112,7 @@ "root": { "inputs": { "cargo2nix": "cargo2nix", - "flake-compat": [ - "cargo2nix", - "flake-compat" - ], + "flake-compat": "flake-compat", "flake-utils": [ "cargo2nix", "flake-utils" @@ -6,6 +6,8 @@ inputs.nixpkgs.url = "github:NixOS/nixpkgs/94517a501434a627c5d9e72ac6e7f26174b978d3"; + inputs.flake-compat.url = "github:nix-community/flake-compat"; + inputs.cargo2nix = { # As of 2022-10-18: two small patches over unstable branch, one for clippy and one to fix feature detection url = "github:Alexis211/cargo2nix/a7a61179b66054904ef6a195d8da736eaaa06c36"; @@ -20,16 +22,17 @@ "github:oxalica/rust-overlay/74f1a64dd28faeeb85ef081f32cad2989850322c"; inputs.nixpkgs.follows = "nixpkgs"; + inputs.flake-compat.follows = "flake-compat"; }; inputs.flake-utils.follows = "cargo2nix/flake-utils"; - inputs.flake-compat.follows = "cargo2nix/flake-compat"; outputs = { self, nixpkgs, cargo2nix, flake-utils, ... }: let git_version = self.lastModifiedDate; compile = import ./nix/compile.nix; - in flake-utils.lib.eachDefaultSystem (system: + in + flake-utils.lib.eachDefaultSystem (system: let pkgs = nixpkgs.legacyPackages.${system}; in { packages = { diff --git a/nix/common.nix b/nix/common.nix index acc5ce7e..323c3882 100644 --- a/nix/common.nix +++ b/nix/common.nix @@ -1,14 +1,17 @@ let lock = builtins.fromJSON (builtins.readFile ../flake.lock); - flakeCompatRev = lock.nodes.flake-compat.locked.rev; - flakeCompat = fetchTarball { - url = - "https://github.com/edolstra/flake-compat/archive/${flakeCompatRev}.tar.gz"; - sha256 = lock.nodes.flake-compat.locked.narHash; + + inherit (lock.nodes.flake-compat.locked) owner repo rev narHash; + + flake-compat = fetchTarball { + url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; + sha256 = narHash; }; - flake = ((import flakeCompat) { src = ../.; }).defaultNix; -in rec { - pkgsSrc = flake.inputs.nixpkgs; - cargo2nix = flake.inputs.cargo2nix; + + flake = (import flake-compat { system = builtins.currentSystem; src = ../.; }); +in +rec { + pkgsSrc = flake.defaultNix.inputs.nixpkgs; + cargo2nix = flake.defaultNix.inputs.cargo2nix; cargo2nixOverlay = cargo2nix.overlays.default; } |