Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5e10df3982d0
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: aec217852f22
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Jul 9, 2018

  1. Revert removal of linux_testing_bcachefs from "linux: remove versio… 

    …ns unmaintained upstream"

This reverts parts of commit 298e170.
    @samueldr
    samueldr committed Jul 9, 2018
    Copy the full SHA
    25a932e View commit details

  2. Merge pull request #43257 from samueldr/fix/revert-bcachefs 

    Revert removal of `linux_testing_bcachefs` from "linux: remove versions unmaintained upstream"
    @xeji
    xeji authored Jul 9, 2018
    Copy the full SHA
    aec2178 View commit details
Showing with 37 additions and 0 deletions.
  1. +22 −0 pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix
  2. +15 −0 pkgs/top-level/all-packages.nix
22 changes: 22 additions & 0 deletions pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{ stdenv, buildPackages, hostPlatform, fetchgit, perl, buildLinux, ... } @ args:

buildLinux (args // rec {
version = "4.15.2018.02.09";
modDirVersion = "4.15.0";
extraMeta.branch = "master";
extraMeta.maintainers = [ stdenv.lib.maintainers.davidak ];

src = fetchgit {
url = "https://evilpiepirate.org/git/bcachefs.git";
rev = "4506cd5ead31209a6a646c2412cbc7be735ebda4";
sha256 = "0fcyf3y27k2lga5na4dhdyc47br840gkqynv8gix297pqxgidrib";
};

extraConfig = ''
BCACHEFS_FS m
'';

# Should the testing kernels ever be built on Hydra?
extraMeta.hydraPlatforms = [];

} // (args.argsOverride or {}))
15 changes: 15 additions & 0 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -13327,6 +13327,18 @@ with pkgs;
];
};

linux_testing_bcachefs = callPackage ../os-specific/linux/kernel/linux-testing-bcachefs.nix {
kernelPatches =
[ kernelPatches.bridge_stp_helper
kernelPatches.modinst_arg_list_too_long
]
++ lib.optionals ((platform.kernelArch or null) == "mips")
[ kernelPatches.mips_fpureg_emu
kernelPatches.mips_fpu_sigill
kernelPatches.mips_ext3_n32
];
};

linux_riscv = callPackage ../os-specific/linux/kernel/linux-riscv.nix {
kernelPatches = [
kernelPatches.bridge_stp_helper
@@ -13531,6 +13543,9 @@ with pkgs;
};
in tinyLinuxPackages.kernel;

# Build a kernel with bcachefs module
linuxPackages_testing_bcachefs = recurseIntoAttrs (linuxPackagesFor pkgs.linux_testing_bcachefs);

# Build a kernel for Xen dom0
linuxPackages_xen_dom0 = recurseIntoAttrs (linuxPackagesFor (pkgs.linux.override { features.xen_dom0=true; }));