nix flake update

This commit is contained in:
Luc Perkins 2022-07-31 16:47:47 +02:00
parent d9171fe68f
commit 2205cff994
No known key found for this signature in database
GPG key ID: 4F102D0C16E232F2
15 changed files with 50 additions and 51 deletions

View file

@ -6,11 +6,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1659267309, "lastModified": 1659267324,
"narHash": "sha256-yqjVIIjt9TDwgmM4rDVzRbKIKt8/qnOfm4HbIcWAGt0=", "narHash": "sha256-4tw7i8eWEREPi8PXjyeiOYpJxlNd2dbvbPSFEX3ercE=",
"owner": "the-nix-way", "owner": "the-nix-way",
"repo": "dev-templates", "repo": "dev-templates",
"rev": "27aff4187bcd95ff63a0cd4b430c769106366a6d", "rev": "d9171fe68fb0f631a74137a0318fcfb0af0e7fb1",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -6,11 +6,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1659267309, "lastModified": 1659267324,
"narHash": "sha256-yqjVIIjt9TDwgmM4rDVzRbKIKt8/qnOfm4HbIcWAGt0=", "narHash": "sha256-4tw7i8eWEREPi8PXjyeiOYpJxlNd2dbvbPSFEX3ercE=",
"owner": "the-nix-way", "owner": "the-nix-way",
"repo": "dev-templates", "repo": "dev-templates",
"rev": "27aff4187bcd95ff63a0cd4b430c769106366a6d", "rev": "d9171fe68fb0f631a74137a0318fcfb0af0e7fb1",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -17,11 +17,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1659267036, "lastModified": 1659278667,
"narHash": "sha256-GYonXhS69TqxukmUFK1ffdv01H6kGfbVk7e57ktSGhE=", "narHash": "sha256-bMYOv8PT2iVSaGfCBXUI60q3PZC8iUiLMObwIizAKmQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "21f29cb290bb75c1b9ee4ecf7a29f6c0d3a58dd5", "rev": "af8d62fc40483aa04016c03743d198da25ea9320",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -6,11 +6,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1659267309, "lastModified": 1659267324,
"narHash": "sha256-yqjVIIjt9TDwgmM4rDVzRbKIKt8/qnOfm4HbIcWAGt0=", "narHash": "sha256-4tw7i8eWEREPi8PXjyeiOYpJxlNd2dbvbPSFEX3ercE=",
"owner": "the-nix-way", "owner": "the-nix-way",
"repo": "dev-templates", "repo": "dev-templates",
"rev": "27aff4187bcd95ff63a0cd4b430c769106366a6d", "rev": "d9171fe68fb0f631a74137a0318fcfb0af0e7fb1",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -6,11 +6,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1659267309, "lastModified": 1659267324,
"narHash": "sha256-yqjVIIjt9TDwgmM4rDVzRbKIKt8/qnOfm4HbIcWAGt0=", "narHash": "sha256-4tw7i8eWEREPi8PXjyeiOYpJxlNd2dbvbPSFEX3ercE=",
"owner": "the-nix-way", "owner": "the-nix-way",
"repo": "dev-templates", "repo": "dev-templates",
"rev": "27aff4187bcd95ff63a0cd4b430c769106366a6d", "rev": "d9171fe68fb0f631a74137a0318fcfb0af0e7fb1",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -6,11 +6,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1659267309, "lastModified": 1659267324,
"narHash": "sha256-yqjVIIjt9TDwgmM4rDVzRbKIKt8/qnOfm4HbIcWAGt0=", "narHash": "sha256-4tw7i8eWEREPi8PXjyeiOYpJxlNd2dbvbPSFEX3ercE=",
"owner": "the-nix-way", "owner": "the-nix-way",
"repo": "dev-templates", "repo": "dev-templates",
"rev": "27aff4187bcd95ff63a0cd4b430c769106366a6d", "rev": "d9171fe68fb0f631a74137a0318fcfb0af0e7fb1",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -6,11 +6,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1659267309, "lastModified": 1659267324,
"narHash": "sha256-yqjVIIjt9TDwgmM4rDVzRbKIKt8/qnOfm4HbIcWAGt0=", "narHash": "sha256-4tw7i8eWEREPi8PXjyeiOYpJxlNd2dbvbPSFEX3ercE=",
"owner": "the-nix-way", "owner": "the-nix-way",
"repo": "dev-templates", "repo": "dev-templates",
"rev": "27aff4187bcd95ff63a0cd4b430c769106366a6d", "rev": "d9171fe68fb0f631a74137a0318fcfb0af0e7fb1",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -6,11 +6,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1659267309, "lastModified": 1659267324,
"narHash": "sha256-yqjVIIjt9TDwgmM4rDVzRbKIKt8/qnOfm4HbIcWAGt0=", "narHash": "sha256-4tw7i8eWEREPi8PXjyeiOYpJxlNd2dbvbPSFEX3ercE=",
"owner": "the-nix-way", "owner": "the-nix-way",
"repo": "dev-templates", "repo": "dev-templates",
"rev": "27aff4187bcd95ff63a0cd4b430c769106366a6d", "rev": "d9171fe68fb0f631a74137a0318fcfb0af0e7fb1",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -6,11 +6,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1659267309, "lastModified": 1659267324,
"narHash": "sha256-yqjVIIjt9TDwgmM4rDVzRbKIKt8/qnOfm4HbIcWAGt0=", "narHash": "sha256-4tw7i8eWEREPi8PXjyeiOYpJxlNd2dbvbPSFEX3ercE=",
"owner": "the-nix-way", "owner": "the-nix-way",
"repo": "dev-templates", "repo": "dev-templates",
"rev": "27aff4187bcd95ff63a0cd4b430c769106366a6d", "rev": "d9171fe68fb0f631a74137a0318fcfb0af0e7fb1",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -6,11 +6,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1659267309, "lastModified": 1659267324,
"narHash": "sha256-yqjVIIjt9TDwgmM4rDVzRbKIKt8/qnOfm4HbIcWAGt0=", "narHash": "sha256-4tw7i8eWEREPi8PXjyeiOYpJxlNd2dbvbPSFEX3ercE=",
"owner": "the-nix-way", "owner": "the-nix-way",
"repo": "dev-templates", "repo": "dev-templates",
"rev": "27aff4187bcd95ff63a0cd4b430c769106366a6d", "rev": "d9171fe68fb0f631a74137a0318fcfb0af0e7fb1",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -6,11 +6,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1659267309, "lastModified": 1659267324,
"narHash": "sha256-yqjVIIjt9TDwgmM4rDVzRbKIKt8/qnOfm4HbIcWAGt0=", "narHash": "sha256-4tw7i8eWEREPi8PXjyeiOYpJxlNd2dbvbPSFEX3ercE=",
"owner": "the-nix-way", "owner": "the-nix-way",
"repo": "dev-templates", "repo": "dev-templates",
"rev": "27aff4187bcd95ff63a0cd4b430c769106366a6d", "rev": "d9171fe68fb0f631a74137a0318fcfb0af0e7fb1",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -6,11 +6,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1659267309, "lastModified": 1659267324,
"narHash": "sha256-yqjVIIjt9TDwgmM4rDVzRbKIKt8/qnOfm4HbIcWAGt0=", "narHash": "sha256-4tw7i8eWEREPi8PXjyeiOYpJxlNd2dbvbPSFEX3ercE=",
"owner": "the-nix-way", "owner": "the-nix-way",
"repo": "dev-templates", "repo": "dev-templates",
"rev": "27aff4187bcd95ff63a0cd4b430c769106366a6d", "rev": "d9171fe68fb0f631a74137a0318fcfb0af0e7fb1",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -13,7 +13,10 @@
overlays = [ (import rust-overlay) ]; overlays = [ (import rust-overlay) ];
pkgs = import nixpkgs { inherit system overlays; }; pkgs = import nixpkgs { inherit system overlays; };
inherit (pkgs) rust-bin;
inherit (pkgs) mkShell rust-bin;
inherit (pkgs.lib) optionals;
inherit (pkgs.stdenv) isLinux;
rust = if builtins.pathExists ./rust-toolchain.toml then rust = if builtins.pathExists ./rust-toolchain.toml then
rust-bin.fromRustupToolchainFile ./rust-toolchain.toml rust-bin.fromRustupToolchainFile ./rust-toolchain.toml
@ -22,19 +25,15 @@
else else
rust-bin.stable.latest.default; rust-bin.stable.latest.default;
helpers = with pkgs; [ openssl pkgconfig ]; deps = with pkgs; [ openssl pkgconfig ];
rustTools = with pkgs;
inherit (pkgs) mkShell; [ cargo-profiler rust-analyzer ] ++ optionals isLinux (with pkgs; [ cargo-watch ]);
inherit (pkgs.lib) optionals;
inherit (pkgs.stdenv) isDarwin;
in { in {
packages.default = rust; packages.default = rust;
devShells = { devShells = {
default = mkShell { default = mkShell {
nativeBuildInputs = [ rust ]; nativeBuildInputs = [ rust ] ++ deps ++ rustTools;
buildInputs = helpers;
shellHook = '' shellHook = ''
${rust}/bin/cargo --version ${rust}/bin/cargo --version

View file

@ -6,11 +6,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1659267309, "lastModified": 1659267324,
"narHash": "sha256-yqjVIIjt9TDwgmM4rDVzRbKIKt8/qnOfm4HbIcWAGt0=", "narHash": "sha256-4tw7i8eWEREPi8PXjyeiOYpJxlNd2dbvbPSFEX3ercE=",
"owner": "the-nix-way", "owner": "the-nix-way",
"repo": "dev-templates", "repo": "dev-templates",
"rev": "27aff4187bcd95ff63a0cd4b430c769106366a6d", "rev": "d9171fe68fb0f631a74137a0318fcfb0af0e7fb1",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -6,11 +6,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1659267309, "lastModified": 1659267324,
"narHash": "sha256-yqjVIIjt9TDwgmM4rDVzRbKIKt8/qnOfm4HbIcWAGt0=", "narHash": "sha256-4tw7i8eWEREPi8PXjyeiOYpJxlNd2dbvbPSFEX3ercE=",
"owner": "the-nix-way", "owner": "the-nix-way",
"repo": "dev-templates", "repo": "dev-templates",
"rev": "27aff4187bcd95ff63a0cd4b430c769106366a6d", "rev": "d9171fe68fb0f631a74137a0318fcfb0af0e7fb1",
"type": "github" "type": "github"
}, },
"original": { "original": {