pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #34792 from dywedir/bcachefs

linux_testing_bcachefs: 4.11.2017.08.23 -> 4.15.2018.02.09

authored by Jörg Thalheim and committed by GitHub 3b8bb02f 79315b63

+10 -19
unified split
+4 -5
pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix
··· 1 1 { stdenv, buildPackages, hostPlatform, fetchgit, perl, buildLinux, ... } @ args: 2 2 3 3 buildLinux (args // rec { 4 - version = "4.11.2017.08.23"; 5 - modDirVersion = "4.11.0"; 4 + version = "4.15.2018.02.09"; 5 + modDirVersion = "4.15.0"; 6 6 extraMeta.branch = "master"; 7 7 extraMeta.maintainers = [ stdenv.lib.maintainers.davidak ]; 8 8 9 9 src = fetchgit { 10 10 url = "https://evilpiepirate.org/git/bcachefs.git"; 11 - rev = "fb8082a13d49397346a04ce4d3904569b0287738"; 12 - sha256 = "18csg2zb4lnhid27h5w95j3g8np29m8y3zfpfgjl1jr2jks64kid"; 11 + rev = "4506cd5ead31209a6a646c2412cbc7be735ebda4"; 12 + sha256 = "0fcyf3y27k2lga5na4dhdyc47br840gkqynv8gix297pqxgidrib"; 13 13 }; 14 14 15 15 extraConfig = '' ··· 20 20 extraMeta.hydraPlatforms = []; 21 21 22 22 } // (args.argsOverride or {})) 23 -
+6 -10
pkgs/tools/filesystems/bcachefs-tools/default.nix
··· 1 - { stdenv, pkgs, fetchgit, pkgconfig, attr, libuuid, libscrypt, libsodium, keyutils, liburcu, zlib, libaio }: 1 + { stdenv, pkgs, fetchgit, pkgconfig, attr, libuuid, libscrypt, libsodium 2 + , keyutils, liburcu, zlib, libaio }: 2 3 3 4 stdenv.mkDerivation rec { 4 - name = "bcachefs-tools-unstable-2017-08-28"; 5 + name = "bcachefs-tools-unstable-2018-02-08"; 5 6 6 7 src = fetchgit { 7 8 url = "https://evilpiepirate.org/git/bcachefs-tools.git"; 8 - rev = "b1814f2dd0c6b61a12a2ebb67a13d406d126b227"; 9 - sha256 = "05ba1h09rrqj6vjr3q37ybca3nbrmnifmffdyk83622l28fpv350"; 9 + rev = "fc96071b58c28ea492103e7649c0efd5bab50ead"; 10 + sha256 = "0a2sxkz0mkmvb5g4k2v8g2c89dj29haw9bd3bpwk0dsfkjif92vy"; 10 11 }; 11 12 12 13 nativeBuildInputs = [ pkgconfig ]; 13 14 buildInputs = [ attr libuuid libscrypt libsodium keyutils liburcu zlib libaio ]; 14 15 15 - preConfigure = '' 16 - substituteInPlace cmd_migrate.c --replace /usr/include/dirent.h ${stdenv.lib.getDev stdenv.cc.libc}/include/dirent.h 17 - ''; 18 - 19 16 installFlags = [ "PREFIX=$(out)" ]; 20 17 21 18 meta = with stdenv.lib; { 22 19 description = "Tool for managing bcachefs filesystems"; 23 - homepage = http://bcachefs.org/; 20 + homepage = https://bcachefs.org/; 24 21 license = licenses.gpl2; 25 22 maintainers = with maintainers; [ davidak ]; 26 23 platforms = platforms.linux; 27 24 }; 28 25 } 29 -
-4
pkgs/top-level/all-packages.nix
··· 13005 13005 linux_testing_bcachefs = callPackage ../os-specific/linux/kernel/linux-testing-bcachefs.nix { 13006 13006 kernelPatches = 13007 13007 [ kernelPatches.bridge_stp_helper 13008 - kernelPatches.p9_fixes 13009 - # See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md 13010 - # when adding a new linux version 13011 - kernelPatches.cpu-cgroup-v2."4.11" 13012 13008 kernelPatches.modinst_arg_list_too_long 13013 13009 ] 13014 13010 ++ lib.optionals ((platform.kernelArch or null) == "mips")