From 8f5dbe20090fb905261de872288e1921a0b9b634 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Jan 2026 04:14:53 +0000 Subject: [PATCH 1/3] nushell: 0.109.1 -> 0.110.0 --- pkgs/shells/nushell/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index 2b52179dc8ae4..4e5a2f2b24b90 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -23,7 +23,7 @@ let # NOTE: when updating this to a new non-patch version, please also try to # update the plugins. Plugins only work if they are compiled for the same # major/minor version. - version = "0.109.1"; + version = "0.110.0"; in rustPlatform.buildRustPackage { pname = "nushell"; @@ -33,10 +33,10 @@ rustPlatform.buildRustPackage { owner = "nushell"; repo = "nushell"; tag = version; - hash = "sha256-XNDEfmvmUNS90PU4e/EWFyJeg428R8nFPJHpF3tgRWo="; + hash = "sha256-iytTJZ70kg2Huwj/BSwDX4h9DVDTlJR2gEHAB2pGn/k="; }; - cargoHash = "sha256-UX0WmvrzrWlrTnvMqaWAxoSie7RzQSC4thEb26LAz+A="; + cargoHash = "sha256-a/N0a9ZVqXAjAl5Z7BdEsIp0He3h0S/owS0spEPb3KI="; nativeBuildInputs = [ pkg-config From 2c0617ed829b799c7e1b49b1e3c01ddba16d3db9 Mon Sep 17 00:00:00 2001 From: VuiMuich Date: Thu, 22 Jan 2026 12:08:27 +0100 Subject: [PATCH 2/3] nushell: move frome `pkgs/shells/nushell` to `pkgs/by-name/nu/nushell` --- .../nu/nushell-plugin-dbus/package.nix} | 0 .../package.nix} | 0 .../nu/nushell-plugin-formats/package.nix} | 0 .../nu/nushell-plugin-gstat/package.nix} | 0 .../nu/nushell-plugin-hcl/package.nix} | 0 .../nu/nushell-plugin-highlight/package.nix} | 0 .../nu/nushell-plugin-net/package.nix} | 0 .../nu/nushell-plugin-polars/package.nix} | 0 .../nu/nushell-plugin-query/package.nix} | 0 .../nu/nushell-plugin-semver/package.nix} | 0 .../nu/nushell-plugin-skim/package.nix} | 0 .../nu/nushell-plugin-units/package.nix} | 0 .../nu/nushell/package.nix} | 0 pkgs/shells/nushell/plugins/default.nix | 67 ------------------- pkgs/top-level/all-packages.nix | 24 +++++-- 15 files changed, 18 insertions(+), 73 deletions(-) rename pkgs/{shells/nushell/plugins/dbus.nix => by-name/nu/nushell-plugin-dbus/package.nix} (100%) rename pkgs/{shells/nushell/plugins/desktop_notifications.nix => by-name/nu/nushell-plugin-desktop_notifications/package.nix} (100%) rename pkgs/{shells/nushell/plugins/formats.nix => by-name/nu/nushell-plugin-formats/package.nix} (100%) rename pkgs/{shells/nushell/plugins/gstat.nix => by-name/nu/nushell-plugin-gstat/package.nix} (100%) rename pkgs/{shells/nushell/plugins/hcl.nix => by-name/nu/nushell-plugin-hcl/package.nix} (100%) rename pkgs/{shells/nushell/plugins/highlight.nix => by-name/nu/nushell-plugin-highlight/package.nix} (100%) rename pkgs/{shells/nushell/plugins/net.nix => by-name/nu/nushell-plugin-net/package.nix} (100%) rename pkgs/{shells/nushell/plugins/polars.nix => by-name/nu/nushell-plugin-polars/package.nix} (100%) rename pkgs/{shells/nushell/plugins/query.nix => by-name/nu/nushell-plugin-query/package.nix} (100%) rename pkgs/{shells/nushell/plugins/semver.nix => by-name/nu/nushell-plugin-semver/package.nix} (100%) rename pkgs/{shells/nushell/plugins/skim.nix => by-name/nu/nushell-plugin-skim/package.nix} (100%) rename pkgs/{shells/nushell/plugins/units.nix => by-name/nu/nushell-plugin-units/package.nix} (100%) rename pkgs/{shells/nushell/default.nix => by-name/nu/nushell/package.nix} (100%) delete mode 100644 pkgs/shells/nushell/plugins/default.nix diff --git a/pkgs/shells/nushell/plugins/dbus.nix b/pkgs/by-name/nu/nushell-plugin-dbus/package.nix similarity index 100% rename from pkgs/shells/nushell/plugins/dbus.nix rename to pkgs/by-name/nu/nushell-plugin-dbus/package.nix diff --git a/pkgs/shells/nushell/plugins/desktop_notifications.nix b/pkgs/by-name/nu/nushell-plugin-desktop_notifications/package.nix similarity index 100% rename from pkgs/shells/nushell/plugins/desktop_notifications.nix rename to pkgs/by-name/nu/nushell-plugin-desktop_notifications/package.nix diff --git a/pkgs/shells/nushell/plugins/formats.nix b/pkgs/by-name/nu/nushell-plugin-formats/package.nix similarity index 100% rename from pkgs/shells/nushell/plugins/formats.nix rename to pkgs/by-name/nu/nushell-plugin-formats/package.nix diff --git a/pkgs/shells/nushell/plugins/gstat.nix b/pkgs/by-name/nu/nushell-plugin-gstat/package.nix similarity index 100% rename from pkgs/shells/nushell/plugins/gstat.nix rename to pkgs/by-name/nu/nushell-plugin-gstat/package.nix diff --git a/pkgs/shells/nushell/plugins/hcl.nix b/pkgs/by-name/nu/nushell-plugin-hcl/package.nix similarity index 100% rename from pkgs/shells/nushell/plugins/hcl.nix rename to pkgs/by-name/nu/nushell-plugin-hcl/package.nix diff --git a/pkgs/shells/nushell/plugins/highlight.nix b/pkgs/by-name/nu/nushell-plugin-highlight/package.nix similarity index 100% rename from pkgs/shells/nushell/plugins/highlight.nix rename to pkgs/by-name/nu/nushell-plugin-highlight/package.nix diff --git a/pkgs/shells/nushell/plugins/net.nix b/pkgs/by-name/nu/nushell-plugin-net/package.nix similarity index 100% rename from pkgs/shells/nushell/plugins/net.nix rename to pkgs/by-name/nu/nushell-plugin-net/package.nix diff --git a/pkgs/shells/nushell/plugins/polars.nix b/pkgs/by-name/nu/nushell-plugin-polars/package.nix similarity index 100% rename from pkgs/shells/nushell/plugins/polars.nix rename to pkgs/by-name/nu/nushell-plugin-polars/package.nix diff --git a/pkgs/shells/nushell/plugins/query.nix b/pkgs/by-name/nu/nushell-plugin-query/package.nix similarity index 100% rename from pkgs/shells/nushell/plugins/query.nix rename to pkgs/by-name/nu/nushell-plugin-query/package.nix diff --git a/pkgs/shells/nushell/plugins/semver.nix b/pkgs/by-name/nu/nushell-plugin-semver/package.nix similarity index 100% rename from pkgs/shells/nushell/plugins/semver.nix rename to pkgs/by-name/nu/nushell-plugin-semver/package.nix diff --git a/pkgs/shells/nushell/plugins/skim.nix b/pkgs/by-name/nu/nushell-plugin-skim/package.nix similarity index 100% rename from pkgs/shells/nushell/plugins/skim.nix rename to pkgs/by-name/nu/nushell-plugin-skim/package.nix diff --git a/pkgs/shells/nushell/plugins/units.nix b/pkgs/by-name/nu/nushell-plugin-units/package.nix similarity index 100% rename from pkgs/shells/nushell/plugins/units.nix rename to pkgs/by-name/nu/nushell-plugin-units/package.nix diff --git a/pkgs/shells/nushell/default.nix b/pkgs/by-name/nu/nushell/package.nix similarity index 100% rename from pkgs/shells/nushell/default.nix rename to pkgs/by-name/nu/nushell/package.nix diff --git a/pkgs/shells/nushell/plugins/default.nix b/pkgs/shells/nushell/plugins/default.nix deleted file mode 100644 index b8424c75b3bfa..0000000000000 --- a/pkgs/shells/nushell/plugins/default.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ - lib, - config, - newScope, - dbus, - versionCheckHook, - nushell, - runCommand, -}: - -lib.makeScope newScope ( - self: - - lib.mapAttrs - ( - _n: p: - let - # add two checks: - # - `versionCheckhook`, checks wether it's a binary that is able to - # display its own version - # - A check which loads the plugin into the current version of nushell, - # to detect incompatibilities (plugins are compiled for very specific - # versions of nushell). If this fails, either update the plugin or mark - # as broken. - withChecks = p.overrideAttrs ( - final: _prev: { - doInstallCheck = true; - nativeInstallCheckInputs = [ versionCheckHook ]; - - passthru.tests.loadCheck = - let - nu = lib.getExe nushell; - plugin = lib.getExe withChecks; - in - runCommand "test-load-${final.pname}" { } '' - touch $out - ${nu} -n -c "plugin add --plugin-config $out ${plugin}" - ${nu} -n -c "plugin use --plugin-config $out ${plugin}" - ''; - } - ); - in - withChecks - ) - ( - with self; - { - gstat = callPackage ./gstat.nix { }; - formats = callPackage ./formats.nix { }; - polars = callPackage ./polars.nix { }; - query = callPackage ./query.nix { }; - net = callPackage ./net.nix { }; - units = callPackage ./units.nix { }; - highlight = callPackage ./highlight.nix { }; - dbus = callPackage ./dbus.nix { - inherit dbus; - }; - skim = callPackage ./skim.nix { }; - semver = callPackage ./semver.nix { }; - hcl = callPackage ./hcl.nix { }; - desktop_notifications = callPackage ./desktop_notifications.nix { }; - } - // lib.optionalAttrs config.allowAliases { - regex = throw "`nu_plugin_regex` is no longer compatible with the current Nushell release."; - } - ) -) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7d3d396b73cc6..dbc98bdf827b8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9377,12 +9377,24 @@ with pkgs; inherit modules; }; - nushell = callPackage ../shells/nushell { }; - - nushellPlugins = recurseIntoAttrs ( - callPackage ../shells/nushell/plugins { - } - ); + nushellPlugins = recurseIntoAttrs { + gstat = callPackage ../by-name/nu/nushell-plugin-gstat/package.nix { }; + formats = callPackage ../by-name/nu/nushell-plugin-formats/package.nix { }; + polars = callPackage ../by-name/nu/nushell-plugin-polars/package.nix { }; + query = callPackage ../by-name/nu/nushell-plugin-query/package.nix { }; + net = callPackage ../by-name/nu/nushell-plugin-net/package.nix { }; + units = callPackage ../by-name/nu/nushell-plugin-units/package.nix { }; + highlight = callPackage ../by-name/nu/nushell-plugin-highlight/package.nix { }; + dbus = callPackage ../by-name/nu/nushell-plugin-dbus/package.nix { + inherit dbus; + }; + skim = callPackage ../by-name/nu/nushell-plugin-skim/package.nix { }; + semver = callPackage ../by-name/nu/nushell-plugin-semver/package.nix { }; + hcl = callPackage ../by-name/nu/nushell-plugin-hcl/package.nix { }; + desktop_notifications = + callPackage ../by-name/nu/nushell-plugin-desktop_notifications/package.nix + { }; + }; net-tools = # some platforms refer back to this from unixtools, so this is needed to From 4bf45c17dbc9656fd23102c66dfdc594b31a48b4 Mon Sep 17 00:00:00 2001 From: VuiMuich Date: Fri, 23 Jan 2026 09:16:44 +0100 Subject: [PATCH 3/3] nushellPlugins: update for nushell 0.110.0 desktop_notifications 0.108.0 -> 0.110.0 hcl 0.108.0 -> 0.110.0 highlights 1.4.10+0.108.0 -> 1.4.12+0.110.0 semver 0.11.8 -> 0.11.10 skim 0.20.1 -> 0.22.0 --- .../nu/nushell-plugin-desktop_notifications/package.nix | 6 +++--- pkgs/by-name/nu/nushell-plugin-hcl/package.nix | 6 +++--- pkgs/by-name/nu/nushell-plugin-highlight/package.nix | 6 +++--- pkgs/by-name/nu/nushell-plugin-semver/package.nix | 6 +++--- pkgs/by-name/nu/nushell-plugin-skim/package.nix | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/nu/nushell-plugin-desktop_notifications/package.nix b/pkgs/by-name/nu/nushell-plugin-desktop_notifications/package.nix index 6886e659903f2..88d363befbd44 100644 --- a/pkgs/by-name/nu/nushell-plugin-desktop_notifications/package.nix +++ b/pkgs/by-name/nu/nushell-plugin-desktop_notifications/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "nu_plugin_desktop_notifications"; - version = "0.108.0"; + version = "0.110.0"; src = fetchFromGitHub { owner = "FMotalleb"; repo = "nu_plugin_desktop_notifications"; tag = "v${finalAttrs.version}"; - hash = "sha256-9NkWPoTdMxFlI/BkP8w0ltC6UVh3/tg9gjwBuS3k/Cg="; + hash = "sha256-jd4T0+id/1rpjOWuzqbqxnyvmoe4LCiYux/dJlO3F6c="; }; - cargoHash = "sha256-GK6ytH/SDHh6GlLrSA2oJLza1tvYOUp4cR5CM6bloz8="; + cargoHash = "sha256-7ZiQr8RBQCNQK3/tLasilZcu+HWp066iDFI67L8iZMg="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/nu/nushell-plugin-hcl/package.nix b/pkgs/by-name/nu/nushell-plugin-hcl/package.nix index 8576fe1cfb264..1897861520c2e 100644 --- a/pkgs/by-name/nu/nushell-plugin-hcl/package.nix +++ b/pkgs/by-name/nu/nushell-plugin-hcl/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "nu_plugin_hcl"; - version = "0.108.0"; + version = "0.110.0"; src = fetchFromGitHub { owner = "Yethal"; repo = "nu_plugin_hcl"; tag = finalAttrs.version; - hash = "sha256-WyZ8uSYWNzurqpE+BP0hKsknurP7Iyf5L8Y5DjVQZsA="; + hash = "sha256-8P0gNLe8OjB3NoDxHtDUp859O1O4WwmDeACJe5u8GPg="; }; - cargoHash = "sha256-2b/0B9W01gGuGc482DYQSbRR2LLZXQxUG2fYB5TklPQ="; + cargoHash = "sha256-ACtnklcypc2gjWujPSLUgwGbah2G+QHLD7fr7S7QNAg="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; diff --git a/pkgs/by-name/nu/nushell-plugin-highlight/package.nix b/pkgs/by-name/nu/nushell-plugin-highlight/package.nix index 2c119c71a676b..716eba425c105 100644 --- a/pkgs/by-name/nu/nushell-plugin-highlight/package.nix +++ b/pkgs/by-name/nu/nushell-plugin-highlight/package.nix @@ -9,17 +9,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "nu_plugin_highlight"; - version = "1.4.10+0.108.0"; + version = "1.4.12+0.110.0"; src = fetchFromGitHub { owner = "cptpiepmatz"; repo = "nu-plugin-highlight"; tag = "v${finalAttrs.version}"; - hash = "sha256-ynvLvGMxFiYOYGPDdlv1509lWU5DpfBK9Mwa9gLeHsI="; + hash = "sha256-20b+EiB95BzDVWibWQuG8ozPRV8LbxG7fHEbyTk3xTE="; fetchSubmodules = true; }; - cargoHash = "sha256-Xq7ctnzcrSPzo3M3p3Vxtj0U0U9Miw+2VuyYs6P3GlQ="; + cargoHash = "sha256-pkLcTjZYLERMhK18zPdfldHrECHXQpcg5i6rsyxw7nQ="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; diff --git a/pkgs/by-name/nu/nushell-plugin-semver/package.nix b/pkgs/by-name/nu/nushell-plugin-semver/package.nix index 131106f8c63bd..9be26f55ebcb5 100644 --- a/pkgs/by-name/nu/nushell-plugin-semver/package.nix +++ b/pkgs/by-name/nu/nushell-plugin-semver/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "nu_plugin_semver"; - version = "0.11.8"; + version = "0.11.14"; src = fetchFromGitHub { owner = "abusch"; repo = "nu_plugin_semver"; tag = "v${finalAttrs.version}"; - hash = "sha256-ui9zyE5g4LiU2+Csv4p0D61fmPXaDMhnpQ34ggEg3eA="; + hash = "sha256-mfwgwY/iYdMz8Qn6a9zfpMHWHl2n1Q8ClkT+KiCAGyk="; }; - cargoHash = "sha256-5W0GbKz18rQ+3TjNanzV4H4LE/7TLZ+8/FbGHffE2RY="; + cargoHash = "sha256-5zVqMUC+wg2joo1DKuTUdRwsC5iH7uuyML9SnB2bZCs="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/nu/nushell-plugin-skim/package.nix b/pkgs/by-name/nu/nushell-plugin-skim/package.nix index 80060c2ea7a4c..62529940b4265 100644 --- a/pkgs/by-name/nu/nushell-plugin-skim/package.nix +++ b/pkgs/by-name/nu/nushell-plugin-skim/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "nu_plugin_skim"; - version = "0.20.1"; + version = "0.22.0"; src = fetchFromGitHub { owner = "idanarye"; repo = "nu_plugin_skim"; tag = "v${finalAttrs.version}"; - hash = "sha256-2CqgtV2DnBd8HqnRdZRiT14aw+meaX4A3ndTGvbsMfo="; + hash = "sha256-TdsemIPbknJiglxhQwBch8iJ9GVa+Sj3fqSq4xaDqfk="; }; - cargoHash = "sha256-3Kua+gZl4Ff6jfSNyEVDbPVH4YfGXhwtuEjcUADecQE="; + cargoHash = "sha256-vpRL4oiOmhnGO+eWWTA7/RvVrtouVzqJvPGZY/cHeXY="; nativeBuildInputs = lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ];