git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #74053 from flokli/remove-beegfs

beegfs: remove test, module and package

commitcaca39eb8e4202e911c277f4adad460b176b643a authorRobin Gloster <mail@glob.in> dateSun 24 Nov 2019, 18:34 (7 years ago) parentd4b87898ab403c
10 files changed+10−691
nixos/doc/manual/release-notes/rl-2003.xml+5 nixos/modules/module-list.nix−1 nixos/modules/rename.nix+4 nixos/modules/services/network-filesystems/beegfs.nix−357 nixos/tests/all-tests.nix−1 nixos/tests/beegfs.nix−115 pkgs/os-specific/linux/beegfs/default.nix−167 pkgs/os-specific/linux/beegfs/kernel-module.nix−46 pkgs/top-level/aliases.nix+1 pkgs/top-level/all-packages.nix−4
nixos/doc/manual/release-notes/rl-2003.xml+5
@@ -176,6 +176,11 @@
176176 KDE’s old multimedia framework Phonon no longer supports Qt 4. For that reason, Plasma desktop also does not have <option>enableQt4Support</option> option any more.
177177 </para>
178178 </listitem>
179+ <listitem>
180+ <para>
181+ The BeeGFS module has been removed.
182+ </para>
183+ </listitem>
179184 </itemizedlist>
180185 </section>
181186
nixos/modules/module-list.nix−1
@@ -538,7 +538,6 @@
538538 ./services/monitoring/zabbix-agent.nix
539539 ./services/monitoring/zabbix-proxy.nix
540540 ./services/monitoring/zabbix-server.nix
541− ./services/network-filesystems/beegfs.nix
542541 ./services/network-filesystems/cachefilesd.nix
543542 ./services/network-filesystems/davfs2.nix
544543 ./services/network-filesystems/drbd.nix
nixos/modules/rename.nix+4
@@ -280,6 +280,10 @@ with lib;
280280 # BLCR
281281 (mkRemovedOptionModule [ "environment.blcr.enable" ] "The BLCR module has been removed")
282282
283+ # beegfs
284+ (mkRemovedOptionModule [ "services.beegfsEnable" ] "The BeeGFS module has been removed")
285+ (mkRemovedOptionModule [ "services.beegfs" ] "The BeeGFS module has been removed")
286+
283287 # Redis
284288 (mkRemovedOptionModule [ "services" "redis" "user" ] "The redis module now is hardcoded to the redis user.")
285289 (mkRemovedOptionModule [ "services" "redis" "dbpath" ] "The redis module now uses /var/lib/redis as data directory.")
nixos/modules/services/network-filesystems/beegfs.nixdeleted−357
@@ -1,357 +0,0 @@
1−{ config, lib, pkgs, ...} :
2−
3−with lib;
4−
5−let
6− cfg = config.services.beegfs;
7−
8− # functions for the generations of config files
9−
10− configMgmtd = name: cfg: pkgs.writeText "mgmt-${name}.conf" ''
11− storeMgmtdDirectory = ${cfg.mgmtd.storeDir}
12− storeAllowFirstRunInit = false
13− connAuthFile = ${cfg.connAuthFile}
14− connPortShift = ${toString cfg.connPortShift}
15−
16− ${cfg.mgmtd.extraConfig}
17− '';
18−
19− configAdmon = name: cfg: pkgs.writeText "admon-${name}.conf" ''
20− sysMgmtdHost = ${cfg.mgmtdHost}
21− connAuthFile = ${cfg.connAuthFile}
22− connPortShift = ${toString cfg.connPortShift}
23−
24− ${cfg.admon.extraConfig}
25− '';
26−
27− configMeta = name: cfg: pkgs.writeText "meta-${name}.conf" ''
28− storeMetaDirectory = ${cfg.meta.storeDir}
29− sysMgmtdHost = ${cfg.mgmtdHost}
30− connAuthFile = ${cfg.connAuthFile}
31− connPortShift = ${toString cfg.connPortShift}
32− storeAllowFirstRunInit = false
33−
34− ${cfg.meta.extraConfig}
35− '';
36−
37− configStorage = name: cfg: pkgs.writeText "storage-${name}.conf" ''
38− storeStorageDirectory = ${cfg.storage.storeDir}
39− sysMgmtdHost = ${cfg.mgmtdHost}
40− connAuthFile = ${cfg.connAuthFile}
41− connPortShift = ${toString cfg.connPortShift}
42− storeAllowFirstRunInit = false
43−
44− ${cfg.storage.extraConfig}
45− '';
46−
47− configHelperd = name: cfg: pkgs.writeText "helperd-${name}.conf" ''
48− connAuthFile = ${cfg.connAuthFile}
49− ${cfg.helperd.extraConfig}
50− '';
51−
52− configClientFilename = name : "/etc/beegfs/client-${name}.conf";
53−
54− configClient = name: cfg: ''
55− sysMgmtdHost = ${cfg.mgmtdHost}
56− connAuthFile = ${cfg.connAuthFile}
57− connPortShift = ${toString cfg.connPortShift}
58−
59− ${cfg.client.extraConfig}
60− '';
61−
62− serviceList = [
63− { service = "admon"; cfgFile = configAdmon; }
64− { service = "meta"; cfgFile = configMeta; }
65− { service = "mgmtd"; cfgFile = configMgmtd; }
66− { service = "storage"; cfgFile = configStorage; }
67− ];
68−
69− # functions to generate systemd.service entries
70−
71− systemdEntry = service: cfgFile: (mapAttrs' ( name: cfg:
72− (nameValuePair "beegfs-${service}-${name}" (mkIf cfg.${service}.enable {
73− wantedBy = [ "multi-user.target" ];
74− requires = [ "network-online.target" ];
75− after = [ "network-online.target" ];
76− serviceConfig = rec {
77− ExecStart = ''
78− ${pkgs.beegfs}/bin/beegfs-${service} \
79− cfgFile=${cfgFile name cfg} \
80− pidFile=${PIDFile}
81− '';
82− PIDFile = "/run/beegfs-${service}-${name}.pid";
83− TimeoutStopSec = "300";
84− };
85− }))) cfg);
86−
87− systemdHelperd = mapAttrs' ( name: cfg:
88− (nameValuePair "beegfs-helperd-${name}" (mkIf cfg.client.enable {
89− wantedBy = [ "multi-user.target" ];
90− requires = [ "network-online.target" ];
91− after = [ "network-online.target" ];
92− serviceConfig = rec {
93− ExecStart = ''
94− ${pkgs.beegfs}/bin/beegfs-helperd \
95− cfgFile=${configHelperd name cfg} \
96− pidFile=${PIDFile}
97− '';
98− PIDFile = "/run/beegfs-helperd-${name}.pid";
99− TimeoutStopSec = "300";
100− };
101− }))) cfg;
102−
103− # wrappers to beegfs tools. Avoid typing path of config files
104− utilWrappers = mapAttrsToList ( name: cfg:
105− ( pkgs.runCommand "beegfs-utils-${name}" {
106− nativeBuildInputs = [ pkgs.makeWrapper ];
107− preferLocalBuild = true;
108− } ''
109− mkdir -p $out/bin
110−
111− makeWrapper ${pkgs.beegfs}/bin/beegfs-check-servers \
112− $out/bin/beegfs-check-servers-${name} \
113− --add-flags "-c ${configClientFilename name}" \
114− --prefix PATH : ${lib.makeBinPath [ pkgs.beegfs ]}
115−
116− makeWrapper ${pkgs.beegfs}/bin/beegfs-ctl \
117− $out/bin/beegfs-ctl-${name} \
118− --add-flags "--cfgFile=${configClientFilename name}"
119−
120− makeWrapper ${pkgs.beegfs}/bin/beegfs-ctl \
121− $out/bin/beegfs-df-${name} \
122− --add-flags "--cfgFile=${configClientFilename name}" \
123− --add-flags --listtargets \
124− --add-flags --hidenodeid \
125− --add-flags --pools \
126− --add-flags --spaceinfo
127−
128− makeWrapper ${pkgs.beegfs}/bin/beegfs-fsck \
129− $out/bin/beegfs-fsck-${name} \
130− --add-flags "--cfgFile=${configClientFilename name}"
131− ''
132− )) cfg;
133−in
134−{
135− ###### interface
136−
137− options = {
138− services.beegfsEnable = mkEnableOption "BeeGFS";
139−
140− services.beegfs = mkOption {
141− default = {};
142− description = ''
143− BeeGFS configurations. Every mount point requires a separate configuration.
144− '';
145− type = with types; attrsOf (submodule ({ ... } : {
146− options = {
147− mgmtdHost = mkOption {
148− type = types.str;
149− default = null;
150− example = "master";
151− description = ''Hostname of managament host.'';
152− };
153−
154− connAuthFile = mkOption {
155− type = types.str;
156− default = "";
157− example = "/etc/my.key";
158− description = "File containing shared secret authentication.";
159− };
160−
161− connPortShift = mkOption {
162− type = types.int;
163− default = 0;
164− example = 5;
165− description = ''
166− For each additional beegfs configuration shift all
167− service TCP/UDP ports by at least 5.
168− '';
169− };
170−
171− client = {
172− enable = mkEnableOption "BeeGFS client";
173−
174− mount = mkOption {
175− type = types.bool;
176− default = true;
177− description = "Create fstab entry automatically";
178− };
179−
180− mountPoint = mkOption {
181− type = types.str;
182− default = "/run/beegfs";
183− description = ''
184− Mount point under which the beegfs filesytem should be mounted.
185− If mounted manually the mount option specifing the config file is needed:
186− cfgFile=/etc/beegfs/beegfs-client-&lt;name&gt;.conf
187− '';
188− };
189−
190− extraConfig = mkOption {
191− type = types.lines;
192− default = "";
193− description = ''
194− Additional lines for beegfs-client.conf.
195− See documentation for further details.
196− '';
197− };
198− };
199−
200− helperd = {
201− enable = mkOption {
202− type = types.bool;
203− default = true;
204− description = ''
205− Enable the BeeGFS helperd.
206− The helpered is need for logging purposes on the client.
207− Disabling <literal>helperd</literal> allows for runing the client
208− with <literal>allowUnfree = false</literal>.
209− '';
210− };
211−
212− extraConfig = mkOption {
213− type = types.lines;
214− default = "";
215− description = ''
216− Additional lines for beegfs-helperd.conf. See documentation
217− for further details.
218− '';
219− };
220− };
221−
222− mgmtd = {
223− enable = mkEnableOption "BeeGFS mgmtd daemon";
224−
225− storeDir = mkOption {
226− type = types.path;
227− default = null;
228− example = "/data/beegfs-mgmtd";
229− description = ''
230− Data directory for mgmtd.
231− Must not be shared with other beegfs daemons.
232− This directory must exist and it must be initialized
233− with beegfs-setup-mgmtd, e.g. "beegfs-setup-mgmtd -C -p &lt;storeDir&gt;"
234− '';
235− };
236−
237− extraConfig = mkOption {
238− type = types.lines;
239− default = "";
240− description = ''
241− Additional lines for beegfs-mgmtd.conf. See documentation
242− for further details.
243− '';
244− };
245− };
246−
247− admon = {
248− enable = mkEnableOption "BeeGFS admon daemon";
249−
250− extraConfig = mkOption {
251− type = types.lines;
252− default = "";
253− description = ''
254− Additional lines for beegfs-admon.conf. See documentation
255− for further details.
256− '';
257− };
258− };
259−
260− meta = {
261− enable = mkEnableOption "BeeGFS meta data daemon";
262−
263− storeDir = mkOption {
264− type = types.path;
265− default = null;
266− example = "/data/beegfs-meta";
267− description = ''
268− Data directory for meta data service.
269− Must not be shared with other beegfs daemons.
270− The underlying filesystem must be mounted with xattr turned on.
271− This directory must exist and it must be initialized
272− with beegfs-setup-meta, e.g.
273− "beegfs-setup-meta -C -s &lt;serviceID&gt; -p &lt;storeDir&gt;"
274− '';
275− };
276−
277− extraConfig = mkOption {
278− type = types.str;
279− default = "";
280− description = ''
281− Additional lines for beegfs-meta.conf. See documentation
282− for further details.
283− '';
284− };
285− };
286−
287− storage = {
288− enable = mkEnableOption "BeeGFS storage daemon";
289−
290− storeDir = mkOption {
291− type = types.path;
292− default = null;
293− example = "/data/beegfs-storage";
294− description = ''
295− Data directories for storage service.
296− Must not be shared with other beegfs daemons.
297− The underlying filesystem must be mounted with xattr turned on.
298− This directory must exist and it must be initialized
299− with beegfs-setup-storage, e.g.
300− "beegfs-setup-storage -C -s &lt;serviceID&gt; -i &lt;storageTargetID&gt; -p &lt;storeDir&gt;"
301− '';
302− };
303−
304− extraConfig = mkOption {
305− type = types.str;
306− default = "";
307− description = ''
308− Addional lines for beegfs-storage.conf. See documentation
309− for further details.
310− '';
311− };
312− };
313− };
314− }));
315− };
316− };
317−
318− ###### implementation
319−
320− config =
321− mkIf config.services.beegfsEnable {
322−
323− environment.systemPackages = utilWrappers;
324−
325− # Put the client.conf files in /etc since they are needed
326− # by the commandline tools
327− environment.etc = mapAttrs' ( name: cfg:
328− (nameValuePair "beegfs/client-${name}.conf" (mkIf (cfg.client.enable)
329− {
330− enable = true;
331− text = configClient name cfg;
332− }))) cfg;
333−
334− # Kernel module, we need it only once per host.
335− boot = mkIf (
336− foldr (a: b: a || b) false
337− (map (x: x.client.enable) (collect (x: x ? client) cfg)))
338− {
339− kernelModules = [ "beegfs" ];
340− extraModulePackages = [ pkgs.linuxPackages.beegfs-module ];
341− };
342−
343− # generate fstab entries
344− fileSystems = mapAttrs' (name: cfg:
345− (nameValuePair cfg.client.mountPoint (optionalAttrs cfg.client.mount (mkIf cfg.client.enable {
346− device = "beegfs_nodev";
347− fsType = "beegfs";
348− mountPoint = cfg.client.mountPoint;
349− options = [ "cfgFile=${configClientFilename name}" "_netdev" ];
350− })))) cfg;
351−
352− # generate systemd services
353− systemd.services = systemdHelperd //
354− foldr (a: b: a // b) {}
355− (map (x: systemdEntry x.service x.cfgFile) serviceList);
356− };
357−}
nixos/tests/all-tests.nix−1
@@ -28,7 +28,6 @@ in
2828 babeld = handleTest ./babeld.nix {};
2929 bcachefs = handleTestOn ["x86_64-linux"] ./bcachefs.nix {}; # linux-4.18.2018.10.12 is unsupported on aarch64
3030 beanstalkd = handleTest ./beanstalkd.nix {};
31− beegfs = handleTestOn ["x86_64-linux"] ./beegfs.nix {}; # beegfs is unsupported on aarch64
3231 bind = handleTest ./bind.nix {};
3332 bittorrent = handleTest ./bittorrent.nix {};
3433 #blivet = handleTest ./blivet.nix {}; # broken since 2017-07024
nixos/tests/beegfs.nixdeleted−115
@@ -1,115 +0,0 @@
1−import ./make-test.nix ({ ... } :
2−
3−let
4− connAuthFile="beegfs/auth-def.key";
5−
6− client = { pkgs, ... } : {
7− networking.firewall.enable = false;
8− services.beegfsEnable = true;
9− services.beegfs.default = {
10− mgmtdHost = "mgmt";
11− connAuthFile = "/etc/${connAuthFile}";
12− client = {
13− mount = false;
14− enable = true;
15− };
16− };
17−
18− fileSystems = pkgs.lib.mkVMOverride # FIXME: this should be creatd by the module
19− [ { mountPoint = "/beegfs";
20− device = "default";
21− fsType = "beegfs";
22− options = [ "cfgFile=/etc/beegfs/client-default.conf" "_netdev" ];
23− }
24− ];
25−
26− environment.etc.${connAuthFile} = {
27− enable = true;
28− text = "ThisIsALousySecret";
29− mode = "0600";
30− };
31− };
32−
33−
34− server = service : { pkgs, ... } : {
35− networking.firewall.enable = false;
36− boot.initrd.postDeviceCommands = ''
37− ${pkgs.e2fsprogs}/bin/mkfs.ext4 -L data /dev/vdb
38− '';
39−
40− virtualisation.emptyDiskImages = [ 4096 ];
41−
42− fileSystems = pkgs.lib.mkVMOverride
43− [ { mountPoint = "/data";
44− device = "/dev/disk/by-label/data";
45− fsType = "ext4";
46− }
47− ];
48−
49− environment.systemPackages = with pkgs; [ beegfs ];
50− environment.etc.${connAuthFile} = {
51− enable = true;
52− text = "ThisIsALousySecret";
53− mode = "0600";
54− };
55−
56− services.beegfsEnable = true;
57− services.beegfs.default = {
58− mgmtdHost = "mgmt";
59− connAuthFile = "/etc/${connAuthFile}";
60− ${service} = {
61− enable = true;
62− storeDir = "/data";
63− };
64− };
65− };
66−
67−in
68−{
69− name = "beegfs";
70−
71− nodes = {
72− meta = server "meta";
73− mgmt = server "mgmtd";
74− storage1 = server "storage";
75− storage2 = server "storage";
76− client1 = client;
77− client2 = client;
78− };
79−
80− testScript = ''
81− # Initalize the data directories
82− $mgmt->waitForUnit("default.target");
83− $mgmt->succeed("beegfs-setup-mgmtd -C -f -p /data");
84− $mgmt->succeed("systemctl start beegfs-mgmtd-default");
85−
86− $meta->waitForUnit("default.target");
87− $meta->succeed("beegfs-setup-meta -C -f -s 1 -p /data");
88− $meta->succeed("systemctl start beegfs-meta-default");
89−
90− $storage1->waitForUnit("default.target");
91− $storage1->succeed("beegfs-setup-storage -C -f -s 1 -i 1 -p /data");
92− $storage1->succeed("systemctl start beegfs-storage-default");
93−
94− $storage2->waitForUnit("default.target");
95− $storage2->succeed("beegfs-setup-storage -C -f -s 2 -i 2 -p /data");
96− $storage2->succeed("systemctl start beegfs-storage-default");
97−
98− #
99−
100− # Basic test
101− $client1->waitForUnit("beegfs.mount");
102− $client1->succeed("beegfs-check-servers-default");
103− $client1->succeed("echo test > /beegfs/test");
104− $client2->waitForUnit("beegfs.mount");
105− $client2->succeed("test -e /beegfs/test");
106− $client2->succeed("cat /beegfs/test | grep test");
107−
108− # test raid0/stripping
109− $client1->succeed("dd if=/dev/urandom bs=1M count=10 of=/beegfs/striped");
110− $client2->succeed("cat /beegfs/striped > /dev/null");
111−
112− # check if fs is still healthy
113− $client1->succeed("beegfs-fsck-default --checkfs");
114− '';
115−})
pkgs/os-specific/linux/beegfs/default.nixdeleted−167
@@ -1,167 +0,0 @@
1−{ stdenv, fetchurl, pkgconfig, unzip, which
2−, libuuid, attr, xfsprogs, cppunit, rdma-core
3−, zlib, openssl, sqlite, jre, openjdk, ant
4−, openssh, perl, gfortran, influxdb, curl
5−} :
6−
7−let
8− version = "7.0";
9−
10− subdirs = [
11− "beeond_thirdparty/build"
12− "beeond_thirdparty_gpl/build"
13− "thirdparty/build"
14− "opentk_lib/build"
15− "common/build"
16− "admon/build"
17− "java_lib/build"
18− "ctl/build"
19− "fsck/build"
20− "helperd/build"
21− "meta/build"
22− "mgmtd/build"
23− "storage/build"
24− "utils/build"
25− "mon/build"
26− "upgrade/beegfs_mirror_md/build"
27− ];
28−
29−in stdenv.mkDerivation {
30− pname = "beegfs";
31− inherit version;
32−
33− src = fetchurl {
34− url = "https://git.beegfs.com/pub/v7/repository/archive.tar.bz2?ref=${version}";
35− sha256 = "1wsljd5ybyhl94aqrdfvcs8a0l8w4pr0bs1vhjrf4y7ldhw35m3k";
36− };
37−
38− nativeBuildInputs = [ which unzip pkgconfig cppunit openjdk ant perl ];
39−
40− buildInputs = [
41− libuuid
42− attr
43− xfsprogs
44− zlib
45− openssl
46− sqlite
47− jre
48− rdma-core
49− openssh
50− gfortran
51− influxdb
52− curl
53− ];
54−
55− hardeningDisable = [ "format" ]; # required for building beeond
56−
57− postPatch = ''
58− patchShebangs ./
59− find -type f -name Makefile -exec sed -i "s:/bin/bash:${stdenv.shell}:" \{} \;
60− find -type f -name Makefile -exec sed -i "s:/bin/true:true:" \{} \;
61− find -type f -name "*.mk" -exec sed -i "s:/bin/true:true:" \{} \;
62−
63− # unpack manually and patch variable name
64− sed -i '/tar -C $(SOURCE_PATH) -xzf $(PCOPY_TAR)/d' beeond_thirdparty/build/Makefile
65− cd beeond_thirdparty/source
66− tar xf pcopy-0.96.tar.gz
67− sed -i 's/\([^_]\)rank/\1grank/' pcopy-0.96/src/pcp.cpp
68− cd ../..
69− '';
70−
71− buildPhase = ''
72− for i in ${toString subdirs}; do
73− make -C $i BEEGFS_OPENTK_IBVERBS=1 ''${enableParallelBuilding:+-j''${NIX_BUILD_CORES} -l''${NIX_BUILD_CORES}}
74− done
75− make -C admon/build admon_gui BEEGFS_OPENTK_IBVERBS=1
76− '';
77−
78− enableParallelBuilding = true;
79−
80− installPhase = ''
81− binDir=$out/bin
82− docDir=$out/share/doc/beegfs
83− includeDir=$out/include/beegfs
84− libDir=$out/lib
85− libDirPkg=$out/lib/beegfs
86−
87− mkdir -p $binDir $libDir $libDirPkg $docDir $includeDir
88−
89− cp admon/build/beegfs-admon $binDir
90− cp admon/build/dist/usr/bin/beegfs-admon-gui $binDir
91− cp admon_gui/dist/beegfs-admon-gui.jar $libDirPkg
92− cp admon/build/dist/etc/beegfs-admon.conf $docDir
93−
94− cp java_lib/build/jbeegfs.jar $libDirPkg
95− cp java_lib/build/libjbeegfs.so $libDir
96−
97− cp ctl/build/beegfs-ctl $binDir
98− cp fsck/build/beegfs-fsck $binDir
99−
100− cp utils/scripts/beegfs-check-servers $binDir
101− cp utils/scripts/beegfs-df $binDir
102− cp utils/scripts/beegfs-net $binDir
103−
104− cp helperd/build/beegfs-helperd $binDir
105− cp helperd/build/dist/etc/beegfs-helperd.conf $docDir
106−
107− cp client_module/build/dist/sbin/beegfs-setup-client $binDir
108− cp client_module/build/dist/etc/beegfs-client.conf $docDir
109−
110− cp meta/build/beegfs-meta $binDir
111− cp meta/build/dist/sbin/beegfs-setup-meta $binDir
112− cp meta/build/dist/etc/beegfs-meta.conf $docDir
113−
114− cp mgmtd/build/beegfs-mgmtd $binDir
115− cp mgmtd/build/dist/sbin/beegfs-setup-mgmtd $binDir
116− cp mgmtd/build/dist/etc/beegfs-mgmtd.conf $docDir
117−
118− cp storage/build/beegfs-storage $binDir
119− cp storage/build/dist/sbin/beegfs-setup-storage $binDir
120− cp storage/build/dist/etc/beegfs-storage.conf $docDir
121−
122− cp opentk_lib/build/libbeegfs-opentk.so $libDir
123−
124− cp upgrade/beegfs_mirror_md/build/beegfs-mirror-md $binDir
125−
126− cp client_devel/build/dist/usr/share/doc/beegfs-client-devel/examples/* $docDir
127− cp -r client_devel/include/* $includeDir
128−
129− cp beeond_thirdparty_gpl/build/parallel $out/bin
130− cp beeond_thirdparty/build/pcopy/p* $out/bin
131− cp beeond_thirdparty/build/pcopy/s* $out/bin
132− cp -r beeond/scripts/* $out
133− cp beeond/source/* $out/bin
134− '';
135−
136− postFixup = ''
137− substituteInPlace $out/bin/beegfs-admon-gui \
138− --replace " java " " ${jre}/bin/java " \
139− --replace "/opt/beegfs/beegfs-admon-gui/beegfs-admon-gui.jar" \
140− "$libDirPkg/beegfs-admon-gui.jar"
141−
142− substituteInPlace $out/bin/beeond \
143− --replace /opt/beegfs/sbin "$out/bin"
144− '';
145−
146− doCheck = true;
147−
148− checkPhase = ''
149− LD_LIBRARY_PATH=$LD_LIBRARY_PATH:`pwd`/opentk_lib/build/ \
150− common/build/test-runner --text
151− '';
152−
153− meta = with stdenv.lib; {
154− description = "High performance distributed filesystem with RDMA support";
155− homepage = "https://www.beegfs.io";
156− platforms = [ "i686-linux" "x86_64-linux" ];
157− license = {
158− fullName = "BeeGFS_EULA";
159− url = "https://www.beegfs.io/docs/BeeGFS_EULA.txt";
160− free = false;
161− };
162− maintainers = with maintainers; [ markuskowa ];
163− # 2019-08-09
164− # fails to build and had stability issues earlier
165− broken = true;
166− };
167−}
pkgs/os-specific/linux/beegfs/kernel-module.nixdeleted−46
@@ -1,46 +0,0 @@
1−{ stdenv, fetchurl, which
2−, kmod, kernel
3−} :
4−
5−let
6− version = "7.0";
7−in stdenv.mkDerivation {
8− name = "beegfs-module-${version}-${kernel.version}";
9−
10− src = fetchurl {
11− url = "https://git.beegfs.com/pub/v7/repository/archive.tar.bz2?ref=${version}";
12− sha256 = "1wsljd5ybyhl94aqrdfvcs8a0l8w4pr0bs1vhjrf4y7ldhw35m3k";
13− };
14−
15− hardeningDisable = [ "fortify" "pic" "stackprotector" ];
16−
17− nativeBuildInputs = [ which kmod ];
18−
19− buildInputs = kernel.moduleBuildDependencies;
20−
21− makeFlags = [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build/" ];
22−
23− postPatch = ''
24− patchShebangs ./
25− find -type f -name Makefile -exec sed -i "s:/bin/bash:${stdenv.shell}:" \{} \;
26− find -type f -name Makefile -exec sed -i "s:/bin/true:true:" \{} \;
27− find -type f -name "*.mk" -exec sed -i "s:/bin/true:true:" \{} \;
28− '';
29−
30− preBuild = "cd client_module/build";
31−
32− installPhase = ''
33− instdir=$out/lib/modules/${kernel.modDirVersion}/extras/fs/beegfs
34− mkdir -p $instdir
35− cp beegfs.ko $instdir
36− '';
37−
38− meta = with stdenv.lib; {
39− description = "High performance distributed filesystem with RDMA support";
40− homepage = "https://www.beegfs.io";
41− platforms = [ "i686-linux" "x86_64-linux" ];
42− license = licenses.gpl2;
43− maintainers = with maintainers; [ markuskowa ];
44− broken = stdenv.lib.versionAtLeast kernel.version "4.18";
45− };
46−}
pkgs/top-level/aliases.nix+1
@@ -47,6 +47,7 @@ mapAliases ({
4747 at_spi2_core = at-spi2-core; # added 2018-02-25
4848 bar-xft = lemonbar-xft; # added 2015-01-16
4949 bashCompletion = bash-completion; # Added 2016-09-28
50+ beegfs = throw "beegfs has been removed."; # added 2019-11-24
5051 bridge_utils = bridge-utils; # added 2015-02-20
5152 bro = zeek; # added 2019-09-29
5253 btrfsProgs = btrfs-progs; # added 2016-01-03
pkgs/top-level/all-packages.nix−4
@@ -2164,8 +2164,6 @@ in
21642164
21652165 beanstalkd = callPackage ../servers/beanstalkd { };
21662166
2167− beegfs = callPackage ../os-specific/linux/beegfs { };
2168−
21692167 beets = callPackage ../tools/audio/beets {
21702168 pythonPackages = python3Packages;
21712169 };
@@ -16277,8 +16275,6 @@ in
1627716275
1627816276 bbswitch = callPackage ../os-specific/linux/bbswitch {};
1627916277
16280− beegfs-module = callPackage ../os-specific/linux/beegfs/kernel-module.nix { };
16281−
1628216278 ati_drivers_x11 = callPackage ../os-specific/linux/ati-drivers { };
1628316279
1628416280 chipsec = callPackage ../tools/security/chipsec {