Merge master into staging-next staging-next

3 files changed, 6 insertions, 40 deletions

diff --git a/pkgs/development/tools/analysis/lcov/default.nix b/pkgs/development/tools/analysis/lcov/default.nix
index c5e3b43eea061..0ed0ef816f092 100644
--- a/pkgs/development/tools/analysis/lcov/default.nix
+++ b/pkgs/development/tools/analysis/lcov/default.nix
@@ -16,9 +16,8 @@ let
     perlPackages.DevelCover
     perlPackages.GD
     perlPackages.JSONXS
-    perlPackages.MemoryProcess
     perlPackages.PathTools
-  ];
+  ] ++ lib.optionals (!stdenv.isDarwin) [ perlPackages.MemoryProcess ];
 in
 stdenv.mkDerivation rec {
   pname = "lcov";
diff --git a/pkgs/development/tools/fx/default.nix b/pkgs/development/tools/fx/default.nix
deleted file mode 100644
index bcb458f0b6478..0000000000000
--- a/pkgs/development/tools/fx/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
-
-buildGoModule rec {
-  pname = "fx";
-  version = "34.0.0";
-
-  src = fetchFromGitHub {
-    owner = "antonmedv";
-    repo = pname;
-    rev = version;
-    hash = "sha256-gVeeCJOqrEua5quID1n1928oHtP9gfIDe4erVn1y2Eo=";
-  };
-
-  nativeBuildInputs = [ installShellFiles ];
-
-  vendorHash = "sha256-otORAeD9+J6/10TDusEnFfRRxTb/52Zk7Ttaw46xnsU=/sTS1mJw=";
-
-  postInstall = ''
-    installShellCompletion --cmd fx \
-      --bash <($out/bin/fx --comp bash) \
-      --fish <($out/bin/fx --comp fish) \
-      --zsh <($out/bin/fx --comp zsh)
-  '';
-
-  meta = with lib; {
-    description = "Terminal JSON viewer";
-    mainProgram = "fx";
-    homepage = "https://github.com/antonmedv/fx";
-    changelog = "https://github.com/antonmedv/fx/releases/tag/${src.rev}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
-  };
-}
diff --git a/pkgs/development/tools/railway/default.nix b/pkgs/development/tools/railway/default.nix
index c9e219f82bd47..100aba324db36 100644
--- a/pkgs/development/tools/railway/default.nix
+++ b/pkgs/development/tools/railway/default.nix
@@ -1,23 +1,23 @@
 { lib, rustPlatform, fetchFromGitHub, pkg-config, openssl, stdenv, CoreServices
-, Security }:
+, Security, SystemConfiguration }:
 
 rustPlatform.buildRustPackage rec {
   pname = "railway";
-  version = "3.9.0";
+  version = "3.9.3";
 
   src = fetchFromGitHub {
     owner = "railwayapp";
     repo = "cli";
     rev = "v${version}";
-    hash = "sha256-eMbeU9DflGXQRqoXnTlMmCJUsCvAywjmckDqxhT+LD8=";
+    hash = "sha256-8K+awKsSQotPqVJg7SkpPCjenU6a/cqEZogqwQAe0I8=";
   };
 
-  cargoHash = "sha256-rYHvvGyD49+n7DHHd0CKCwd6w5WgWONWGxW2vXm7DL4=";
+  cargoHash = "sha256-2KNSPn0zrx5zwF9g29x3/L/ptza+NstBu4Lc1PR4ymE=";
 
   nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [ openssl ]
-    ++ lib.optionals stdenv.isDarwin [ CoreServices Security ];
+    ++ lib.optionals stdenv.isDarwin [ CoreServices Security SystemConfiguration ];
 
   OPENSSL_NO_VENDOR = 1;