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: af3732b6c6ad
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a4ec1841da14
Choose a head ref
  • 2 commits
  • 4 files changed
  • 1 contributor

Commits on Feb 13, 2017

  1. Revert "linux: Apply 9p veryloose patch to 4.9" 

    This reverts commit a82810c.

Fixes #22695.
    @edolstra
    edolstra committed Feb 13, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    edolstra Eelco Dolstra
    GPG key ID: 8170B4726D7198DE
    Verified
    Learn about vigilant mode
    Copy the full SHA
    4af79a7 View commit details

  2. VM tests: veryloose -> cache=loose

    @edolstra
    edolstra committed Feb 13, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    edolstra Eelco Dolstra
    GPG key ID: 8170B4726D7198DE
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a4ec184 View commit details
Showing with 8 additions and 9 deletions.
  1. +2 −2 nixos/modules/virtualisation/qemu-vm.nix
  2. +2 −2 pkgs/build-support/vm/default.nix
  3. +3 −3 pkgs/os-specific/linux/kernel/patches.nix
  4. +1 −2 pkgs/top-level/all-packages.nix
4 changes: 2 additions & 2 deletions nixos/modules/virtualisation/qemu-vm.nix
View file
Original file line number Diff line number Diff line change
@@ -440,7 +440,7 @@ in
${if cfg.writableStore then "/nix/.ro-store" else "/nix/store"} =
{ device = "store";
fsType = "9p";
options = [ "trans=virtio" "version=9p2000.L" "veryloose" ];
options = [ "trans=virtio" "version=9p2000.L" "cache=loose" ];
neededForBoot = true;
};
"/tmp" = mkIf config.boot.tmpOnTmpfs
@@ -453,7 +453,7 @@ in
"/tmp/xchg" =
{ device = "xchg";
fsType = "9p";
options = [ "trans=virtio" "version=9p2000.L" "veryloose" ];
options = [ "trans=virtio" "version=9p2000.L" "cache=loose" ];
neededForBoot = true;
};
"/tmp/shared" =
4 changes: 2 additions & 2 deletions pkgs/build-support/vm/default.nix
View file
Original file line number Diff line number Diff line change
@@ -130,7 +130,7 @@ rec {
echo "mounting Nix store..."
mkdir -p /fs${storeDir}
mount -t 9p store /fs${storeDir} -o trans=virtio,version=9p2000.L,veryloose
mount -t 9p store /fs${storeDir} -o trans=virtio,version=9p2000.L,cache=loose
mkdir -p /fs/tmp /fs/run /fs/var
mount -t tmpfs -o "mode=1777" none /fs/tmp
@@ -139,7 +139,7 @@ rec {
echo "mounting host's temporary directory..."
mkdir -p /fs/tmp/xchg
mount -t 9p xchg /fs/tmp/xchg -o trans=virtio,version=9p2000.L,veryloose
mount -t 9p xchg /fs/tmp/xchg -o trans=virtio,version=9p2000.L,cache=loose
mkdir -p /fs/proc
mount -t proc none /fs/proc
6 changes: 3 additions & 3 deletions pkgs/os-specific/linux/kernel/patches.nix
View file
Original file line number Diff line number Diff line change
@@ -175,12 +175,12 @@ rec {
};
};

p9_caching_4_9 = rec
p9_caching_4_4 = rec
{ name = "9p-caching.patch";
patch = fetchpatch {
inherit name;
url = https://github.com/edolstra/linux/commit/7e20254412c780a2102761fee92cb1d32ceeaefd.patch;
sha256 = "001kf1sdy6pirn8sqnfgbfahvwwkc7n7vr5i8fy2n74xph1kks5a";
url = https://github.com/edolstra/linux/commit/d522582553368b9564e2d88a8d7b1d469bf98c65.patch;
sha256 = "01h7461pdgavd6ghd6w9wg136hkaca0mrmmzhy6s3phksksimbc2";
};
};

3 changes: 1 addition & 2 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -11282,6 +11282,7 @@ with pkgs;
kernelPatches =
[ kernelPatches.bridge_stp_helper
kernelPatches.cpu-cgroup-v2."4.4"
kernelPatches.p9_caching_4_4
]
++ lib.optionals ((platform.kernelArch or null) == "mips")
[ kernelPatches.mips_fpureg_emu
@@ -11298,7 +11299,6 @@ with pkgs;
# !!! 4.7 patch doesn't apply, 4.9 patch not up yet, will keep checking
# kernelPatches.cpu-cgroup-v2."4.7"
kernelPatches.modinst_arg_list_too_long
kernelPatches.p9_caching_4_9
]
++ lib.optionals ((platform.kernelArch or null) == "mips")
[ kernelPatches.mips_fpureg_emu
@@ -11311,7 +11311,6 @@ with pkgs;
kernelPatches = [
kernelPatches.bridge_stp_helper
kernelPatches.modinst_arg_list_too_long
kernelPatches.p9_caching_4_9
] ++ lib.optionals ((platform.kernelArch or null) == "mips") [
kernelPatches.mips_fpureg_emu
kernelPatches.mips_fpu_sigill