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

Commits on May 30, 2019

  1. linux_testing_bcachefs: 5.0.2019.05.08 -> 5.0.2019.05.29

    @eadwu
    eadwu committed May 30, 2019
    Copy the full SHA
    0ce364b View commit details

  2. bcachefs-tools: 2019-05-08 -> 2019-05-29

    @eadwu
    eadwu committed May 30, 2019
    Copy the full SHA
    4ecd28c View commit details

Commits on Jun 1, 2019

  1. Merge pull request #62053 from eadwu/bcachefs/update-3 

    bcachefs: 2019-05-29
    @marsam
    marsam authored Jun 1, 2019
    Copy the full SHA
    3185e53 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 // rec {
version = "5.0.2019.05.08";
version = "5.0.2019.05.29";
modDirVersion = "5.0.0";

src = fetchgit {
url = "https://evilpiepirate.org/git/bcachefs.git";
rev = "454bd4f82d85bb42a86b8eb0172b13e86e5788a7";
sha256 = "1k11yz464lr02yncy231p06ja7w72w9l1nr7cihyiyj1ynzwpdls";
rev = "7e42539c80470cb655bbc46cd0f144de6c644523";
sha256 = "0f7z3awfzdg56rby6z8dh9v9bzyyfn53zgwxmk367mfi0wqk49d2";
};

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 rec {
pname = "bcachefs-tools";
version = "2019-05-08";
version = "2019-05-29";

src = fetchgit {
url = "https://evilpiepirate.org/git/bcachefs-tools.git";
rev = "93bdfcb2105afe7a45d512984b855ce97937cfc1";
sha256 = "125kjf66h9m31xvsanail1i10h4xld4fpv9gs9liqq91hdh0myyj";
rev = "34b93747051055c1076add36f4730c7715e27f07";
sha256 = "1z6ih0mssa9y9yr3v0dzrflliqz8qfdkjb29p9nqbpg8iqi45fa8";
};

enableParallelBuilding = true;