From 2205cff99453efbf6982233b1e5e17e6ce1d87e3 Mon Sep 17 00:00:00 2001 From: Luc Perkins Date: Sun, 31 Jul 2022 16:47:47 +0200 Subject: [PATCH] nix flake update --- dhall/flake.lock | 6 +++--- elixir/flake.lock | 6 +++--- flake.lock | 6 +++--- gleam/flake.lock | 6 +++--- go1.17/flake.lock | 6 +++--- go1.18/flake.lock | 6 +++--- java/flake.lock | 6 +++--- kotlin/flake.lock | 6 +++--- nix/flake.lock | 6 +++--- node/flake.lock | 6 +++--- protobuf/flake.lock | 6 +++--- rust/flake.lock | 6 +++--- rust/flake.nix | 17 ++++++++--------- scala/flake.lock | 6 +++--- zig/flake.lock | 6 +++--- 15 files changed, 50 insertions(+), 51 deletions(-) diff --git a/dhall/flake.lock b/dhall/flake.lock index ecd6fc6..4a2ed74 100644 --- a/dhall/flake.lock +++ b/dhall/flake.lock @@ -6,11 +6,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1659267309, - "narHash": "sha256-yqjVIIjt9TDwgmM4rDVzRbKIKt8/qnOfm4HbIcWAGt0=", + "lastModified": 1659267324, + "narHash": "sha256-4tw7i8eWEREPi8PXjyeiOYpJxlNd2dbvbPSFEX3ercE=", "owner": "the-nix-way", "repo": "dev-templates", - "rev": "27aff4187bcd95ff63a0cd4b430c769106366a6d", + "rev": "d9171fe68fb0f631a74137a0318fcfb0af0e7fb1", "type": "github" }, "original": { diff --git a/elixir/flake.lock b/elixir/flake.lock index ecd6fc6..4a2ed74 100644 --- a/elixir/flake.lock +++ b/elixir/flake.lock @@ -6,11 +6,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1659267309, - "narHash": "sha256-yqjVIIjt9TDwgmM4rDVzRbKIKt8/qnOfm4HbIcWAGt0=", + "lastModified": 1659267324, + "narHash": "sha256-4tw7i8eWEREPi8PXjyeiOYpJxlNd2dbvbPSFEX3ercE=", "owner": "the-nix-way", "repo": "dev-templates", - "rev": "27aff4187bcd95ff63a0cd4b430c769106366a6d", + "rev": "d9171fe68fb0f631a74137a0318fcfb0af0e7fb1", "type": "github" }, "original": { diff --git a/flake.lock b/flake.lock index dfc0601..a09a4d8 100644 --- a/flake.lock +++ b/flake.lock @@ -17,11 +17,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1659267036, - "narHash": "sha256-GYonXhS69TqxukmUFK1ffdv01H6kGfbVk7e57ktSGhE=", + "lastModified": 1659278667, + "narHash": "sha256-bMYOv8PT2iVSaGfCBXUI60q3PZC8iUiLMObwIizAKmQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "21f29cb290bb75c1b9ee4ecf7a29f6c0d3a58dd5", + "rev": "af8d62fc40483aa04016c03743d198da25ea9320", "type": "github" }, "original": { diff --git a/gleam/flake.lock b/gleam/flake.lock index ecd6fc6..4a2ed74 100644 --- a/gleam/flake.lock +++ b/gleam/flake.lock @@ -6,11 +6,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1659267309, - "narHash": "sha256-yqjVIIjt9TDwgmM4rDVzRbKIKt8/qnOfm4HbIcWAGt0=", + "lastModified": 1659267324, + "narHash": "sha256-4tw7i8eWEREPi8PXjyeiOYpJxlNd2dbvbPSFEX3ercE=", "owner": "the-nix-way", "repo": "dev-templates", - "rev": "27aff4187bcd95ff63a0cd4b430c769106366a6d", + "rev": "d9171fe68fb0f631a74137a0318fcfb0af0e7fb1", "type": "github" }, "original": { diff --git a/go1.17/flake.lock b/go1.17/flake.lock index ecd6fc6..4a2ed74 100644 --- a/go1.17/flake.lock +++ b/go1.17/flake.lock @@ -6,11 +6,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1659267309, - "narHash": "sha256-yqjVIIjt9TDwgmM4rDVzRbKIKt8/qnOfm4HbIcWAGt0=", + "lastModified": 1659267324, + "narHash": "sha256-4tw7i8eWEREPi8PXjyeiOYpJxlNd2dbvbPSFEX3ercE=", "owner": "the-nix-way", "repo": "dev-templates", - "rev": "27aff4187bcd95ff63a0cd4b430c769106366a6d", + "rev": "d9171fe68fb0f631a74137a0318fcfb0af0e7fb1", "type": "github" }, "original": { diff --git a/go1.18/flake.lock b/go1.18/flake.lock index ecd6fc6..4a2ed74 100644 --- a/go1.18/flake.lock +++ b/go1.18/flake.lock @@ -6,11 +6,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1659267309, - "narHash": "sha256-yqjVIIjt9TDwgmM4rDVzRbKIKt8/qnOfm4HbIcWAGt0=", + "lastModified": 1659267324, + "narHash": "sha256-4tw7i8eWEREPi8PXjyeiOYpJxlNd2dbvbPSFEX3ercE=", "owner": "the-nix-way", "repo": "dev-templates", - "rev": "27aff4187bcd95ff63a0cd4b430c769106366a6d", + "rev": "d9171fe68fb0f631a74137a0318fcfb0af0e7fb1", "type": "github" }, "original": { diff --git a/java/flake.lock b/java/flake.lock index ecd6fc6..4a2ed74 100644 --- a/java/flake.lock +++ b/java/flake.lock @@ -6,11 +6,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1659267309, - "narHash": "sha256-yqjVIIjt9TDwgmM4rDVzRbKIKt8/qnOfm4HbIcWAGt0=", + "lastModified": 1659267324, + "narHash": "sha256-4tw7i8eWEREPi8PXjyeiOYpJxlNd2dbvbPSFEX3ercE=", "owner": "the-nix-way", "repo": "dev-templates", - "rev": "27aff4187bcd95ff63a0cd4b430c769106366a6d", + "rev": "d9171fe68fb0f631a74137a0318fcfb0af0e7fb1", "type": "github" }, "original": { diff --git a/kotlin/flake.lock b/kotlin/flake.lock index ecd6fc6..4a2ed74 100644 --- a/kotlin/flake.lock +++ b/kotlin/flake.lock @@ -6,11 +6,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1659267309, - "narHash": "sha256-yqjVIIjt9TDwgmM4rDVzRbKIKt8/qnOfm4HbIcWAGt0=", + "lastModified": 1659267324, + "narHash": "sha256-4tw7i8eWEREPi8PXjyeiOYpJxlNd2dbvbPSFEX3ercE=", "owner": "the-nix-way", "repo": "dev-templates", - "rev": "27aff4187bcd95ff63a0cd4b430c769106366a6d", + "rev": "d9171fe68fb0f631a74137a0318fcfb0af0e7fb1", "type": "github" }, "original": { diff --git a/nix/flake.lock b/nix/flake.lock index ecd6fc6..4a2ed74 100644 --- a/nix/flake.lock +++ b/nix/flake.lock @@ -6,11 +6,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1659267309, - "narHash": "sha256-yqjVIIjt9TDwgmM4rDVzRbKIKt8/qnOfm4HbIcWAGt0=", + "lastModified": 1659267324, + "narHash": "sha256-4tw7i8eWEREPi8PXjyeiOYpJxlNd2dbvbPSFEX3ercE=", "owner": "the-nix-way", "repo": "dev-templates", - "rev": "27aff4187bcd95ff63a0cd4b430c769106366a6d", + "rev": "d9171fe68fb0f631a74137a0318fcfb0af0e7fb1", "type": "github" }, "original": { diff --git a/node/flake.lock b/node/flake.lock index ecd6fc6..4a2ed74 100644 --- a/node/flake.lock +++ b/node/flake.lock @@ -6,11 +6,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1659267309, - "narHash": "sha256-yqjVIIjt9TDwgmM4rDVzRbKIKt8/qnOfm4HbIcWAGt0=", + "lastModified": 1659267324, + "narHash": "sha256-4tw7i8eWEREPi8PXjyeiOYpJxlNd2dbvbPSFEX3ercE=", "owner": "the-nix-way", "repo": "dev-templates", - "rev": "27aff4187bcd95ff63a0cd4b430c769106366a6d", + "rev": "d9171fe68fb0f631a74137a0318fcfb0af0e7fb1", "type": "github" }, "original": { diff --git a/protobuf/flake.lock b/protobuf/flake.lock index ecd6fc6..4a2ed74 100644 --- a/protobuf/flake.lock +++ b/protobuf/flake.lock @@ -6,11 +6,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1659267309, - "narHash": "sha256-yqjVIIjt9TDwgmM4rDVzRbKIKt8/qnOfm4HbIcWAGt0=", + "lastModified": 1659267324, + "narHash": "sha256-4tw7i8eWEREPi8PXjyeiOYpJxlNd2dbvbPSFEX3ercE=", "owner": "the-nix-way", "repo": "dev-templates", - "rev": "27aff4187bcd95ff63a0cd4b430c769106366a6d", + "rev": "d9171fe68fb0f631a74137a0318fcfb0af0e7fb1", "type": "github" }, "original": { diff --git a/rust/flake.lock b/rust/flake.lock index 36ddc84..697c917 100644 --- a/rust/flake.lock +++ b/rust/flake.lock @@ -6,11 +6,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1659267309, - "narHash": "sha256-yqjVIIjt9TDwgmM4rDVzRbKIKt8/qnOfm4HbIcWAGt0=", + "lastModified": 1659267324, + "narHash": "sha256-4tw7i8eWEREPi8PXjyeiOYpJxlNd2dbvbPSFEX3ercE=", "owner": "the-nix-way", "repo": "dev-templates", - "rev": "27aff4187bcd95ff63a0cd4b430c769106366a6d", + "rev": "d9171fe68fb0f631a74137a0318fcfb0af0e7fb1", "type": "github" }, "original": { diff --git a/rust/flake.nix b/rust/flake.nix index b9b7758..5e0f7b1 100644 --- a/rust/flake.nix +++ b/rust/flake.nix @@ -13,7 +13,10 @@ overlays = [ (import rust-overlay) ]; 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-bin.fromRustupToolchainFile ./rust-toolchain.toml @@ -22,19 +25,15 @@ else rust-bin.stable.latest.default; - helpers = with pkgs; [ openssl pkgconfig ]; - - inherit (pkgs) mkShell; - inherit (pkgs.lib) optionals; - inherit (pkgs.stdenv) isDarwin; + deps = with pkgs; [ openssl pkgconfig ]; + rustTools = with pkgs; + [ cargo-profiler rust-analyzer ] ++ optionals isLinux (with pkgs; [ cargo-watch ]); in { packages.default = rust; devShells = { default = mkShell { - nativeBuildInputs = [ rust ]; - - buildInputs = helpers; + nativeBuildInputs = [ rust ] ++ deps ++ rustTools; shellHook = '' ${rust}/bin/cargo --version diff --git a/scala/flake.lock b/scala/flake.lock index ecd6fc6..4a2ed74 100644 --- a/scala/flake.lock +++ b/scala/flake.lock @@ -6,11 +6,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1659267309, - "narHash": "sha256-yqjVIIjt9TDwgmM4rDVzRbKIKt8/qnOfm4HbIcWAGt0=", + "lastModified": 1659267324, + "narHash": "sha256-4tw7i8eWEREPi8PXjyeiOYpJxlNd2dbvbPSFEX3ercE=", "owner": "the-nix-way", "repo": "dev-templates", - "rev": "27aff4187bcd95ff63a0cd4b430c769106366a6d", + "rev": "d9171fe68fb0f631a74137a0318fcfb0af0e7fb1", "type": "github" }, "original": { diff --git a/zig/flake.lock b/zig/flake.lock index ecd6fc6..4a2ed74 100644 --- a/zig/flake.lock +++ b/zig/flake.lock @@ -6,11 +6,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1659267309, - "narHash": "sha256-yqjVIIjt9TDwgmM4rDVzRbKIKt8/qnOfm4HbIcWAGt0=", + "lastModified": 1659267324, + "narHash": "sha256-4tw7i8eWEREPi8PXjyeiOYpJxlNd2dbvbPSFEX3ercE=", "owner": "the-nix-way", "repo": "dev-templates", - "rev": "27aff4187bcd95ff63a0cd4b430c769106366a6d", + "rev": "d9171fe68fb0f631a74137a0318fcfb0af0e7fb1", "type": "github" }, "original": {