diff --git a/flake.lock b/flake.lock index 3634f57..bb835dd 100644 --- a/flake.lock +++ b/flake.lock @@ -21,11 +21,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1707385478, - "narHash": "sha256-xwKXoBeiwfp+jqQxt3O0mUxrBXsNfdBn15teMMWbw0U=", + "lastModified": 1707524024, + "narHash": "sha256-HmumZ8FuWAAYZrWUKm3N4G4h8nmZ5VUVX+vXLmCJNKM=", "owner": "nix-community", "repo": "disko", - "rev": "15b52c3c8a718253e66f1b92f595dc47873fdfea", + "rev": "d07de570ba05cec2807d058daaa044f6955720c7", "type": "github" }, "original": { @@ -88,11 +88,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1707175763, - "narHash": "sha256-0MKHC6tQ4KEuM5rui6DjKZ/VNiSANB4E+DJ/+wPS1PU=", + "lastModified": 1707683400, + "narHash": "sha256-Zc+J3UO1Xpx+NL8UB6woPHyttEy9cXXtm+0uWwzuYDc=", "owner": "nix-community", "repo": "home-manager", - "rev": "f99eace7c167b8a6a0871849493b1c613d0f1b80", + "rev": "21b078306a2ab68748abf72650db313d646cf2ca", "type": "github" }, "original": { @@ -212,11 +212,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1707391491, - "narHash": "sha256-TyDXcq8Z3slMNeyeF+ke0BzISWuM6NrBklr7XyiRbZA=", + "lastModified": 1707603439, + "narHash": "sha256-LodBVZ3+ehJP2azM5oj+JrhfNAAzmTJ/OwAIOn0RfZ0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bc6cb3d59b7aab88e967264254f8c1aa4c0284e9", + "rev": "d8cd80616c8800feec0cab64331d7c3d5a1a6d98", "type": "github" }, "original": { @@ -228,11 +228,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1706732774, - "narHash": "sha256-hqJlyJk4MRpcItGYMF+3uHe8HvxNETWvlGtLuVpqLU0=", + "lastModified": 1707268954, + "narHash": "sha256-2en1kvde3cJVc3ZnTy8QeD2oKcseLFjYPLKhIGDanQ0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b8b232ae7b8b144397fdb12d20f592e5e7c1a64d", + "rev": "f8e2ebd66d097614d51a56a755450d4ae1632df1", "type": "github" }, "original": { @@ -291,11 +291,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1707268954, - "narHash": "sha256-2en1kvde3cJVc3ZnTy8QeD2oKcseLFjYPLKhIGDanQ0=", + "lastModified": 1707546158, + "narHash": "sha256-nYYJTpzfPMDxI8mzhQsYjIUX+grorqjKEU9Np6Xwy/0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f8e2ebd66d097614d51a56a755450d4ae1632df1", + "rev": "d934204a0f8d9198e1e4515dd6fec76a139c87f0", "type": "github" }, "original": { @@ -307,11 +307,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1707268954, - "narHash": "sha256-2en1kvde3cJVc3ZnTy8QeD2oKcseLFjYPLKhIGDanQ0=", + "lastModified": 1707451808, + "narHash": "sha256-UwDBUNHNRsYKFJzyTMVMTF5qS4xeJlWoeyJf+6vvamU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f8e2ebd66d097614d51a56a755450d4ae1632df1", + "rev": "442d407992384ed9c0e6d352de75b69079904e4e", "type": "github" }, "original": { @@ -339,11 +339,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1707397511, - "narHash": "sha256-pYqXcTjcPC/go3FzT1dYtYsbmzAjO1MHhT/xgiI6J7o=", + "lastModified": 1707620614, + "narHash": "sha256-gfAoB9dGzBu62NoAoM945aok7+6M+LFu+nvnGwAsTp4=", "owner": "Mic92", "repo": "sops-nix", - "rev": "2168851d58595431ee11ebfc3a49d60d318b7312", + "rev": "2eb7c4ba3aa75e2660fd217eb1ab64d5b793608e", "type": "github" }, "original": { diff --git a/template/rust/flake.nix b/template/rust/flake.nix index 6b55a78..3934c01 100644 --- a/template/rust/flake.nix +++ b/template/rust/flake.nix @@ -33,7 +33,12 @@ # MY_CUSTOM_VAR = "some value"; }; - craneLibLLvmTools = craneLib.overrideToolchain fenixPkgs.complete; + craneLibLLvmTools = craneLib.overrideToolchain + (fenixPkgs.complete.withComponents [ + "cargo" + "llvm-tools" + "rustc" + ]); # Build *just* the cargo dependencies, so we can reuse # all of that work (e.g. via cachix) when running in CI @@ -92,7 +97,8 @@ packages = { default = crate; - llvm-coverage = craneLibLLvmTools.cargoLlvmCov (commonArgs // { + } // pkgs.lib.optionalAttrs (!pkgs.stdenv.isDarwin) { + my-crate-llvm-coverage = craneLibLLvmTools.cargoLlvmCov (commonArgs // { inherit cargoArtifacts; }); };