diff --git a/flake.lock b/flake.lock index fe4ea03..957dc1d 100644 --- a/flake.lock +++ b/flake.lock @@ -19,30 +19,9 @@ "root": { "inputs": { "nixpkgs": "nixpkgs", - "rust-overlay": "rust-overlay", "systems": "systems" } }, - "rust-overlay": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1746758179, - "narHash": "sha256-JECUw1YBEsTsVauvupRzE5ykZaJoyhHCpoY87ZZJGas=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "4fd00513eac6b6140c5dced3e1b8133e2369a0f8", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, "systems": { "locked": { "lastModified": 1689347949, diff --git a/flake.nix b/flake.nix index a7f3f60..bf63f2e 100644 --- a/flake.nix +++ b/flake.nix @@ -3,35 +3,29 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; systems.url = "github:nix-systems/default-linux"; - rust-overlay = { - url = "github:oxalica/rust-overlay"; - inputs.nixpkgs.follows = "nixpkgs"; - }; }; outputs = inputs: let - inherit (inputs.nixpkgs) lib; - systems = [ - "x86_64-linux" - "aarch64-linux" - "x86_64-darwin" - "aarch64-darwin" - ]; - eachSystem = lib.genAttrs systems; - pkgsFor = eachSystem (system: - import inputs.nixpkgs { - localSystem.system = system; - overlays = [(import inputs.rust-overlay)]; - }); + eachSystem = inputs.nixpkgs.lib.genAttrs (import inputs.systems); + pkgsFor = inputs.nixpkgs.legacyPackages; in { + packages = eachSystem (system: { + default = inputs.self.packages.${system}.ralc; + ralc = pkgsFor.${system}.callPackage ./nix/package.nix {}; + }); + devShells = eachSystem (system: { default = pkgsFor.${system}.mkShell { packages = builtins.attrValues { inherit - (pkgsFor.${system}.rust-bin.nightly.latest) + (pkgsFor.${system}) cargo rustc rustfmt + bacon + ; + inherit + (pkgsFor.${system}.rustPackages) clippy ; };