Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs

4 files changed, 34 insertions, 53 deletions

diff --git a/nixpkgs/pkgs/shells/nushell/plugins/default.nix b/nixpkgs/pkgs/shells/nushell/plugins/default.nix
index e79373da156e..44b5b05a739f 100644
--- a/nixpkgs/pkgs/shells/nushell/plugins/default.nix
+++ b/nixpkgs/pkgs/shells/nushell/plugins/default.nix
@@ -1,6 +1,7 @@
-{ lib, newScope, IOKit, CoreFoundation }:
+{ lib, newScope, IOKit, CoreFoundation, Foundation, Security }:
 
 lib.makeScope newScope (self: with self; {
-  gstat = callPackage ./gstat.nix { };
+  gstat = callPackage ./gstat.nix { inherit Security; };
+  formats = callPackage ./formats.nix { inherit IOKit Foundation; };
   query = callPackage ./query.nix { inherit IOKit CoreFoundation; };
 })
diff --git a/nixpkgs/pkgs/shells/nushell/plugins/formats.nix b/nixpkgs/pkgs/shells/nushell/plugins/formats.nix
new file mode 100644
index 000000000000..bc63789633a2
--- /dev/null
+++ b/nixpkgs/pkgs/shells/nushell/plugins/formats.nix
@@ -0,0 +1,29 @@
+{ stdenv
+, lib
+, rustPlatform
+, nushell
+, pkg-config
+, IOKit
+, Foundation
+}:
+
+let
+  pname = "nushell_plugin_formats";
+in
+rustPlatform.buildRustPackage {
+  inherit pname;
+  version = "0.84.0";
+  src = nushell.src;
+  cargoHash = "sha256-pwOdSJHd9njR0lr4n2EzCcqRonh0cbBHGZgAJ1l8FEk=";
+  nativeBuildInputs = [ pkg-config ];
+  buildInputs = [ IOKit Foundation ];
+  cargoBuildFlags = [ "--package nu_plugin_formats" ];
+  doCheck = false;
+  meta = with lib; {
+    description = "A formats plugin for Nushell";
+    homepage = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_formats";
+    license = licenses.mpl20;
+    maintainers = with maintainers; [ viraptor ];
+    platforms = with platforms; all;
+  };
+}
diff --git a/nixpkgs/pkgs/shells/nushell/plugins/gstat.nix b/nixpkgs/pkgs/shells/nushell/plugins/gstat.nix
index 4cab90c7e05a..39af12a6a935 100644
--- a/nixpkgs/pkgs/shells/nushell/plugins/gstat.nix
+++ b/nixpkgs/pkgs/shells/nushell/plugins/gstat.nix
@@ -4,6 +4,7 @@
 , openssl
 , nushell
 , pkg-config
+, Security
 }:
 
 let
@@ -15,7 +16,7 @@ rustPlatform.buildRustPackage {
   src = nushell.src;
   cargoHash = "sha256-RcwCYfIEV0+NbZ99uWaCOLqLap3wZ4qXIsc02fqkBSQ=";
   nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ openssl ];
+  buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ];
   cargoBuildFlags = [ "--package nu_plugin_gstat" ];
   doCheck = false; # some tests fail
   meta = with lib; {
diff --git a/nixpkgs/pkgs/shells/tcsh/default.nix b/nixpkgs/pkgs/shells/tcsh/default.nix
deleted file mode 100644
index 4fa358fbb7c3..000000000000
--- a/nixpkgs/pkgs/shells/tcsh/default.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{ lib
-, stdenv
-, fetchurl
-, libxcrypt
-, ncurses
-, buildPackages
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "tcsh";
-  version = "6.24.10";
-
-  src = fetchurl {
-    url = "mirror://tcsh/tcsh-${finalAttrs.version}.tar.gz";
-    hash = "sha256-E0dcD763QTnTPteTvwD/u7KsLcn7HURGekEHYKujZmQ=";
-  };
-
-  strictDeps = true;
-
-  depsBuildBuild = [
-    buildPackages.stdenv.cc
-  ];
-
-  buildInputs = [
-    libxcrypt
-    ncurses
-  ];
-
-  passthru.shellPath = "/bin/tcsh";
-
-  meta = {
-    homepage = "https://www.tcsh.org/";
-    description = "An enhanced version of the Berkeley UNIX C shell (csh)";
-    longDescription = ''
-      tcsh is an enhanced but completely compatible version of the Berkeley UNIX
-      C shell, csh. It is a command language interpreter usable both as an
-      interactive login shell and a shell script command processor.
-
-      It includes:
-      - command-line editor
-      - programmable word completion
-      - spelling correction
-      - history mechanism
-      - job control
-    '';
-    license = lib.licenses.bsd2;
-    maintainers = with lib.maintainers; [ AndersonTorres ];
-    platforms = lib.platforms.unix;
-  };
-})