diff --git a/flake.lock b/flake.lock index 046466d..95138f2 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1717285511, - "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", + "lastModified": 1727826117, + "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", + "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", "type": "github" }, "original": { @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1717196966, - "narHash": "sha256-yZKhxVIKd2lsbOqYd5iDoUIwsRZFqE87smE2Vzf6Ck0=", + "lastModified": 1728492678, + "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "57610d2f8f0937f39dbd72251e9614b1561942d8", + "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 5025388..6efd6f7 100644 --- a/flake.nix +++ b/flake.nix @@ -13,7 +13,6 @@ outputs = { self, flake-parts, - nixpkgs, systems, ... } @ inputs: @@ -32,19 +31,25 @@ # provide the formatter for nix fmt formatter = pkgs.alejandra; - devShells.default = pkgs.mkShell { - inputsFrom = builtins.attrValues self'.packages; + devShells = { + default = pkgs.mkShell { + inputsFrom = builtins.attrValues self'.packages; + packages = with pkgs; [ + rustc # rust compiler + gcc + cargo # rust package manager + clippy # opinionated rust formatter + ]; + }; - packages = with pkgs; [ - alejandra # nix formatter - rustfmt # rust formatter - statix # lints and suggestions - deadnix # clean up unused nix code - rustc # rust compiler - gcc - cargo # rust package manager - clippy # opinionated rust formatter - ]; + nix = pkgs.mkShellNoCC { + packages = with pkgs; [ + alejandra # nix formatter + rustfmt # rust formatter + statix # lints and suggestions + deadnix # clean up unused nix code + ]; + }; }; packages = let @@ -60,9 +65,11 @@ }; in { default = self'.packages.anyrun; - anyrun = callPackage ./nix/default.nix {inherit inputs lockFile;}; - anyrun-with-all-plugins = pkgs.callPackage ./nix/default.nix { + # By default the anyrun package is built without any plugins + # as per the `dontBuildPlugins` arg. + anyrun = callPackage ./nix/default.nix {inherit inputs lockFile;}; + anyrun-with-all-plugins = callPackage ./nix/default.nix { inherit inputs lockFile; dontBuildPlugins = false; };