Merge pull request #214315 from NixOS/revert-206969-xrootd-fuse

Revert "xrootd: provide fuse support (xrootdfs) for Darwin and fix the tests"
NixOS · Feb 3, 2023 · d6ccd76 · d6ccd76
2 parents 89fae35 + d9dec0c
commit d6ccd76
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 31 deletions.
diff --git a/pkgs/tools/networking/xrootd/default.nix b/pkgs/tools/networking/xrootd/default.nix
@@ -37,11 +37,6 @@ stdenv.mkDerivation rec {
   outputs = [ "bin" "out" "dev" "man" ];
 
   passthru.tests = lib.optionalAttrs enableTests {
-    test-xrdcp = callPackage ./test-xrdcp.nix {
-      url = "root://eospublic.cern.ch//eos/opendata/alice/2010/LHC10h/000138275/ESD/0000/AliESDs.root";
-      hash = "sha256-tIcs2oi+8u/Qr+P7AAaPTbQT+DEt26gEdc4VNerlEHY=";
-    };
-  } // lib.optionalAttrs stdenv.isLinux {
     test-runner = callPackage ./test-runner.nix { };
   };
 
@@ -52,7 +47,6 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     curl
-    fuse
     libkrb5
     libuuid
     libxcrypt
@@ -62,6 +56,7 @@ stdenv.mkDerivation rec {
     zlib
   ]
   ++ lib.optionals stdenv.isLinux [
+    fuse
     systemd
     voms
   ]

diff --git a/pkgs/tools/networking/xrootd/test-xrdcp.nix b/pkgs/tools/networking/xrootd/test-xrdcp.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -1601,12 +1601,7 @@ with pkgs;
 
   xpaste = callPackage ../tools/text/xpaste { };
 
-  xrootd = callPackage ../tools/networking/xrootd {
-    fuse =
-      if hostPlatform.isDarwin then osxfuse
-      else if hostPlatform.isLinux then fuse
-      else null;
-  };
+  xrootd = callPackage ../tools/networking/xrootd { };
 
   xtrt = callPackage ../tools/archivers/xtrt { };