From 7f49fe88bba613853c285da190077cec1fe66880 Mon Sep 17 00:00:00 2001 From: Aidan Gauland Date: Tue, 12 Sep 2023 08:54:21 +1200 Subject: nushellPlugins: inherit version from nushell These are inheriting nushell.src, but specify the version string separately. Either both or neither should be inherited. --- pkgs/shells/nushell/plugins/formats.nix | 5 ++--- pkgs/shells/nushell/plugins/gstat.nix | 5 ++--- pkgs/shells/nushell/plugins/query.nix | 5 +---- 3 files changed, 5 insertions(+), 10 deletions(-) (limited to 'pkgs/shells') diff --git a/pkgs/shells/nushell/plugins/formats.nix b/pkgs/shells/nushell/plugins/formats.nix index 974121f88e2ea..4adc936a8a803 100644 --- a/pkgs/shells/nushell/plugins/formats.nix +++ b/pkgs/shells/nushell/plugins/formats.nix @@ -7,10 +7,9 @@ , Foundation }: -rustPlatform.buildRustPackage { +rustPlatform.buildRustPackage rec { pname = "nushell_plugin_formats"; - version = "0.85.0"; - src = nushell.src; + inherit (nushell) version src; cargoHash = "sha256-WS8VRpJnn/VWS7GUkGowFf51ifUx0SbEZzcoTfx2dp0="; nativeBuildInputs = [ pkg-config ]; buildInputs = lib.optionals stdenv.isDarwin [ IOKit Foundation ]; diff --git a/pkgs/shells/nushell/plugins/gstat.nix b/pkgs/shells/nushell/plugins/gstat.nix index d78642b41554b..746a3669b0f2a 100644 --- a/pkgs/shells/nushell/plugins/gstat.nix +++ b/pkgs/shells/nushell/plugins/gstat.nix @@ -7,10 +7,9 @@ , Security }: -rustPlatform.buildRustPackage { +rustPlatform.buildRustPackage rec { pname = "nushell_plugin_gstat"; - version = "0.85.0"; - src = nushell.src; + inherit (nushell) version src; cargoHash = "sha256-6luY3SIRRd9vaY9KIJcj8Q974FW0LtAvRjVpdpzkdLo="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/shells/nushell/plugins/query.nix b/pkgs/shells/nushell/plugins/query.nix index cc7106ae1c897..a9526dfefd22e 100644 --- a/pkgs/shells/nushell/plugins/query.nix +++ b/pkgs/shells/nushell/plugins/query.nix @@ -9,10 +9,7 @@ rustPlatform.buildRustPackage { pname = "nushell_plugin_query"; - version = "0.85.0"; - - src = nushell.src; - + inherit (nushell) version src; cargoHash = "sha256-xyty3GfI+zNkuHs7LYHBctqXUHZ4/MNNcnnfYvI18do="; buildInputs = lib.optionals stdenv.isDarwin [ IOKit CoreFoundation ]; -- cgit 1.4.1