commit b59a13e9b42291f234d70881ceab58b586d73492 · pyrox.dev/nixpkgs

+11

nixos/modules/services/network-filesystems/beegfs.nix

···

       195
       195
        
                 };

     

       196
       196
        
       

     

       197
       197
        
                 helperd = {

     

       198
       198
       +
                   enable = mkOption {

     

       199
       199
       +
                     type = types.bool;

     

       200
       200
       +
                     default = true;

     

       201
       201
       +
                     description = ''

     

       202
       202
       +
                       Enable the BeeGFS helperd.

     

       203
       203
       +
                       The helpered is need for logging purposes on the client.

     

       204
       204
       +
                       Disabling <literal>helperd</literal> allows for runing the client

     

       205
       205
       +
                       with <literal>allowUnfree = false</literal>.

     

       206
       206
       +
                     '';

     

       207
       207
       +
                   };

     

       208
       208
       +
       

     

       198
       209
        
                   extraConfig = mkOption {

     

       199
       210
        
                     type = types.lines;

     

       200
       211
        
                     default = "";

+57 -48

pkgs/os-specific/linux/beegfs/default.nix

···

       1
       1
        
       { stdenv, fetchurl, pkgconfig, unzip, which

     

       2
       2
        
       , libuuid, attr, xfsprogs, cppunit, rdma-core

     

       3
       3
        
       , zlib, openssl, sqlite, jre, openjdk, ant

     

       4
       4
       -
       , openssh, perl, gfortran

     

       4
       4
       +
       , openssh, perl, gfortran, influxdb, curl

     

       5
       5
        
       } :

     

       6
       6
        
       

     

       7
       7
        
       let

     

       8
       8
       -
         version = "6.18";

     

       8
       8
       +
         version = "7.0";

     

       9
       9
        
       

     

       10
       10
        
         subdirs = [

     

       11
       11
        
           "beeond_thirdparty/build"

     

       12
       12
        
           "beeond_thirdparty_gpl/build"

     

       13
       13
       -
           "beegfs_thirdparty/build"

     

       14
       14
       -
           "beegfs_opentk_lib/build"

     

       15
       15
       -
           "beegfs_common/build"

     

       16
       16
       -
           "beegfs_admon/build"

     

       17
       17
       -
           "beegfs_java_lib/build"

     

       18
       18
       -
           "beegfs_ctl/build"

     

       19
       19
       -
           "beegfs_fsck/build"

     

       20
       20
       -
           "beegfs_helperd/build"

     

       21
       21
       -
           "beegfs_meta/build"

     

       22
       22
       -
           "beegfs_mgmtd/build"

     

       23
       23
       -
           "beegfs_online_cfg/build"

     

       24
       24
       -
           "beegfs_storage/build"

     

       25
       25
       -
           "beegfs_utils/build"

     

       13
       13
       +
           "thirdparty/build"

     

       14
       14
       +
           "opentk_lib/build"

     

       15
       15
       +
           "common/build"

     

       16
       16
       +
           "admon/build"

     

       17
       17
       +
           "java_lib/build"

     

       18
       18
       +
           "ctl/build"

     

       19
       19
       +
           "fsck/build"

     

       20
       20
       +
           "helperd/build"

     

       21
       21
       +
           "meta/build"

     

       22
       22
       +
           "mgmtd/build"

     

       23
       23
       +
           "storage/build"

     

       24
       24
       +
           "utils/build"

     

       25
       25
       +
           "mon/build"

     

       26
       26
       +
           "upgrade/beegfs_mirror_md/build"

     

       26
       27
        
         ];

     

       27
       28
        
       

     

       28
       29
        
       in stdenv.mkDerivation rec {

     

       29
       30
        
         name = "beegfs-${version}";

     

       30
       31
        
       

     

       31
       32
        
         src = fetchurl {

     

       32
       32
       -
           url = "https://git.beegfs.com/pub/v6/repository/archive.tar.bz2?ref=${version}";

     

       33
       33
       -
           sha256 = "1g874qyxh4v53ah3lzchrqi0jci7wngr54q3f4d9q0kzvvifripn";

     

       33
       33
       +
           url = "https://git.beegfs.com/pub/v7/repository/archive.tar.bz2?ref=${version}";

     

       34
       34
       +
           sha256 = "1wsljd5ybyhl94aqrdfvcs8a0l8w4pr0bs1vhjrf4y7ldhw35m3k";

     

       34
       35
        
         };

     

       35
       36
        
       

     

       36
       37
        
         nativeBuildInputs = [ which unzip pkgconfig cppunit openjdk ant perl ];

     
···

       45
       46
        
           jre

     

       46
       47
        
           rdma-core

     

       47
       48
        
           openssh

     

       48
       48
       -
           gfortran ];

     

       49
       49
       +
           gfortran

     

       50
       50
       +
           influxdb

     

       51
       51
       +
           curl

     

       52
       52
       +
         ];

     

       49
       53
        
       

     

       50
       54
        
         hardeningDisable = [ "format" ]; # required for building beeond

     

       51
       55
        
       

     
···

       65
       69
        
       

     

       66
       70
        
         buildPhase = ''

     

       67
       71
        
           for i in ${toString subdirs}; do

     

       68
       68
       -
             make -C $i BEEGFS_OPENTK_IBVERBS=1

     

       72
       72
       +
             make -C $i BEEGFS_OPENTK_IBVERBS=1 ''${enableParallelBuilding:+-j''${NIX_BUILD_CORES} -l''${NIX_BUILD_CORES}}

     

       69
       73
        
           done

     

       70
       70
       -
           make -C beegfs_admon/build admon_gui BEEGFS_OPENTK_IBVERBS=1

     

       74
       74
       +
           make -C admon/build admon_gui BEEGFS_OPENTK_IBVERBS=1

     

       71
       75
        
         '';

     

       76
       76
       +
       

     

       77
       77
       +
         enableParallelBuilding = true;

     

       72
       78
        
       

     

       73
       79
        
         installPhase = ''

     

       74
       80
        
           binDir=$out/bin

     
···

       79
       85
        
       

     

       80
       86
        
           mkdir -p $binDir $libDir $libDirPkg $docDir $includeDir

     

       81
       87
        
       

     

       82
       82
       -
           cp beegfs_admon/build/beegfs-admon $binDir

     

       83
       83
       -
           cp beegfs_admon/build/dist/usr/bin/beegfs-admon-gui $binDir

     

       84
       84
       -
           cp beegfs_admon_gui/dist/beegfs-admon-gui.jar $libDirPkg

     

       85
       85
       -
           cp beegfs_admon/build/dist/etc/beegfs-admon.conf $docDir

     

       88
       88
       +
           cp admon/build/beegfs-admon $binDir

     

       89
       89
       +
           cp admon/build/dist/usr/bin/beegfs-admon-gui $binDir

     

       90
       90
       +
           cp admon_gui/dist/beegfs-admon-gui.jar $libDirPkg

     

       91
       91
       +
           cp admon/build/dist/etc/beegfs-admon.conf $docDir

     

       92
       92
       +
       

     

       93
       93
       +
           cp java_lib/build/jbeegfs.jar $libDirPkg

     

       94
       94
       +
           cp java_lib/build/libjbeegfs.so $libDir

     

       86
       95
        
       

     

       87
       87
       -
           cp beegfs_java_lib/build/jbeegfs.jar $libDirPkg

     

       88
       88
       -
           cp beegfs_java_lib/build/libjbeegfs.so $libDir

     

       96
       96
       +
           cp ctl/build/beegfs-ctl $binDir

     

       97
       97
       +
           cp fsck/build/beegfs-fsck $binDir

     

       89
       98
        
       

     

       90
       90
       -
           cp beegfs_ctl/build/beegfs-ctl $binDir

     

       91
       91
       -
           cp beegfs_fsck/build/beegfs-fsck $binDir

     

       99
       99
       +
           cp utils/scripts/beegfs-check-servers $binDir

     

       100
       100
       +
           cp utils/scripts/beegfs-df $binDir

     

       101
       101
       +
           cp utils/scripts/beegfs-net $binDir

     

       92
       102
        
       

     

       93
       93
       -
           cp beegfs_utils/scripts/beegfs-check-servers $binDir

     

       94
       94
       -
           cp beegfs_utils/scripts/beegfs-df $binDir

     

       95
       95
       -
           cp beegfs_utils/scripts/beegfs-net $binDir

     

       103
       103
       +
           cp helperd/build/beegfs-helperd $binDir

     

       104
       104
       +
           cp helperd/build/dist/etc/beegfs-helperd.conf $docDir

     

       96
       105
        
       

     

       97
       97
       -
           cp beegfs_helperd/build/beegfs-helperd $binDir

     

       98
       98
       -
           cp beegfs_helperd/build/dist/etc/beegfs-helperd.conf $docDir

     

       106
       106
       +
           cp client_module/build/dist/sbin/beegfs-setup-client $binDir

     

       107
       107
       +
           cp client_module/build/dist/etc/beegfs-client.conf $docDir

     

       99
       108
        
       

     

       100
       100
       -
           cp beegfs_client_module/build/dist/sbin/beegfs-setup-client $binDir

     

       101
       101
       -
           cp beegfs_client_module/build/dist/etc/beegfs-client.conf $docDir

     

       109
       109
       +
           cp meta/build/beegfs-meta $binDir

     

       110
       110
       +
           cp meta/build/dist/sbin/beegfs-setup-meta $binDir

     

       111
       111
       +
           cp meta/build/dist/etc/beegfs-meta.conf $docDir

     

       102
       112
        
       

     

       103
       103
       -
           cp beegfs_meta/build/beegfs-meta $binDir

     

       104
       104
       -
           cp beegfs_meta/build/dist/sbin/beegfs-setup-meta $binDir

     

       105
       105
       -
           cp beegfs_meta/build/dist/etc/beegfs-meta.conf $docDir

     

       113
       113
       +
           cp mgmtd/build/beegfs-mgmtd $binDir

     

       114
       114
       +
           cp mgmtd/build/dist/sbin/beegfs-setup-mgmtd $binDir

     

       115
       115
       +
           cp mgmtd/build/dist/etc/beegfs-mgmtd.conf $docDir

     

       106
       116
        
       

     

       107
       107
       -
           cp beegfs_mgmtd/build/beegfs-mgmtd $binDir

     

       108
       108
       -
           cp beegfs_mgmtd/build/dist/sbin/beegfs-setup-mgmtd $binDir

     

       109
       109
       -
           cp beegfs_mgmtd/build/dist/etc/beegfs-mgmtd.conf $docDir

     

       117
       117
       +
           cp storage/build/beegfs-storage $binDir

     

       118
       118
       +
           cp storage/build/dist/sbin/beegfs-setup-storage $binDir

     

       119
       119
       +
           cp storage/build/dist/etc/beegfs-storage.conf $docDir

     

       110
       120
        
       

     

       111
       111
       -
           cp beegfs_storage/build/beegfs-storage $binDir

     

       112
       112
       -
           cp beegfs_storage/build/dist/sbin/beegfs-setup-storage $binDir

     

       113
       113
       -
           cp beegfs_storage/build/dist/etc/beegfs-storage.conf $docDir

     

       121
       121
       +
           cp opentk_lib/build/libbeegfs-opentk.so $libDir

     

       114
       122
        
       

     

       115
       115
       -
           cp beegfs_opentk_lib/build/libbeegfs-opentk.so $libDir

     

       123
       123
       +
           cp upgrade/beegfs_mirror_md/build/beegfs-mirror-md $binDir

     

       116
       124
        
       

     

       117
       117
       -
           cp beegfs_client_devel/build/dist/usr/share/doc/beegfs-client-devel/examples/* $docDir

     

       118
       118
       -
           cp -r beegfs_client_devel/include/* $includeDir

     

       125
       125
       +
           cp client_devel/build/dist/usr/share/doc/beegfs-client-devel/examples/* $docDir

     

       126
       126
       +
           cp -r client_devel/include/* $includeDir

     

       119
       127
        
       

     

       120
       128
        
           cp beeond_thirdparty_gpl/build/parallel $out/bin

     

       121
       129
        
           cp beeond_thirdparty/build/pcopy/p* $out/bin

     
···

       137
       145
        
         doCheck = true;

     

       138
       146
        
       

     

       139
       147
        
         checkPhase = ''

     

       140
       140
       -
           beegfs_common/build/test-runner --text

     

       148
       148
       +
           LD_LIBRARY_PATH=$LD_LIBRARY_PATH:`pwd`/opentk_lib/build/ \

     

       149
       149
       +
             common/build/test-runner --text

     

       141
       150
        
         '';

     

       142
       151
        
       

     

       143
       152
        
         meta = with stdenv.lib; {

+4 -4

pkgs/os-specific/linux/beegfs/kernel-module.nix

···

       3
       3
        
       } :

     

       4
       4
        
       

     

       5
       5
        
       let

     

       6
       6
       -
         version = "6.18";

     

       6
       6
       +
         version = "7.0";

     

       7
       7
        
       in stdenv.mkDerivation {

     

       8
       8
        
         name = "beegfs-module-${version}-${kernel.version}";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchurl {

     

       11
       11
       -
           url = "https://git.beegfs.com/pub/v6/repository/archive.tar.bz2?ref=${version}";

     

       12
       12
       -
           sha256 = "1g874qyxh4v53ah3lzchrqi0jci7wngr54q3f4d9q0kzvvifripn";

     

       11
       11
       +
           url = "https://git.beegfs.com/pub/v7/repository/archive.tar.bz2?ref=${version}";

     

       12
       12
       +
           sha256 = "1wsljd5ybyhl94aqrdfvcs8a0l8w4pr0bs1vhjrf4y7ldhw35m3k";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         hardeningDisable = [ "fortify" "pic" "stackprotector" ];

     
···

       27
       27
        
           find -type f -name "*.mk" -exec sed -i "s:/bin/true:true:" \{} \;

     

       28
       28
        
         '';

     

       29
       29
        
       

     

       30
       30
       -
         preBuild = "cd beegfs_client_module/build";

     

       30
       30
       +
         preBuild = "cd client_module/build";

     

       31
       31
        
       

     

       32
       32
        
         installPhase = ''

     

       33
       33
        
           instdir=$out/lib/modules/${kernel.modDirVersion}/extras/fs/beegfs