public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #34792 from dywedir/bcachefs

Browse Source 
linux_testing_bcachefs: 4.11.2017.08.23 -> 4.15.2018.02.09
This commit is contained in:
Jörg Thalheim 2018-02-10 08:20:35 +00:00 committed by GitHub
commit 3b8bb02f68
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix
View File

@ -1,15 +1,15 @@
{ stdenv, buildPackages, hostPlatform, fetchgit, perl, buildLinux, ... } @ args: { stdenv, buildPackages, hostPlatform, fetchgit, perl, buildLinux, ... } @ args:
buildLinux (args // rec { buildLinux (args // rec {
version = "4.11.2017.08.23"; version = "4.15.2018.02.09";
modDirVersion = "4.11.0"; modDirVersion = "4.15.0";
extraMeta.branch = "master"; extraMeta.branch = "master";
extraMeta.maintainers = [ stdenv.lib.maintainers.davidak ]; extraMeta.maintainers = [ stdenv.lib.maintainers.davidak ];
src = fetchgit { src = fetchgit {
url = "https://evilpiepirate.org/git/bcachefs.git"; url = "https://evilpiepirate.org/git/bcachefs.git";
rev = "fb8082a13d49397346a04ce4d3904569b0287738"; rev = "4506cd5ead31209a6a646c2412cbc7be735ebda4";
sha256 = "18csg2zb4lnhid27h5w95j3g8np29m8y3zfpfgjl1jr2jks64kid"; sha256 = "0fcyf3y27k2lga5na4dhdyc47br840gkqynv8gix297pqxgidrib";
}; };
extraConfig = '' extraConfig = ''
@ -20,4 +20,3 @@ buildLinux (args // rec {
extraMeta.hydraPlatforms = []; extraMeta.hydraPlatforms = [];
} // (args.argsOverride or {})) } // (args.argsOverride or {}))

16
pkgs/tools/filesystems/bcachefs-tools/default.nix
View File

@ -1,29 +1,25 @@
{ stdenv, pkgs, fetchgit, pkgconfig, attr, libuuid, libscrypt, libsodium, keyutils, liburcu, zlib, libaio }: { stdenv, pkgs, fetchgit, pkgconfig, attr, libuuid, libscrypt, libsodium
, keyutils, liburcu, zlib, libaio }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "bcachefs-tools-unstable-2017-08-28"; name = "bcachefs-tools-unstable-2018-02-08";
src = fetchgit { src = fetchgit {
url = "https://evilpiepirate.org/git/bcachefs-tools.git"; url = "https://evilpiepirate.org/git/bcachefs-tools.git";
rev = "b1814f2dd0c6b61a12a2ebb67a13d406d126b227"; rev = "fc96071b58c28ea492103e7649c0efd5bab50ead";
sha256 = "05ba1h09rrqj6vjr3q37ybca3nbrmnifmffdyk83622l28fpv350"; sha256 = "0a2sxkz0mkmvb5g4k2v8g2c89dj29haw9bd3bpwk0dsfkjif92vy";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ attr libuuid libscrypt libsodium keyutils liburcu zlib libaio ]; buildInputs = [ attr libuuid libscrypt libsodium keyutils liburcu zlib libaio ];
preConfigure = ''
substituteInPlace cmd_migrate.c --replace /usr/include/dirent.h ${stdenv.lib.getDev stdenv.cc.libc}/include/dirent.h
'';
installFlags = [ "PREFIX=$(out)" ]; installFlags = [ "PREFIX=$(out)" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Tool for managing bcachefs filesystems"; description = "Tool for managing bcachefs filesystems";
homepage = http://bcachefs.org/; homepage = https://bcachefs.org/;
license = licenses.gpl2; license = licenses.gpl2;
maintainers = with maintainers; [ davidak ]; maintainers = with maintainers; [ davidak ];
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }

4
pkgs/top-level/all-packages.nix
View File

@ -13005,10 +13005,6 @@ with pkgs;
linux_testing_bcachefs = callPackage ../os-specific/linux/kernel/linux-testing-bcachefs.nix { linux_testing_bcachefs = callPackage ../os-specific/linux/kernel/linux-testing-bcachefs.nix {
kernelPatches = kernelPatches =
[ kernelPatches.bridge_stp_helper [ kernelPatches.bridge_stp_helper
kernelPatches.p9_fixes
# See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md
# when adding a new linux version
kernelPatches.cpu-cgroup-v2."4.11"
kernelPatches.modinst_arg_list_too_long kernelPatches.modinst_arg_list_too_long
] ]
++ lib.optionals ((platform.kernelArch or null) == "mips") ++ lib.optionals ((platform.kernelArch or null) == "mips")