diff options
| author | Florian Klink <flokli@flokli.de> | 2023-07-16 12:38:08 +0300 |
|---|---|---|
| committer | Florian Klink <flokli@flokli.de> | 2023-07-16 12:40:47 +0300 |
| commit | 1bbf604224abed2ce9fe1d8fb970b20d26a13f3a (patch) | |
| tree | fc94f0b9d5a40d63661e741a607cee43f3eeb792 | |
| parent | 6ba611361e6d3ae701ea211adddbed61ea338da7 (diff) | |
| download | garage-1bbf604224abed2ce9fe1d8fb970b20d26a13f3a.tar.gz garage-1bbf604224abed2ce9fe1d8fb970b20d26a13f3a.zip | |
flake.nix: switch to nix-community/flake-compat
edolstra/flake-compat is unmaintained.
cargo2nix also still pulls in edolstra/flake-compat, make it follow the
nix-community one.
| -rw-r--r-- | flake.lock | 20 | ||||
| -rw-r--r-- | flake.nix | 7 |
2 files changed, 14 insertions, 13 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 = { |