Unverified Commit d6ccd765 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

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

Revert "xrootd: provide fuse support (xrootdfs) for Darwin and fix the tests"
parents 89fae351 d9dec0c4

pkgs/tools/networking/xrootd/default.nix

+1 −6
Original line number Diff line number Diff line
@@ -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

  ]

pkgs/tools/networking/xrootd/test-xrdcp.nix

deleted100644 → 0
+0 −19
Original line number Diff line number Diff line 
{ lib

, runCommandLocal

, buildPlatform

, xrootd

, url

, hash

}: runCommandLocal (baseNameOf url)

{

  nativeBuildInputs = [ xrootd ];

  outputHashAlgo = null;

  outputHashMode = "flat";

  outputHash = hash;

  inherit url;

}

# Set [DY]LD_LIBRARY_PATH to workaround #169677

# TODO: Remove the library path after #200830 get merged

''

  ${lib.optionalString buildPlatform.isDarwin "DY"}LD_LIBRARY_PATH=${lib.makeLibraryPath [ xrootd ]} xrdcp --force "$url" "$out"

''

pkgs/top-level/all-packages.nix

+1 −6
Original line number Diff line number Diff line
@@ -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 { };