swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 21:09:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #214265 from PedroHLC/bcachefs-2023-02-01

Browse source 
linux_testing_bcachefs: 6.1.9-unstable-2022-12-29 -> 6.1.3-unstable-2023-02-01
This commit is contained in:
superherointj 2023-02-03 19:03:44 -03:00 committed by GitHub
parent f0df587810 338e4c1433
commit f3b37396bd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 19 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,9 +1,9 @@
{ lib
, fetchpatch
, kernel
, commitDate ? "2022-12-29"
, currentCommit ? "8f064a4cb5c7cce289b83d7a459e6d8620188b37"
, diffHash ? "sha256-RnlM7uOSWhFHG1aj5BOjrfRtoZfbx+tqQw1V49nW5vw="
, commitDate ? "2023-02-01"
, currentCommit ? "65960c284ad149cc4bfbd64f21e6889c1e3d1c5f"
, diffHash ? "sha256-4wpY3aYZ93OXSU4wmQs9K62nPyIzjKu4RBQTwksmyyk="
, kernelPatches # must always be defined in bcachefs' all-packages.nix entry because it's also a top-level attribute supplied by callPackage
, argsOverride ? {}
@ -17,7 +17,7 @@
extraMeta = {
branch = "master";
maintainers = with lib.maintainers; [ davidak Madouura ];
maintainers = with lib.maintainers; [ davidak Madouura pedrohlc ];
};
} // argsOverride;

6
pkgs/tools/filesystems/bcachefs-tools/default.nix
View file

@ -25,13 +25,13 @@
stdenv.mkDerivation {
pname = "bcachefs-tools";
version = "unstable-2022-12-29";
version = "unstable-2023-01-31";
src = fetchFromGitHub {
owner = "koverstreet";
repo = "bcachefs-tools";
rev = "42cf74fd1d0ef58927967e6236988e86cfc0d086";
sha256 = "sha256-N/1heStwmB7CzE/ddTud/ywnMdhq8ZkLju+x0UL0yjY=";
rev = "3c39b422acd3346321185be0ce263809e2a9a23f";
hash = "sha256-2ci/m4JfodLiPoWfP+QCEqlk0k48zq3mKb8Pdrtln0o=";
};
postPatch = ''

15
pkgs/top-level/linux-kernels.nix
View file

@ -184,9 +184,18 @@ in {
then latest
else testing;
linux_testing_bcachefs = callPackage ../os-specific/linux/kernel/linux-testing-bcachefs.nix rec {
kernel = linux_6_1;
kernelPatches = kernel.kernelPatches;
linux_testing_bcachefs = callPackage ../os-specific/linux/kernel/linux-testing-bcachefs.nix {
# Pinned on the last version which Kent's commits can be cleany rebased up.
kernel = buildLinux rec {
version = "6.1.3";
modDirVersion = lib.versions.pad 3 version;
extraMeta.branch = lib.versions.majorMinor version;
src = fetchurl {
url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz";
hash = "sha256-bcia56dRPkM8WXxzRu1/9L/RFepDo7XiemvbOMVYAxc=";
};
};
kernelPatches = linux_6_1.kernelPatches;
};
linux_hardkernel_4_14 = callPackage ../os-specific/linux/kernel/linux-hardkernel-4.14.nix {