From f741b550612103dafc1b2ff405de6a816ac5d760 Mon Sep 17 00:00:00 2001 From: seth Date: Thu, 7 Sep 2023 16:18:29 -0400 Subject: flake: switch to nixpkgs rust infra --- flake.nix | 43 +++++++++++-------------------------------- 1 file changed, 11 insertions(+), 32 deletions(-) (limited to 'flake.nix') diff --git a/flake.nix b/flake.nix index 8c7dfcb..e4ab295 100644 --- a/flake.nix +++ b/flake.nix @@ -18,42 +18,11 @@ inputs.nixpkgs-lib.follows = "nixpkgs"; }; - # used for cargo audit - advisory-db = { - url = "github:rustsec/advisory-db"; - flake = false; - }; - - # our build framework - crane = { - url = "github:ipetkov/crane"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.flake-compat.follows = "compat"; - inputs.flake-utils.follows = "utils"; - }; - - # toolchain management - fenix = { - url = "github:nix-community/fenix"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - pre-commit = { url = "github:cachix/pre-commit-hooks.nix"; inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs-stable.follows = "nixpkgs"; - inputs.flake-compat.follows = "compat"; - inputs.flake-utils.follows = "utils"; - }; - - # this is just to avoid having multiple versions in flake.lock - compat = { - url = "github:edolstra/flake-compat"; - flake = false; }; - - # ditto - utils.url = "github:numtide/flake-utils"; }; outputs = { @@ -64,7 +33,17 @@ parts.lib.mkFlake {inherit inputs;} { imports = [ pre-commit.flakeModule - ./parts + + ./parts/deployment.nix + ./parts/dev.nix + ./parts/packages.nix + ]; + + systems = [ + "x86_64-linux" + "x86_64-darwin" + "aarch64-linux" + "aarch64-darwin" ]; }; } -- cgit v1.2.3