Skip to content
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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7fb01c60d8c9
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5a1232908ce4
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Oct 12, 2019

  1. linux_testing_bcachefs: 5.2.2019.10.01 -> 5.2.2019.10.12

    @eadwu
    eadwu committed Oct 12, 2019
    Copy the full SHA
    591b1ec View commit details

  2. bcachefs-tools: 2019-10-01 -> 2019-10-12

    @eadwu
    eadwu committed Oct 12, 2019
    Copy the full SHA
    05a0a63 View commit details

Commits on Oct 15, 2019

  1. Merge pull request #70528 from eadwu/bcachefs/update-9 

    bcachefs/update-9
    @globin
    globin authored Oct 15, 2019
    Copy the full SHA
    5a12329 View commit details
Showing with 6 additions and 6 deletions.
  1. +3 −3 pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix
  2. +3 −3 pkgs/tools/filesystems/bcachefs-tools/default.nix
6 changes: 3 additions & 3 deletions pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{ stdenv, buildPackages, fetchgit, fetchpatch, perl, buildLinux, ... } @ args:

buildLinux (args // {
version = "5.2.2019.10.01";
version = "5.2.2019.10.12";
modDirVersion = "5.2.0";

src = fetchgit {
url = "https://evilpiepirate.org/git/bcachefs.git";
rev = "45920b5139a752bb4f22871b8b916beacc4f9fb9";
sha256 = "1hi98jckzd8d7whivmgl1ywdfdixhq7la37jagwnwbf8lsqsp25i";
rev = "de906c3e2eddad291d46bd0e7c81c68eaadcd08a";
sha256 = "1ahabp8pd9slf4lchkbyfkagg9vhic0cw3kwvwryzaxxxjmf2hkk";
};

extraConfig = "BCACHEFS_FS m";
6 changes: 3 additions & 3 deletions pkgs/tools/filesystems/bcachefs-tools/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,12 +3,12 @@

stdenv.mkDerivation {
pname = "bcachefs-tools";
version = "2019-10-01";
version = "2019-10-12";

src = fetchgit {
url = "https://evilpiepirate.org/git/bcachefs-tools.git";
rev = "7f69c4161c31b8f43723a9ccad1a9a358f4e2e70";
sha256 = "0v4b8h99cd434v349y8vmhj2igf0ryky7svd20ar1fr7da580kvj";
rev = "6e696ea08703eecd0d1c7b8c520b6f62f06f4f26";
sha256 = "0m3valm68vc73b4kydlga17fglxa9bldrjaszlladzl5bd0zb967";
};

enableParallelBuilding = true;