From 679cb8ff4db11edf3ac27b188f75a3cc55909cd5 Mon Sep 17 00:00:00 2001 From: happysalada Date: Sat, 25 Nov 2023 11:33:16 +0100 Subject: [PATCH] nushellPlugins: update for nu 0.87.1 and build on hydra --- pkgs/shells/nushell/plugins/formats.nix | 2 +- pkgs/shells/nushell/plugins/gstat.nix | 2 +- pkgs/shells/nushell/plugins/net.nix | 8 ++++---- pkgs/shells/nushell/plugins/query.nix | 2 +- pkgs/top-level/all-packages.nix | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/shells/nushell/plugins/formats.nix b/pkgs/shells/nushell/plugins/formats.nix index 15c134018e65..279edd1f6bca 100644 --- a/pkgs/shells/nushell/plugins/formats.nix +++ b/pkgs/shells/nushell/plugins/formats.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { pname = "nushell_plugin_formats"; inherit (nushell) version src; - cargoHash = "sha256-fpqXXgvTuRnU4NkJ/B4m3VTkeujE7sMWOma4KEvlxYw="; + cargoHash = "sha256-rryKNRCf8i/jlqN5O6+UDvV5tDNxcVxS+KewCaIlZVM="; 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 10ab89368a86..5e3a8186245f 100644 --- a/pkgs/shells/nushell/plugins/gstat.nix +++ b/pkgs/shells/nushell/plugins/gstat.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { pname = "nushell_plugin_gstat"; inherit (nushell) version src; - cargoHash = "sha256-o/cOHlwo2TBlO+e6DBBKf5x6bgVGozVNMGRb2nCWPT4="; + cargoHash = "sha256-9wUOKj6kMfXEFdYvVBqxme4MRkR6HORx+spTVT9t9VM="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/shells/nushell/plugins/net.nix b/pkgs/shells/nushell/plugins/net.nix index 031fa30eb61e..97fa54b19634 100644 --- a/pkgs/shells/nushell/plugins/net.nix +++ b/pkgs/shells/nushell/plugins/net.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage { pname = "nu-plugin-net"; - version = "unstable-2023-10-24"; + version = "unstable-2023-11-15"; src = fetchFromGitHub { owner = "fennewald"; repo = "nu_plugin_net"; - rev = "8b63996ea2ff8bf282c9b0f5f6d01960cfe3d074"; - hash = "sha256-QFo2cMI41GDBsuPNay5MyVyY+HdrLjAWedz8kDNA3JY="; + rev = "20a0a18be0e11650f453d6f186d99d3691a1cd6a"; + hash = "sha256-GHUis38mz9sI5s+E/eLyA0XPyuNpPoS1TyhU3pMEsvs="; }; - cargoHash = "sha256-ekfUQOsaWdpDASnRzoYh5Y/p3BnP7rvSYCCWQ6DJDnE="; + cargoHash = "sha256-T5kUVtJty8pfPihtkJqCgF3AUFcBuu2cwX4cVGM8n5U="; nativeBuildInputs = [ rustPlatform.bindgenHook diff --git a/pkgs/shells/nushell/plugins/query.nix b/pkgs/shells/nushell/plugins/query.nix index 72094adc2a70..0994182305c4 100644 --- a/pkgs/shells/nushell/plugins/query.nix +++ b/pkgs/shells/nushell/plugins/query.nix @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage { pname = "nushell_plugin_query"; inherit (nushell) version src; - cargoHash = "sha256-seqr4FZHg/f/8iMwSurJRKr41pUbKKti6H2z/JfYkuU="; + cargoHash = "sha256-HCGq0tvSNvWlZBD0Kn9H9qKFW+VgGON3z2ly3qaURSE="; buildInputs = lib.optionals stdenv.isDarwin [ IOKit CoreFoundation ]; cargoBuildFlags = [ "--package nu_plugin_query" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 44e8876d1977..743d895c07f0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28321,9 +28321,9 @@ with pkgs; nu_scripts = callPackage ../shells/nushell/nu_scripts { }; - nushellPlugins = callPackage ../shells/nushell/plugins { + nushellPlugins = recurseIntoAttrs (callPackage ../shells/nushell/plugins { inherit (darwin.apple_sdk_11_0.frameworks) IOKit CoreFoundation Foundation Security; - }; + }); nettools = if stdenv.isLinux then callPackage ../os-specific/linux/net-tools { }