dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #36879 from markuskowa/beegfs-6.18

Browse Source 
beegfs: 6.17 -> 6.18
This commit is contained in:
Franz Pletz 2018-03-12 21:30:57 +00:00 committed by GitHub
commit 9715e278c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/os-specific/linux/beegfs/default.nix
View File

@ -5,7 +5,7 @@
} :
let
version = "6.17";
version = "6.18";
subdirs = [
"beeond_thirdparty/build"
@ -30,7 +30,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "https://git.beegfs.com/pub/v6/repository/archive.tar.bz2?ref=${version}";
sha256 = "10xs7gzdmlg23k6zn1b7jij3lljn7rr1j6h476hq4lbg981qk3n3";
sha256 = "1g874qyxh4v53ah3lzchrqi0jci7wngr54q3f4d9q0kzvvifripn";
};
nativeBuildInputs = [ which unzip pkgconfig cppunit openjdk ant perl ];

5
pkgs/os-specific/linux/beegfs/kernel-module.nix
View File

@ -3,13 +3,13 @@
} :
let
version = "6.17";
version = "6.18";
in stdenv.mkDerivation {
name = "beegfs-module-${version}-${kernel.version}";
src = fetchurl {
url = "https://git.beegfs.com/pub/v6/repository/archive.tar.bz2?ref=${version}";
sha256 = "10xs7gzdmlg23k6zn1b7jij3lljn7rr1j6h476hq4lbg981qk3n3";
sha256 = "1g874qyxh4v53ah3lzchrqi0jci7wngr54q3f4d9q0kzvvifripn";
};
hardeningDisable = [ "fortify" "pic" "stackprotector" ];
@ -41,6 +41,5 @@ in stdenv.mkDerivation {
platforms = [ "i686-linux" "x86_64-linux" ];
license = licenses.gpl2;
maintainers = with maintainers; [ markuskowa ];
broken = versionAtLeast kernel.version "4.14";
};
}