Author: shlevy
Date: Mon Apr 23 00:12:47 2012
New Revision: 33885
URL: https://nixos.org/websvn/nix/?rev=33885&sc=1
Log:
Linux 3.3.3
This incorporates the btrfs fix, so remove that patch. Also, I will test
that this builds after committing, and fix it if it fails
Deleted:
nixpkgs/trunk/pkgs/os-specific/linux/kernel/btrfs-enospc.patch
Modified:
nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-3.3.nix
nixpkgs/trunk/pkgs/os-specific/linux/kernel/patches.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-3.3.nix
==============================================================================
--- nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-3.3.nix Sun Apr 22
23:35:34 2012 (r33884)
+++ nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-3.3.nix Mon Apr 23
00:12:47 2012 (r33885)
@@ -233,7 +233,7 @@
import ./generic.nix (
rec {
- version = "3.3.2";
+ version = "3.3.3";
testing = false;
preConfigure = ''
@@ -242,7 +242,7 @@
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/"
else ""}linux-${version}.tar.xz";
- sha256 = "19paxvcs3bj32j5fp4ibx963la30p0331w7zvg3zcwmx0ml9pn9y";
+ sha256 = "1i0wxn40iwv4pl3azqq1dhzxi0sxfk4na3lrl9n8k5aip74yqyfb";
};
config = configWithPlatform stdenv.platform;
Modified: nixpkgs/trunk/pkgs/os-specific/linux/kernel/patches.nix
==============================================================================
--- nixpkgs/trunk/pkgs/os-specific/linux/kernel/patches.nix Sun Apr 22
23:35:34 2012 (r33884)
+++ nixpkgs/trunk/pkgs/os-specific/linux/kernel/patches.nix Mon Apr 23
00:12:47 2012 (r33885)
@@ -359,9 +359,4 @@
name = "guruplug-arch-number";
patch = ./guruplug-mach-type.patch;
};
-
- btrfs_enospc =
- { name = "btrfs-enospc-3.3-revert";
- patch = ./btrfs-enospc.patch;
- };
}
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Sun Apr 22 23:35:34
2012 (r33884)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Apr 23 00:12:47
2012 (r33885)
@@ -5736,7 +5736,6 @@
kernelPatches.sec_perm_2_6_24
kernelPatches.aufs3_3
kernelPatches.efi_bootstub_config_3_3
- kernelPatches.btrfs_enospc
];
};
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
