Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "xrootd: provide fuse support (xrootdfs) for Darwin and fix the tests" #214315

Merged
merged 1 commit into from
Feb 3, 2023
Merged

Revert "xrootd: provide fuse support (xrootdfs) for Darwin and fix the tests" #214315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions pkgs/tools/networking/xrootd/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 { };
};

Expand All @@ -52,7 +47,6 @@ stdenv.mkDerivation rec {

buildInputs = [
curl
fuse
libkrb5
libuuid
libxcrypt
Expand All @@ -62,6 +56,7 @@ stdenv.mkDerivation rec {
zlib
]
++ lib.optionals stdenv.isLinux [
fuse
systemd
voms
]
Expand Down
19 changes: 0 additions & 19 deletions pkgs/tools/networking/xrootd/test-xrdcp.nix
View file
Open in desktop

This file was deleted.

7 changes: 1 addition & 6 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 { };

Expand Down