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

Merge pull request #37905 from Chiiruno/master

Browse Source 
linux_testing_bcachefs: 4.15.2018.02.09 -> 4.15.2018.03.22
This commit is contained in:
Wout Mertens 2018-03-27 14:09:18 +02:00 committed by GitHub
commit 4ba76fadeb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
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.15.2018.02.09"; version = "4.15.2018.03.22";
modDirVersion = "4.15.0"; modDirVersion = "4.15.0";
extraMeta.branch = "master"; extraMeta.branch = "master";
extraMeta.maintainers = [ stdenv.lib.maintainers.davidak ]; extraMeta.maintainers = [ stdenv.lib.maintainers.davidak stdenv.lib.maintainers.chiiruno ];
src = fetchgit { src = fetchgit {
url = "https://evilpiepirate.org/git/bcachefs.git"; url = "https://evilpiepirate.org/git/bcachefs.git";
rev = "4506cd5ead31209a6a646c2412cbc7be735ebda4"; rev = "919a34d47a68f3e5f00a7ce5efb67748ec31bd62";
sha256 = "0fcyf3y27k2lga5na4dhdyc47br840gkqynv8gix297pqxgidrib"; sha256 = "1j17my3046ry8zdcvf8h2vnij89wkwmv64w3g2pf9lksh2909djw";
}; };
extraConfig = '' extraConfig = ''

13
pkgs/tools/filesystems/bcachefs-tools/Makefile.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/Makefile b/Makefile
index af7a206..553ac70 100644
--- a/Makefile
+++ b/Makefile
@@ -47,7 +47,7 @@ ifeq ($(PREFIX),/usr)
INITRAMFS_DIR=$(PREFIX)/share/initramfs-tools
else
ROOT_SBINDIR=$(PREFIX)/sbin
- INITRAMFS_DIR=/etc/initramfs-tools
+ INITRAMFS_DIR=$(PREFIX)/etc/initramfs-tools
endif
.PHONY: all

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

@ -1,17 +1,19 @@
{ stdenv, pkgs, fetchgit, pkgconfig, attr, libuuid, libscrypt, libsodium { stdenv, pkgs, fetchgit, pkgconfig, attr, libuuid, libscrypt, libsodium
, keyutils, liburcu, zlib, libaio }: , keyutils, liburcu, zlib, libaio, zstd }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "bcachefs-tools-unstable-2018-02-08"; name = "bcachefs-tools-unstable-2018-03-20";
src = fetchgit { src = fetchgit {
url = "https://evilpiepirate.org/git/bcachefs-tools.git"; url = "https://evilpiepirate.org/git/bcachefs-tools.git";
rev = "fc96071b58c28ea492103e7649c0efd5bab50ead"; rev = "ff5e165532a2eed87700649d03f91a612a58e92a";
sha256 = "0a2sxkz0mkmvb5g4k2v8g2c89dj29haw9bd3bpwk0dsfkjif92vy"; sha256 = "1mikhffkr4a1yhy36yh70dhgcimcpvdm5mjl5fyni0bpgqrw67dn";
}; };
enableParallelBuilding = true;
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ attr libuuid libscrypt libsodium keyutils liburcu zlib libaio ]; buildInputs = [ attr libuuid libscrypt libsodium keyutils liburcu zlib libaio zstd ];
patches = [ ./Makefile.patch ];
installFlags = [ "PREFIX=$(out)" ]; installFlags = [ "PREFIX=$(out)" ];
@ -19,7 +21,7 @@ stdenv.mkDerivation rec {
description = "Tool for managing bcachefs filesystems"; description = "Tool for managing bcachefs filesystems";
homepage = https://bcachefs.org/; homepage = https://bcachefs.org/;
license = licenses.gpl2; license = licenses.gpl2;
maintainers = with maintainers; [ davidak ]; maintainers = with maintainers; [ davidak chiiruno];
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }