JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,899 Commits 2 Branches 0 Tags 13 GiB
0178a3b7b1
Commit Graph

612 Commits

Author SHA1 Message Date
Michael Raskin
5bf63365d2 Update options according to renaming of them in Zen 
svn path=/nixpkgs/trunk/; revision=19407
 2010-01-13 16:19:48 +00:00
Michael Raskin
fdc45114a7 Remove tabs 
svn path=/nixpkgs/trunk/; revision=19403
 2010-01-13 15:42:08 +00:00
Michael Raskin
77c9077f0a Adding a attrSet to import configuration chunks from 
svn path=/nixpkgs/trunk/; revision=19398
 2010-01-13 15:16:08 +00:00
Eelco Dolstra
0f38401813 * Latest and greatest kernels. 
svn path=/nixpkgs/trunk/; revision=19287
 2010-01-07 14:10:39 +00:00
Eelco Dolstra
ed4447febd * Urgh - generic.nix doesn't expect a `extraConfig' argument. 
svn path=/nixpkgs/trunk/; revision=19205
 2010-01-04 13:14:39 +00:00
Eelco Dolstra
e3c2b77c11 * Add the gcov patch to patches.nix. 
svn path=/nixpkgs/trunk/; revision=19190
 2010-01-03 17:57:08 +00:00
Lluís Batlle i Rossell
d864771e26 Updating from trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=19139
 2009-12-28 11:40:34 +00:00
Lluís Batlle i Rossell
d5aa5641de Fixing the evaluation of the linux kernel (= /= ==) 
svn path=/nixpkgs/branches/stdenv-updates/; revision=19138
 2009-12-28 11:26:23 +00:00
Lluís Batlle i Rossell
1452ce46a4 Fixing the kernel configuration for the sheevaplug 
svn path=/nixpkgs/branches/stdenv-updates/; revision=19137
 2009-12-28 10:35:34 +00:00
Eelco Dolstra
ea5a440d42 * Linux 2.6.32.2, 2.6.27.42. 
svn path=/nixpkgs/trunk/; revision=19091
 2009-12-24 12:48:01 +00:00
Lluís Batlle i Rossell
9ef11e4c4d Made the linux kernel expressions support 'platform' again (thinking on reusing 
most of the kernel expressions for the sheevaplug).
I still have not added anything in the kernels about cross compilation.
I moved the platform definitions out of all-packages.
I have not written good platform definitions for the sheevaplug - only for the
PC.
Only the linux-2.6.32 expression uses the platforms kernelConfig.
The linux-2.6.31 was broken, and I left it broken.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19046
 2009-12-19 12:12:24 +00:00
Lluís Batlle i Rossell
5bae851b1e Merging from trunk. I had to give away some structure to build the native 
sheevaplug kernel, so the kernel does not build in the sheevaplug right now.
I will try to fix that in next commits.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19045
 2009-12-19 11:14:16 +00:00
Eelco Dolstra
c122c7a5ba * Hm, I thought I tested this... 
svn path=/nixpkgs/trunk/; revision=19032
 2009-12-18 12:23:13 +00:00
Eelco Dolstra
cfd6dd29fe * Linux 2.6.32.1. 
svn path=/nixpkgs/branches/kernel-config/; revision=19000
 2009-12-16 19:22:42 +00:00
Eelco Dolstra
f833d465e6 * Enable Kernel Samepage Merging. 
svn path=/nixpkgs/branches/kernel-config/; revision=18949
 2009-12-14 19:30:25 +00:00
Eelco Dolstra
2e5908b1df * Use the kernel config generator for Linux 2.6.25. 
svn path=/nixpkgs/branches/kernel-config/; revision=18948
 2009-12-14 19:08:20 +00:00
Eelco Dolstra
00c641d336 * Use the kernel config generator for Linux 2.6.28. 
* Get rid of Linux 2.6.20 and 2.6.26 (the former was only used for
  building UML).

svn path=/nixpkgs/branches/kernel-config/; revision=18945
 2009-12-14 18:34:46 +00:00
Eelco Dolstra
ec2fd60f88 * Doh! 
svn path=/nixpkgs/branches/kernel-config/; revision=18944
 2009-12-14 18:30:52 +00:00
Eelco Dolstra
c3e80cbc9f * Get User-Mode Linux to build with a newer kernel. Yes, SHELL really 
has to be "/bin/sh" - other values such as "sh" or "bash" or "$(type
  -tP sh)" cause a build error:

  LD      .tmp_vmlinux1
  /nix/store/1yv8i1m76cvwk5w5i5wrk4gj5zyfj6vh-binutils-2.19.1/bin/ld:arch/um/kernel/vmlinux.lds:1: ignoring invalid character `#' in expression
  /nix/store/1yv8i1m76cvwk5w5i5wrk4gj5zyfj6vh-binutils-2.19.1/bin/ld:arch/um/kernel/vmlinux.lds:1: syntax error
  collect2: ld returned 1 exit status

  This is caused by Bash 4.0
  (http://bugzilla.kernel.org/show_bug.cgi?id=13343).

svn path=/nixpkgs/branches/kernel-config/; revision=18941
 2009-12-14 17:22:38 +00:00
Eelco Dolstra
03b4efe9c8 * Use the kernel config generator for Linux 2.6.27. 
* Move kernel patches out of all-packages.nix to
  os-specific/linux/kernel/patches.nix.
* Make the kernel config available under $out/config (it's also in
  $out/lib/modules/$version/build/.config, but that's kind of hard to
  find).

svn path=/nixpkgs/branches/kernel-config/; revision=18937
 2009-12-14 15:28:55 +00:00
Eelco Dolstra
98101f9cb1 * Linux 2.6.32. 
svn path=/nixpkgs/branches/kernel-config/; revision=18932
 2009-12-14 10:15:52 +00:00
Eelco Dolstra
15c6ede144 * Allow options to be ignored if they don't exist by marking them with 
a "?".

svn path=/nixpkgs/branches/kernel-config/; revision=18931
 2009-12-14 09:27:15 +00:00
Eelco Dolstra
71ed6194e1 * Get fbcondecor to work. 
* Barf on ignored options.

svn path=/nixpkgs/branches/kernel-config/; revision=18914
 2009-12-12 18:55:17 +00:00
Eelco Dolstra
03e45e0cb4 * Added a script to generate the kernel configuration. 
`generate-config.pl' runs `make config' to generate a Linux kernel
  configuration file.  For each question (i.e. kernel configuration
  option), unless an override is provided, it answers "m" if possible,
  and otherwise uses the default answer (as determined by the default
  config for the architecture).  This is safer than allmodconfig,
  which answers "y" everywhere it can't answer "m" and thus ends up
  enabling a lot of experimental or debug options.  (For this reason,
  a configuration generated by allmodconfig must be carefully checked
  with every new release to ensure that nothing dangerous is enabled.
  The default config should be safer wrt new kernel releases.)

  Overrides are specified in the `config' argument to generic.nix,
  which is a string that contains lines such as `EXT2_FS_POSIX_ACL y'.
  The script warns about ignored options, and aborts if `make config'
  selects an answer inconsistent with the one in `config'.  This
  allows us to be sure that `make config' doesn't silently override
  our configuration values (e.g., depending on other options, it will
  set FB_TILEBLITTING to "y" even if we want it to be "n").

svn path=/nixpkgs/branches/kernel-config/; revision=18910
 2009-12-12 13:51:07 +00:00
Lluís Batlle i Rossell
89fe676bb3 Updating from trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=18878
 2009-12-10 14:48:45 +00:00
Eelco Dolstra
ebeacec489 * Linux 2.6.27.39. 
svn path=/nixpkgs/trunk/; revision=18838
 2009-12-08 11:38:19 +00:00
Michael Raskin
84eb2eadef Apply patch from Lluis needed for future ARM merge.. 
svn path=/nixpkgs/trunk/; revision=18776
 2009-12-03 07:08:51 +00:00
Lluís Batlle i Rossell
7769ad11bd Updating the logic to put the resulting kernel image into its store path. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=18289
 2009-11-08 17:19:46 +00:00
Lluís Batlle i Rossell
4b27d28701 Porting changes from stdenv-updates into this branch. 
This comes from:
svn diff  ^/nixpkgs/trunk/@18255 ^/nixpkgs/branches/stdenv-updates/ > diff
patch -p0 < diff
and then adding into svn all files new from the patch.

trunk@18255 comes from the last time I updated stdenv-updates from trunk.


svn path=/nixpkgs/stdenv-updates2/; revision=18272
 2009-11-08 00:32:12 +00:00
Eelco Dolstra
45ba16864f * Deleted some obsolete kernels (2.6.20, 2.6.21, 2.6.22, 2.6.23 and 
the 2.6.31rcs).

svn path=/nixpkgs/trunk/; revision=18065
 2009-11-01 17:17:40 +00:00
Eelco Dolstra
41879a5c74 * Linux 2.6.27.38. 
svn path=/nixpkgs/trunk/; revision=17985
 2009-10-28 12:07:00 +00:00
Ludovic Courtès
37b42b3ab7 Linux: Enable `sdhci', for Ricoh SD readers. 
svn path=/nixpkgs/trunk/; revision=17954
 2009-10-25 15:22:54 +00:00
Eelco Dolstra
21ddf5e52e * Linux 2.6.27.37. 
svn path=/nixpkgs/trunk/; revision=17909
 2009-10-21 13:07:09 +00:00
Eelco Dolstra
213519d327 * Linux 2.6.27.35. 
svn path=/nixpkgs/trunk/; revision=17422
 2009-09-25 18:59:07 +00:00
Michael Raskin
f4162c9716 Turn off more debug options not needed by default 
svn path=/nixpkgs/trunk/; revision=17103
 2009-09-13 20:22:37 +00:00
Michael Raskin
a8fa3e9cc9 Removing more debugging options from default 2.6.31 config 
svn path=/nixpkgs/trunk/; revision=17101
 2009-09-13 20:10:19 +00:00
Michael Raskin
01063c854b Remove option stopping 2.6.31 from booting 
svn path=/nixpkgs/trunk/; revision=17094
 2009-09-13 16:24:44 +00:00
Michael Raskin
0462878b22 Fixing a typo 
svn path=/nixpkgs/trunk/; revision=17067
 2009-09-12 07:33:55 +00:00
Michael Raskin
a5023cf381 Adding 2.6.31 kernel and trying to generate config for it without manual operations 
svn path=/nixpkgs/trunk/; revision=17065
 2009-09-12 07:13:20 +00:00
Michael Raskin
491255bbb3 Trying to add Zen Linux Kernel 
svn path=/nixpkgs/trunk/; revision=17050
 2009-09-11 13:16:18 +00:00
Eelco Dolstra
2dffe66c92 * Linux 2.6.27.31. 
svn path=/nixpkgs/trunk/; revision=16754
 2009-08-18 09:29:03 +00:00
Eelco Dolstra
e8dbd26bee * Linux 2.6.27.29. 
svn path=/nixpkgs/trunk/; revision=16554
 2009-08-03 10:04:20 +00:00
Michael Raskin
be5fc98c97 Really non-PAE configuration this time 
svn path=/nixpkgs/trunk/; revision=16552
 2009-08-03 09:25:57 +00:00
Michael Raskin
3baa3663c9 Try newer -RC kernel 
svn path=/nixpkgs/trunk/; revision=16504
 2009-07-29 18:10:26 +00:00
Michael Raskin
15bec036fa Add 2.6.31-rc2 kernel for now : rc3 has a BtrFS stability regression 
svn path=/nixpkgs/trunk/; revision=16384
 2009-07-16 06:30:25 +00:00
Michael Raskin
8eefb03231 Fix typo 
svn path=/nixpkgs/trunk/; revision=16383
 2009-07-15 21:09:17 +00:00
Michael Raskin
0865385a29 Add a config for older x86 processors without PAE support. Turn off PAT for a good measure, too 
svn path=/nixpkgs/trunk/; revision=16382
 2009-07-15 21:01:24 +00:00
Michael Raskin
57c8392eee Fixed cmdline override in 2.6.31-rc3 kernel config 
svn path=/nixpkgs/trunk/; revision=16362
 2009-07-14 19:24:10 +00:00
Michael Raskin
a310f4f2a0 Forgot to turn off debugging options in all-mod-config.. 
svn path=/nixpkgs/trunk/; revision=16347
 2009-07-14 10:23:45 +00:00
Michael Raskin
396ae631ea Add AMD64 config for 2.6.31-rc3 
svn path=/nixpkgs/trunk/; revision=16346
 2009-07-14 09:57:51 +00:00
Michael Raskin
64c89c7532 Oops, mixed up hashes 
svn path=/nixpkgs/trunk/; revision=16345
 2009-07-14 09:18:22 +00:00
Michael Raskin
ad2f62980a Try building a really full-featured configuration of the fresh Linux kernel pre-release 
svn path=/nixpkgs/trunk/; revision=16344
 2009-07-14 09:13:59 +00:00
Eelco Dolstra
bfadd94cec * Kernel updates. 
svn path=/nixpkgs/trunk/; revision=16155
 2009-07-03 09:11:46 +00:00
Eelco Dolstra
85479e92d1 * Linux 2.6.29.5. 
* Build the PC speaker as a module.  This allows people who are
  annoyed by beeps (e.g. users of Dell Latitude D6xx laptops) to get
  rid of them :-)

svn path=/nixpkgs/trunk/; revision=15983
 2009-06-17 12:26:22 +00:00
Eelco Dolstra
588eb7a351 * Linux 2.6.27.25. 
svn path=/nixpkgs/trunk/; revision=15962
 2009-06-15 15:05:42 +00:00
Eelco Dolstra
e559192847 * Fix module installation. 
svn path=/nixpkgs/trunk/; revision=15887
 2009-06-07 21:49:14 +00:00
Eelco Dolstra
86e3458dd7 * Linux 2.6.29. It doesn't build yet due to some depmod problem. 
svn path=/nixpkgs/trunk/; revision=15884
 2009-06-06 23:09:38 +00:00
Eelco Dolstra
6645fcb0c5 * Oops. 
svn path=/nixpkgs/trunk/; revision=15821
 2009-06-02 12:29:40 +00:00
Eelco Dolstra
32aa1eacf3 * Linux 2.6.27.24, 2.6.28.10. 
svn path=/nixpkgs/trunk/; revision=15819
 2009-06-02 09:48:01 +00:00
Michael Raskin
65a87fefd5 Fix kernel builder - fails, depending on FS behavior 
svn path=/nixpkgs/trunk/; revision=15437
 2009-05-04 10:51:51 +00:00
Michael Raskin
10b1740dab Copy all the headers already - problems with module building seem to be worse than hdd usage 
svn path=/nixpkgs/trunk/; revision=15423
 2009-05-02 14:18:22 +00:00
Eelco Dolstra
7689a348c4 * Got rid of a lot of "postInstall=postInstall" and similar lines in 
builders.  These are redundant now.
* Inlined some trivial builders.
* Removed a few explicit setup-hook creations.  This is done
  automatically now if setupHook is set.
* Deleted the initscripts package.  NixOS doesn't use it anymore.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15276
 2009-04-23 13:31:10 +00:00
Michael Raskin
9379c34b11 Renable preConfigure for kernel builder. Actually needed by custom kernel 
Linux kernel 2.6.29 (release) has a slightly changed Makefile. They now add the prefix for depmod. So in NixOS "make modules_install" fails on depmod. To fix it, our old '/-b \$(INSTALL_MOD_PATH) -r/d' should be replaced with '/-b \$(INSTALL_MOD_PATH)/d'.

svn path=/nixpkgs/trunk/; revision=14811
 2009-03-31 20:10:05 +00:00
Eelco Dolstra
105f9f7b80 * Some kernel updates. 
svn path=/nixpkgs/trunk/; revision=14790
 2009-03-30 15:02:17 +00:00
Ludovic Courtès
b161fd2921 Linux: Build the `sdhci' module, for Ricoh SD readers. 
svn path=/nixpkgs/trunk/; revision=14541
 2009-03-15 14:03:59 +00:00
Eelco Dolstra
f8641d34a2 * Latest kernels. 
svn path=/nixpkgs/trunk/; revision=14486
 2009-03-10 09:05:43 +00:00
Michael Raskin
958a01ffa6 These changes to kernel builder are obviously needed. kQemu is built, but causes kernel oops 
svn path=/nixpkgs/trunk/; revision=14213
 2009-02-24 05:10:36 +00:00
Lluís Batlle i Rossell
f9b79d752a Fixing in general the module construction (there were wrong paths in modules/build). Now kqemu works well for me, for instance. I will take the commit back, if it annoys anyone. 
svn path=/nixpkgs/trunk/; revision=14192
 2009-02-22 20:49:35 +00:00
Eelco Dolstra
a6a74c53f8 * Latest 2.6.{27,28} kernels. 
svn path=/nixpkgs/trunk/; revision=14136
 2009-02-20 10:56:00 +00:00
Eelco Dolstra
5e3c509cb8 * Latest kernels. 
svn path=/nixpkgs/trunk/; revision=14019
 2009-02-10 11:10:12 +00:00
Eelco Dolstra
a6867fa9a3 * Linux 2.6.28.3. 
svn path=/nixpkgs/trunk/; revision=13963
 2009-02-02 19:00:30 +00:00
Eelco Dolstra
858cf3cdcb * Wrong hash. 
svn path=/nixpkgs/trunk/; revision=13899
 2009-01-29 11:00:56 +00:00
Eelco Dolstra
e5349d1716 * Linux 2.6.27.13 and 2.6.28.2. 
svn path=/nixpkgs/trunk/; revision=13887
 2009-01-27 14:56:17 +00:00
Michael Raskin
4e9b120ad2 small fixes to build custom kernel 
svn path=/nixpkgs/trunk/; revision=13795
 2009-01-17 13:40:12 +00:00
Eelco Dolstra
4eedf7dae8 * Install the arch-specific headers for Linux <= 2.6.27 properly 
again.

svn path=/nixpkgs/trunk/; revision=13783
 2009-01-16 10:28:18 +00:00
Eelco Dolstra
89364df3e9 svn path=/nixpkgs/trunk/; revision=13781 2009-01-15 16:22:01 +00:00
Eelco Dolstra
7df6cdf6da * Doh. 
svn path=/nixpkgs/trunk/; revision=13780
 2009-01-15 15:59:59 +00:00
Eelco Dolstra
f89876974e * Use the generic kernel builder. 
svn path=/nixpkgs/trunk/; revision=13779
 2009-01-15 15:54:24 +00:00
Eelco Dolstra
a0670a904e * Reduce duplication between kernel expressions. 
svn path=/nixpkgs/trunk/; revision=13778
 2009-01-15 15:40:23 +00:00
Eelco Dolstra
2188660f2d * CONFIG_LSF should be set on i686, otherwise ext4 can't even mount 
filesystems created by mkfs.ext4 with default options.

svn path=/nixpkgs/trunk/; revision=13777
 2009-01-15 15:11:14 +00:00
Eelco Dolstra
739ef5e82a * Various hacks needed to get the NVIDIA driver to build on 
Linux 2.6.28.  In particular the arch-specific headers
  are in a different place now.  (I'd like to do "make
  headers_install", but it doesn't install all the headers
  that are needed to build external kernel modules.  What
  a mess.)
* Add Linux 2.6.28 to the channel.

svn path=/nixpkgs/trunk/; revision=13775
 2009-01-15 15:00:30 +00:00
Eelco Dolstra
6c0b144efc * Linux 2.6.27.10. 
svn path=/nixpkgs/trunk/; revision=13752
 2009-01-13 09:05:05 +00:00
Eelco Dolstra
33278912fd * Linux 2.6.28. 
svn path=/nixpkgs/trunk/; revision=13743
 2009-01-12 13:11:18 +00:00
Eelco Dolstra
3189f877d0 * Linux 2.6.27.7 
svn path=/nixpkgs/trunk/; revision=13487
 2008-11-28 13:12:43 +00:00
Eelco Dolstra
dbc520876d * Linux 2.6.27.4. Not tested yet. 
svn path=/nixpkgs/trunk/; revision=13144
 2008-10-29 12:34:54 +00:00
Eelco Dolstra
3a1136f6ad * Linux 2.6.26.7. 
svn path=/nixpkgs/trunk/; revision=13139
 2008-10-28 16:00:37 +00:00
Eelco Dolstra
e826b90e73 * Linux 2.6.26.6. 
svn path=/nixpkgs/trunk/; revision=13022
 2008-10-09 13:15:45 +00:00
Michael Raskin
3a7ffa5c58 Some of preparation work for adding Xen. Troubles: 1. Xen Dom0 support not complete in mainline. 2. Xen's love to check for headers in /usr/include. To do afterwards: We need to change bootloading setup a bit. 
svn path=/nixpkgs/trunk/; revision=12941
 2008-10-04 15:24:08 +00:00
Eelco Dolstra
8d7d8fc4bd * Linux 2.6.25.17. 
svn path=/nixpkgs/trunk/; revision=12879
 2008-09-18 09:53:12 +00:00
Eelco Dolstra
29f04e4331 * Linux 2.6.26.5. 
svn path=/nixpkgs/trunk/; revision=12833
 2008-09-09 09:54:33 +00:00
Eelco Dolstra
649ccdd2db * Moved the Linux kernel maintenance notes to the manual, expanded 
them.

svn path=/nixpkgs/trunk/; revision=12739
 2008-08-27 12:59:55 +00:00
Eelco Dolstra
4457e49a90 * Linux 2.6.25.16. 
svn path=/nixpkgs/trunk/; revision=12693
 2008-08-22 12:25:51 +00:00
Eelco Dolstra
eb63b86c6d * Doh doh doh! Use the right config file for the 2.6.26 kernel. 
svn path=/nixpkgs/trunk/; revision=12690
 2008-08-22 10:55:00 +00:00
Eelco Dolstra
16d317e709 * Linux 2.6.26.3. 
svn path=/nixpkgs/trunk/; revision=12674
 2008-08-21 08:33:46 +00:00
Eelco Dolstra
73eaeefcfd * Linux 2.6.25.15. 
svn path=/nixpkgs/trunk/; revision=12583
 2008-08-11 12:01:55 +00:00
Eelco Dolstra
9d0b7c4aa9 * Linux 2.6.26.2. Totally untested of course. 
svn path=/nixpkgs/trunk/; revision=12534
 2008-08-07 14:57:10 +00:00
Eelco Dolstra
f6935cfd98 * Linux 2.6.25.14. 
svn path=/nixpkgs/trunk/; revision=12495
 2008-08-04 17:54:34 +00:00
Eelco Dolstra
9d741c88bf * Linux 2.6.25.11. 
svn path=/nixpkgs/trunk/; revision=12381
 2008-07-18 14:53:48 +00:00
Eelco Dolstra
343d4fc9f6 * Linux 2.6.25.9 
svn path=/nixpkgs/trunk/; revision=12212
 2008-06-29 17:02:08 +00:00
Eelco Dolstra
aadfab6fff * Linux 2.6.25.6. 
svn path=/nixpkgs/trunk/; revision=12032
 2008-06-10 16:37:38 +00:00
Eelco Dolstra
e466241a8d * On Linux 2.6.25, the arch files for i386 and x86_64 are unified in 
arch/x86, so copy them from the right location.

svn path=/nixpkgs/trunk/; revision=11928
 2008-05-29 13:21:47 +00:00
Michael Raskin
e0caa641c0 Packages changes, needed after recent kernel expression restructurisation 
svn path=/nixpkgs/trunk/; revision=11883
 2008-05-22 19:29:23 +00:00
Eelco Dolstra
0aea0db581 * Put all packages that depend on a specific kernel (notably kernel 
modules) together in an attribute set returned by the function
  "kernelPackagesFor" that takes a kernel as argument.  For instance,
  kernelPackages_2_6_23 is the result of calling this function with
  kernel_2_6_23.

  This is necessary in NixOS to make it easier to override the kernel:
  it's not enough to just specify a different kernel (via the
  boot.kernel option), but you also need matching nvidiaDriver, aufs,
  iwlwifi, etc.  Having a single attribute set that contains all
  kernel-related packages makes this much easier.

* The kernel now has a passthru attribute "features" that allows NixOS
  expressions to test whether a kernel has certain features.  For
  instance, the externel "iwlwifi" kernel module package should only
  be built on kernels < 2.6.24, as kernels >= 2.6.24 have iwlwifi
  support integrated.  So the NixOS expressions can do the test
  "kernel.features ? iwlwifi" to see if the iwlwifi package should be
  built.

  Kernel patches can declare additional features.  E.g., the fbsplash
  patch adds a "fbSplash" feature.

svn path=/nixpkgs/trunk/; revision=11881
 2008-05-22 12:01:24 +00:00
Eelco Dolstra
ae972ce4d3 * Linux 2.6.25.4. 
* Updated AUFS for 2.6.25.  Also applied a patch to the kernel that
  AUFS needs, unfortunately.

svn path=/nixpkgs/trunk/; revision=11864
 2008-05-21 09:19:44 +00:00
Eelco Dolstra
c30b6e0476 * Linux 2.6.25.2. 
svn path=/nixpkgs/trunk/; revision=11778
 2008-05-08 10:58:22 +00:00
Eelco Dolstra
c3e2c90fb6 * Linux 2.6.25.1. 
svn path=/nixpkgs/trunk/; revision=11764
 2008-05-06 12:49:37 +00:00
Eelco Dolstra
8d1d839579 * Fix for building Linux 2.6.25. 
svn path=/nixpkgs/trunk/; revision=11712
 2008-04-25 10:22:09 +00:00
Eelco Dolstra
64222f4f33 * Linux 2.6.25 (not tested yet). 
svn path=/nixpkgs/trunk/; revision=11684
 2008-04-22 12:01:53 +00:00
Eelco Dolstra
67af514783 * Another purity fix: don't check for /usr/include/linux/aio.h. 
svn path=/nixpkgs/trunk/; revision=11298
 2008-03-27 10:22:12 +00:00
Michael Raskin
4ec702d2ab Added generic functionality for custom kernels. 
svn path=/nixpkgs/trunk/; revision=11275
 2008-03-24 19:39:42 +00:00
Wouter den Breejen
f9998954b8 New Ext3cow version with some bugs resolved. Updated ext3cow kernel-patch, e3cfsprogs and ext3cow-tools 
svn path=/nixpkgs/trunk/; revision=11027
 2008-03-09 20:06:42 +00:00
Eelco Dolstra
0a8f71fb9c * Linux 2.6.23.17. 
svn path=/nixpkgs/trunk/; revision=10943
 2008-03-04 11:07:37 +00:00
Eelco Dolstra
9274b390f4 * Linux 2.6.23.16, 2.6.22.18 - fix for the vmsplice root exploit. 
svn path=/nixpkgs/trunk/; revision=10622
 2008-02-11 09:04:15 +00:00
Yury G. Kudryashov
5bca69ac34 Nix-expr style review 
Unneded args.something replaced with
args: with args;
line. After this line args is the only place where we can recieve variables from.

Also removed several
buildInputs = [];
lines.

svn path=/nixpkgs/trunk/; revision=10415
 2008-01-30 17:20:48 +00:00
Eelco Dolstra
83d59de5a0 * Linux 2.6.22.16, 2.6.23.14: fixes CVE-2008-0001. 
svn path=/nixpkgs/trunk/; revision=10222
 2008-01-18 16:58:34 +00:00
Eelco Dolstra
7f3bd3adcb * Kernel: disable XEN, the NVIDIA driver doesn't like it. 
* Remove the paravirt patch on >= 2.6.22, which does exactly the
  wrong thing.  What was I smoking?

svn path=/nixpkgs/trunk/; revision=10091
 2008-01-07 18:40:17 +00:00
Eelco Dolstra
07eedae576 * Linux 2.6.23.12. 
svn path=/nixpkgs/trunk/; revision=9965
 2007-12-24 13:43:25 +00:00
Wouter den Breejen
e20c559e5f I have added a special kernel 2.6.21 with the Con Kolivas patches that are designed to improve system responsiveness with specific emphasis on the desktop, but suitable to any workload. (and also the other patches like ext3cow and paravirt-nvidia) 
svn path=/nixpkgs/trunk/; revision=9748
 2007-11-17 16:29:15 +00:00
Eelco Dolstra
2be68dea28 * Doh. 
svn path=/nixpkgs/trunk/; revision=9565
 2007-10-31 15:54:31 +00:00
Eelco Dolstra
dbc1928af6 * Kernel configuration for Linux 2.6.23. 
* More compact way to override kernel configuration options, e.g.
  extraFlags = ["CONFIG_NO_HZ=y" "# CONFIG_IRQBALANCE is not set"];

svn path=/nixpkgs/trunk/; revision=9562
 2007-10-31 14:39:43 +00:00
Wouter den Breejen
02f39c0210 There is a bug in ext3cow causing all rights to reset too root after a remount. The devvers at ext3cow.com are too lazy too release a new version, but the bug is fixed in their svn sources, so ive made a patch from those sources, which ive tested and it works. 
svn path=/nixpkgs/trunk/; revision=9515
 2007-10-23 17:56:10 +00:00
Michael Raskin
1994bd5b6a Some corrections to 2.6.23-rc8; builds now 
svn path=/nixpkgs/trunk/; revision=9383
 2007-09-28 20:34:48 +00:00
Michael Raskin
0274e5e95a Added something like linux_2_6_23. Really -rc8. Rationale: 
1. Not to forget all the systemKernel choices.
2. To learn new problems, so that adding actual 2.6.23 will be easily done.

svn path=/nixpkgs/trunk/; revision=9381
 2007-09-28 09:56:47 +00:00
Eelco Dolstra
aae986fcf9 * Linux 2.6.22.9. 
svn path=/nixpkgs/trunk/; revision=9377
 2007-09-27 15:57:01 +00:00
Michael Raskin
dd5daab9d1 Options for kernel and checker for configuration.nix 
svn path=/nixpkgs/trunk/; revision=9371
 2007-09-25 19:03:07 +00:00
Eelco Dolstra
bd0e895bad * Release notes. 
* Linux 2.6.22.6.
* w3m 0.5.2.

svn path=/nixpkgs/trunk/; revision=9305
 2007-09-11 20:05:54 +00:00
Marc Weber
088a6817db added: 
dnsmasq, uisp, fltk libixp_for_wmii, acerhk kernel module, reiserfsprogs, radeontools, msmtp,
procmail, pstree, gxemul

changed:
umlutilities to also support building tunctl optionally (needing kernel header files)
wmii updated and wmiimenu added                                                 

svn path=/nixpkgs/trunk/; revision=9242
 2007-09-03 12:10:57 +00:00
Eelco Dolstra
45a2c87402 * Support for mirror:// URLs a la Gentoo (NIXPKGS-70). Instead of 
fetchurl {
      url = http://heanet.dl.sourceforge.net/sourceforge/zapping/zapping-0.9.6.tar.bz2;
      md5 = "8306775c6a11de4d72345b5eee970ea6";
    };

  you can write

    fetchurl {
      url = mirror://sourceforge/zapping/zapping-0.9.6.tar.bz2;
      md5 = "8306775c6a11de4d72345b5eee970ea6";
    };

  which causes fetchurl to try the SourceForge mirrors listed in the
  `sourceforge' attribute in build-support/fetchurl/mirrors.nix.
  (They're currently tried in sequence, and the lists of mirrors are
  not configurable yet.)

  The syntax for mirror URLs is mirror://site/path/to/file, where
  `site' is currently one of `sourceforge', `gnu' (mirrors of
  ftp://ftp.gnu.org/pub/gnu) and `kernel' (mirrors of
  http://www.all.kernel.org/pub/).

svn path=/nixpkgs/trunk/; revision=9197
 2007-08-27 12:44:01 +00:00
Eelco Dolstra
aa983025d6 * Linux 2.6.21.7. 
svn path=/nixpkgs/trunk/; revision=9176
 2007-08-20 14:26:32 +00:00
Eelco Dolstra
71e01bd17d * Kernel config for x86_64. 
svn path=/nixpkgs/trunk/; revision=9014
 2007-07-21 02:27:49 +00:00
Eelco Dolstra
d145a966ab * Some notes on updating the NixOS kernel. 
svn path=/nixpkgs/trunk/; revision=9013
 2007-07-21 02:23:34 +00:00
Eelco Dolstra
48d6b12828 * Doh! 
svn path=/nixpkgs/trunk/; revision=9012
 2007-07-21 02:07:09 +00:00
Wouter den Breejen
5e12937f30 Added e3cfsprogs and ext3cow-tools. Ext3cow is a stand-alone disk file system, (e.g. ReiserFS, HFS, NTFS) based on ext3, that supports versioning through copy-on-write and a time-shifting interface. 
svn path=/nixpkgs/trunk/; revision=9010
 2007-07-20 15:50:54 +00:00
Eelco Dolstra
5760cd599d * Linux 2.6.22.1. 
svn path=/nixpkgs/trunk/; revision=9009
 2007-07-20 15:25:45 +00:00
Eelco Dolstra
7685d56072 * Linux 2.6.21.5. 
svn path=/nixpkgs/trunk/; revision=8870
 2007-06-12 12:25:01 +00:00
Eelco Dolstra
1da5e7fd89 * Grmbl. 
svn path=/nixpkgs/trunk/; revision=8833
 2007-06-05 13:18:23 +00:00
Eelco Dolstra
ce25a8286e * CONFIG_FB_TILEBLITTING has to be off, otherwise CONFIG_FB_SPLASH 
will be disabled (and CONFIG_FB_S3 implies CONFIG_FB_TILEBLITTING).

svn path=/nixpkgs/trunk/; revision=8826
 2007-06-04 14:05:22 +00:00
Eelco Dolstra
e954f7ef8b * Linux 2.6.21.3. 
svn path=/nixpkgs/trunk/; revision=8811
 2007-05-31 13:32:22 +00:00
Eelco Dolstra
68252afeec * Urgh, the NL mirror isn't up to date. 
svn path=/nixpkgs/trunk/; revision=8810
 2007-05-31 13:21:00 +00:00
Eelco Dolstra
e9ed8e8800 * Apply the paravirt-nvidia through the kernelPatches argument. 
* Kernel 2.6.20.12.

svn path=/nixpkgs/trunk/; revision=8808
 2007-05-31 11:23:47 +00:00
Wouter den Breejen
50a3e58c2d forgot paravirt nvidia patch for linux kernel 
svn path=/nixpkgs/trunk/; revision=8789
 2007-05-28 14:17:28 +00:00
Wouter den Breejen
5200276c3b nixpkgs dir: nvidia and libsrvg 
svn path=/nixpkgs/trunk/; revision=8785
 2007-05-28 14:10:46 +00:00
Eelco Dolstra
311dc72bf1 * Suppress localversion from kernel patches, allow the user to set 
one.
* Allow the entire kernel configuration to be overridden through a
  function argument.

svn path=/nixpkgs/trunk/; revision=8699
 2007-05-15 12:53:03 +00:00
Eelco Dolstra
34b59c1867 * Linux updated to 2.6.20.11. 
* Build the kernel with the new gcc wrapper so that LINUX_COMPILER
  gets set properly (and in particular so that the kernel version
  string doesn't show "(collect2: ld returned 1 exit status)").

svn path=/nixpkgs/trunk/; revision=8645
 2007-05-02 15:21:55 +00:00
Eelco Dolstra
168a93adc5 * Delete some obsolete packages. 
* Make sure that every package in all-packages.nix has a unique name.
  Not all of them do, but there are now a few helper functions that
  modify the name of a package for display purposes in nix-env (e.g.,
  you get "zlib-1.2.3" and "zlib-1.2.3-static" in "nix-env -qa").

svn path=/nixpkgs/trunk/; revision=8607
 2007-04-26 13:02:30 +00:00
Eelco Dolstra
8020db073a * Linux 2.6.20.7. 
svn path=/nixpkgs/trunk/; revision=8578
 2007-04-16 10:29:24 +00:00
Eelco Dolstra
e626055170 * Linux 2.6.20.6. 
svn path=/nixpkgs/trunk/; revision=8554
 2007-04-10 11:46:09 +00:00
Eelco Dolstra
9a8b115e57 * UML: purity fix (Makefile refers to /bin/bash). 
svn path=/nixpkgs/trunk/; revision=8437
 2007-03-28 11:21:16 +00:00
Eelco Dolstra
b795dd8d44 * Fix kernel build. 
svn path=/nixpkgs/trunk/; revision=8435
 2007-03-28 10:28:01 +00:00
Eelco Dolstra
a984882e0c * Updated User-Mode Linux. It's now unified with the regular (NixOS) 
kernel build - just call the function with userModeLinux = true to
  get a UML binary.

svn path=/nixpkgs/trunk/; revision=8423
 2007-03-27 11:11:58 +00:00
Eelco Dolstra
b46531c506 * Linux 2.6.20.4. 
svn path=/nixpkgs/trunk/; revision=8414
 2007-03-26 09:32:57 +00:00
Eelco Dolstra
79862accc2 * Linux 2.6.20.3. 
svn path=/nixpkgs/trunk/; revision=8293
 2007-03-14 16:09:29 +00:00
Eelco Dolstra
2df33633a6 * Linux 2.6.20.2. 
svn path=/nixpkgs/trunk/; revision=8286
 2007-03-13 17:34:19 +00:00
Eelco Dolstra
c8ceb3b284 * Grmbl. 
svn path=/nixpkgs/trunk/; revision=7883
 2007-02-08 15:32:14 +00:00
Eelco Dolstra
b78181e71d * x86_64 config. 
svn path=/nixpkgs/trunk/; revision=7881
 2007-02-08 14:53:53 +00:00
Eelco Dolstra
537b3ec57e * Don't use make install. 
svn path=/nixpkgs/trunk/; revision=7880
 2007-02-08 14:28:49 +00:00
Eelco Dolstra
0128374ab0 * Linux 2.6.20. 
svn path=/nixpkgs/trunk/; revision=7879
 2007-02-08 12:34:49 +00:00
Eelco Dolstra
3ceec95cb5 * Config for 2.6.20. 
svn path=/nixpkgs/trunk/; revision=7877
 2007-02-07 16:01:19 +00:00
Eelco Dolstra
64e5fd6b0a * Marvell PATA support (11AB:6101); the TUD buildfarm needs it. 
svn path=/nixpkgs/trunk/; revision=7876
 2007-02-07 15:55:59 +00:00
Eelco Dolstra
d22dd0ffef * Linux 2.6.19.3. 
svn path=/nixpkgs/trunk/; revision=7860
 2007-02-06 14:25:38 +00:00
Eelco Dolstra
e8de94e114 * Kernel patches should declare their .config options so that we don't 
have to keep them in config-blahblah.

svn path=/nixpkgs/trunk/; revision=7747
 2007-01-22 15:18:30 +00:00
Eelco Dolstra
a7878ba0a7 * Doh. 
svn path=/nixpkgs/trunk/; revision=7741
 2007-01-22 13:34:08 +00:00
Eelco Dolstra
b737f2c806 * Forgot to bump the version number. 
svn path=/nixpkgs/trunk/; revision=7740
 2007-01-22 13:33:49 +00:00
Eelco Dolstra
b9fb6e737b * Kernel configuration for x86_64. 
svn path=/nixpkgs/trunk/; revision=7739
 2007-01-22 11:22:14 +00:00
Eelco Dolstra
39c7944803 * Build an SMP kernel. 
svn path=/nixpkgs/trunk/; revision=7738
 2007-01-22 11:08:30 +00:00
Eelco Dolstra
2fccf41b94 * Put the platform in the config file name. 
svn path=/nixpkgs/trunk/; revision=7737
 2007-01-22 11:05:17 +00:00
Eelco Dolstra
8db4c2d806 * Obsolete. 
svn path=/nixpkgs/trunk/; revision=7736
 2007-01-22 10:01:21 +00:00
Eelco Dolstra
4c5f454f54 * Another attempt. 
svn path=/nixpkgs/trunk/; revision=7526
 2007-01-01 14:25:21 +00:00
Eelco Dolstra
b19d591a7e * Another attempt at fixing NIXPKGS-37. 
svn path=/nixpkgs/trunk/; revision=7525
 2007-01-01 14:17:06 +00:00
Eelco Dolstra
8feb1d109b * Better fix for NIXPKGS-37: don't let check-lxdialog.sh look in 
/usr.

svn path=/nixpkgs/trunk/; revision=7524
 2007-01-01 13:42:23 +00:00
Eelco Dolstra
e9c1e32a0f * Work around an ncurses impurity. 
svn path=/nixpkgs/trunk/; revision=7523
 2007-01-01 11:45:48 +00:00
Eelco Dolstra
e81c87c122 * Linux 2.6.19.1. 
svn path=/nixpkgs/trunk/; revision=7522
 2007-01-01 02:01:06 +00:00
Eelco Dolstra
3df5921afe * FB_SPLASH requires FB_TILEBLITTING to be off. 
svn path=/nixpkgs/trunk/; revision=7132
 2006-11-25 13:23:52 +00:00
Eelco Dolstra
6068fe8440 * Turn on fbsplash. 
svn path=/nixpkgs/trunk/; revision=7130
 2006-11-25 11:29:10 +00:00
Eelco Dolstra
f95a14fa22 * Linux 2.6.18.3. 
* fbsplash kernel patch (from Gentoo - better than SUSE's bootsplash).

svn path=/nixpkgs/trunk/; revision=7129
 2006-11-25 11:10:50 +00:00
Eelco Dolstra
039b141471 * Generate a modules.dep containing correct paths. 
svn path=/nixpkgs/trunk/; revision=6935
 2006-11-03 08:32:23 +00:00
Eelco Dolstra
b99122d759 * Set MODULE_DIR. 
svn path=/nixpkgs/trunk/; revision=6933
 2006-11-03 00:34:48 +00:00
Eelco Dolstra
e23c7013be * Revert r6921 because now I do want a kernel without builtin IDE 
support and so on (so that I can test kernel modules in initrd).

svn path=/nixpkgs/trunk/; revision=6931
 2006-11-02 23:40:16 +00:00
Eelco Dolstra
faeab47cf8 * Compile IDE support into the kernel rather than in modules. We need 
this until we have some sort of initrd.

svn path=/nixpkgs/trunk/; revision=6921
 2006-10-31 23:01:08 +00:00
Eelco Dolstra
6225e46baf * Use a pure depmod. 
svn path=/nixpkgs/trunk/; revision=6916
 2006-10-31 16:03:19 +00:00
Eelco Dolstra
9a6683d6a2 * Linux kernel: updated to 2.6.18.1. 
* Kernel: accept a list of kernel patches through the kernelPatches
  argument.  The names of the patches are added to the description
  attribute (e.g., "The Linux kernel (with patches:
  skas-2.6.18-v9-pre9)").
* Generic builder (forked in setup-new.sh): support patches that are
  compressed using gzip or bzip2.

svn path=/nixpkgs/trunk/; revision=6913
 2006-10-31 11:40:35 +00:00
Eelco Dolstra
ad897a7c96 * Update more URLs. 
svn path=/nixpkgs/trunk/; revision=6713
 2006-10-12 14:53:45 +00:00
Eelco Dolstra
1442e8ec22 * Copy a bunch of files to nix.cs.uu.nl. 
svn path=/nixpkgs/trunk/; revision=6711
 2006-10-12 13:50:54 +00:00
Eelco Dolstra
f772de22a1 * Updated the kernel to 2.6.17.13. 
* Run `make oldconfig' before building.
* Split buildPhase into configure/build/installPhase.
* Strip the kernel modules for a huge space savings.

svn path=/nixpkgs/trunk/; revision=6555
 2006-09-18 22:09:47 +00:00
Armijn Hemel
541a148e91 change download location (ftp.nluug.nl gives a 550, because of disks that are 
full, and so on...sigh)

svn path=/nixpkgs/trunk/; revision=6290
 2006-08-28 09:58:07 +00:00
Armijn Hemel
d86c05ba13 add mktemp. Oops. 
svn path=/nixpkgs/trunk/; revision=5738
 2006-07-17 15:52:40 +00:00
Armijn Hemel
837136958c make 2.6.11.12 the default again 
svn path=/nixpkgs/trunk/; revision=5737
 2006-07-17 15:34:46 +00:00
Armijn Hemel
4f15479260 restore old config 
svn path=/nixpkgs/trunk/; revision=5736
 2006-07-17 15:34:04 +00:00
Armijn Hemel
f77644624f move the current Nix expression to its own thing 
svn path=/nixpkgs/trunk/; revision=5735
 2006-07-17 15:29:02 +00:00
Armijn Hemel
6f330b4a99 apparently Makefile.cpu is also needed these days 
svn path=/nixpkgs/trunk/; revision=5719
 2006-07-16 18:57:45 +00:00
Armijn Hemel
b9f6522b7c update from 2.6.17.5 to 2.6.17.6. They are releasing kernels so fast that 
2.6.17.4 was still the latest on ftp.nluug.nl when 2.6.17.6 was released :S

svn path=/nixpkgs/trunk/; revision=5717
 2006-07-16 00:32:02 +00:00
Armijn Hemel
8b53847880 new kernel (yet another security update) 
svn path=/nixpkgs/trunk/; revision=5716
 2006-07-15 16:36:03 +00:00
Armijn Hemel
96ec0645aa another security update -> 2.6.17.4 
svn path=/nixpkgs/trunk/; revision=5652
 2006-07-07 13:12:41 +00:00
Armijn Hemel
569bd692f3 update to 2.6.17.3 (security bugs) 
svn path=/nixpkgs/trunk/; revision=5573
 2006-07-04 13:41:23 +00:00
Armijn Hemel
901f950aef new kernel, uses mktemp, use gcc34 for now (but this can probably be changed to 4.1.1, just being conservative here) 
svn path=/nixpkgs/trunk/; revision=5525
 2006-06-24 23:24:42 +00:00
Armijn Hemel
20f0975461 a config for 2.6.17.1 
svn path=/nixpkgs/trunk/; revision=5522
 2006-06-24 21:03:32 +00:00
Eelco Dolstra
3389f4bc36 * Copy lots of files to nix.cs.uu.nl. 
svn path=/nixpkgs/trunk/; revision=4623
 2006-01-30 16:04:03 +00:00
Eelco Dolstra
82e678362f * "." -> "source". 
svn path=/nixpkgs/trunk/; revision=4335
 2005-12-05 14:11:09 +00:00
Armijn Hemel
a849cb0704 add sound support 
svn path=/nixpkgs/trunk/; revision=3743
 2005-08-29 16:13:50 +00:00
Armijn Hemel
9a4f2b9036 embed Nix generated hash into kernel image and module path 
svn path=/nixpkgs/trunk/; revision=3672
 2005-08-23 19:13:00 +00:00
Armijn Hemel
28fb3fd105 random commit (really, I forgot what was changed, not much) 
svn path=/nixpkgs/trunk/; revision=3648
 2005-08-20 17:40:37 +00:00
Armijn Hemel
52317f9a3e add no-op if some files aren't there for copying (and reintroduce "exit 1" for now) 
svn path=/nixpkgs/trunk/; revision=3647
 2005-08-19 23:09:42 +00:00
Armijn Hemel
d91be5b200 remove "exit 1" so our build will succeed 
svn path=/nixpkgs/trunk/; revision=3646
 2005-08-19 22:55:22 +00:00
Armijn Hemel
14c5ad8353 copy all the stuff that is needed for external modules to the store. Ripped 
from Fedora.

svn path=/nixpkgs/trunk/; revision=3645
 2005-08-19 22:43:51 +00:00
Armijn Hemel
6d64c06316 add quotes 
svn path=/nixpkgs/trunk/; revision=3644
 2005-08-19 22:43:17 +00:00
Armijn Hemel
d298fd94f9 add arch argument, needed to copy right things eventually 
svn path=/nixpkgs/trunk/; revision=3642
 2005-08-19 22:03:44 +00:00
Armijn Hemel
76f3ff54cd also remove "i386" from the name. This wasn't accurate anyway, because we 
were building for the i686 hardware platform and not for i386.

svn path=/nixpkgs/trunk/; revision=3641
 2005-08-19 18:18:21 +00:00
Armijn Hemel
be8d5607f5 make the versions match... 
svn path=/nixpkgs/trunk/; revision=3640
 2005-08-19 18:15:56 +00:00
Armijn Hemel
1e5e23ce5d don't forget to actually install modules 
svn path=/nixpkgs/trunk/; revision=3185
 2005-06-16 23:33:59 +00:00
Armijn Hemel
30632d1655 install kernel in the store (whoops, forgot to install modules :S ) 
svn path=/nixpkgs/trunk/; revision=3183
 2005-06-15 14:21:48 +00:00
Armijn Hemel
960fea4002 strip kernel config very heavily 
svn path=/nixpkgs/trunk/; revision=3182
 2005-06-15 13:03:24 +00:00
Armijn Hemel
ef94be2ae1 first stub for kernel compilations. Still a lot missing, doesn't install 
everything correctly, the config currently compile quite a bit (too much for
quick tests). This will change.

 --This line, and those below, will be ignored--

A    linux/kernel
A    linux/kernel/builder.sh
A    linux/kernel/default.nix
A    linux/kernel/config

svn path=/nixpkgs/trunk/; revision=3181
 2005-06-15 12:30:34 +00:00