3
0
Fork 0
forked from mirrors/nixpkgs

* Release notes.

* Linux 2.6.22.6.
* w3m 0.5.2.

svn path=/nixpkgs/trunk/; revision=9305
This commit is contained in:
Eelco Dolstra 2007-09-11 20:05:54 +00:00
parent 8907d0ba89
commit bd0e895bad
5 changed files with 90 additions and 10 deletions

View file

@ -1,3 +1,6 @@
# You may need to override this.
docbookxsl = $(HOME)/.nix-profile/xml/xsl/docbook
XMLLINT = xmllint --catalogs
XSLTPROC = xsltproc --catalogs \
--param section.autolabel 1 \

View file

@ -5,7 +5,7 @@
<title>Nixpkgs Release Notes</title>
<section><title>Release 0.11 (TBA)</title>
<section><title>Release 0.11 (September 11, 2007)</title>
<para>This release has the following improvements:
@ -96,6 +96,56 @@ preConfigure = "configureFlagsArray=(\"CFLAGS=-O0 -g\")";</programlisting>
</para></listitem>
<listitem><para>The function <function>fetchurl</function> now has
support for two different kinds of mirroring of files. First, it
has support for <emphasis>content-addressable mirrors</emphasis>.
For example, given the <function>fetchurl</function> call
<programlisting>
fetchurl {
url = http://releases.mozilla.org/<replaceable>...</replaceable>/firefox-2.0.0.6-source.tar.bz2;
sha1 = "eb72f55e4a8bf08e8c6ef227c0ade3d068ba1082";
}</programlisting>
<function>fetchurl</function> will first try to download this file
from <link
xlink:href="http://nix.cs.uu.nl/dist/tarballs/sha1/eb72f55e4a8bf08e8c6ef227c0ade3d068ba1082"/>.
If that file doesnt exist, it will try the original URL. In
general, the “content-addressed” location is
<replaceable>mirror</replaceable><literal>/</literal><replaceable>hash-type</replaceable><literal>/</literal><replaceable>hash</replaceable>.
There is currently only one content-addressable mirror (<link
xlink:href="http://nix.cs.uu.nl/dist/tarballs"/>), but more can be
specified in the <varname>hashedMirrors</varname> attribute in
<filename>pkgs/build-support/fetchurl/mirrors.nix</filename>, or by
setting the <envar>NIX_HASHED_MIRRORS</envar> environment variable
to a whitespace-separated list of URLs.</para>
<para>Second, <function>fetchurl</function> has support for
widely-mirrored distribution sites such as SourceForge or the Linux
kernel archives. Given a URL of the form
<literal>mirror://<replaceable>site</replaceable>/<replaceable>path</replaceable></literal>,
it will try to download <replaceable>path</replaceable> from a
configurable list of mirrors for <replaceable>site</replaceable>.
(This idea was borrowed from Gentoo Linux.) Example:
<programlisting>
fetchurl {
url = mirror://gnu/gcc/gcc-4.2.0/gcc-core-4.2.0.tar.bz2;
sha256 = "0ykhzxhr8857dr97z0j9wyybfz1kjr71xk457cfapfw5fjas4ny1";
}</programlisting>
Currently <replaceable>site</replaceable> can be
<literal>sourceforge</literal>, <literal>gnu</literal> and
<literal>kernel</literal>. The list of mirrors is defined in
<filename>pkgs/build-support/fetchurl/mirrors.nix</filename>. You
can override the list of mirrors for a particular site by setting
the environment variable
<envar>NIX_MIRRORS_<replaceable>site</replaceable></envar>, e.g.
<programlisting>
export NIX_MIRRORS_sourceforge=http://osdn.dl.sourceforge.net/sourceforge/</programlisting>
</para>
</listitem>
<listitem><para>Important updates:
<itemizedlist>
@ -108,9 +158,11 @@ preConfigure = "configureFlagsArray=(\"CFLAGS=-O0 -g\")";</programlisting>
<listitem><para>X11R7.2.</para></listitem>
<listitem><para>Linux 2.6.20.11.</para></listitem>
<listitem><para>Linux 2.6.21.7 and 2.6.22.6.</para></listitem>
</itemizedlist>.
<listitem><para>Emacs 22.1.</para></listitem>
</itemizedlist>
</para></listitem>
@ -121,6 +173,10 @@ preConfigure = "configureFlagsArray=(\"CFLAGS=-O0 -g\")";</programlisting>
<listitem><para>KDE 3.5.6 Base.</para></listitem>
<listitem><para>Wine 0.9.43.</para></listitem>
<listitem><para>OpenOffice 2.2.1.</para></listitem>
<listitem><para>Many Linux system packages to support
NixOS.</para></listitem>
@ -132,6 +188,21 @@ preConfigure = "configureFlagsArray=(\"CFLAGS=-O0 -g\")";</programlisting>
</para>
<para>The following people contributed to this release:
Andres Löh,
Arie Middelkoop,
Armijn Hemel,
Eelco Dolstra,
Marc Weber,
Mart Kolthof,
Martin Bravenboer,
Michael Raskin,
Wouter den Breejen and
Yury G. Kudryashov.
</para>
</section>

View file

@ -8,11 +8,11 @@ assert sslSupport -> openssl != null;
assert graphicsSupport -> gdkpixbuf != null;
stdenv.mkDerivation {
name = "w3m-0.5.1";
name = "w3m-0.5.2";
builder = ./builder.sh;
src = fetchurl {
url = mirror://sourceforge/w3m/w3m-0.5.1.tar.gz;
md5 = "0678b72e07e69c41709d71ef0fe5da13";
url = mirror://sourceforge/w3m/w3m-0.5.2.tar.gz;
md5 = "ba06992d3207666ed1bf2dcf7c72bf58";
};
inherit openssl boehmgc;
buildInputs = [
@ -20,5 +20,5 @@ stdenv.mkDerivation {
(if sslSupport then openssl else null)
(if graphicsSupport then gdkpixbuf else null)
];
patches = [./bsd.patch];
#patches = [./bsd.patch];
}

View file

@ -124,6 +124,7 @@ rec {
then []
else [first] ++ range (builtins.add first 1) last;
# Return true only if there is an attribute and it is true.
checkFlag = attrSet: name:
if (name == "true") then true else
@ -131,9 +132,11 @@ rec {
if (isInList (getAttr ["flags"] [] attrSet) name) then true else
getAttr [name] false attrSet ;
logicalOR = x: y: x || y;
logicalAND = x: y: x && y;
# Input : attrSet, [ [name default] ... ], name
# Output : its value or default.
getValue = attrSet: argList: name:
@ -145,6 +148,7 @@ rec {
else (getValue attrSet
(tail argList) name)) attrSet );
# Input : attrSet, [[name default] ...], [ [flagname reqs..] ... ]
# Output : are reqs satisfied? It's asserted.
checkReqs = attrSet : argList : condList :
@ -163,7 +167,8 @@ rec {
if (list == []) then false else
if (x == (head list)) then true else
isInList (tail list) x;
uniqList = {inputList, outputList ? []}:
if (inputList == []) then outputList else
let x=head inputList;
@ -172,6 +177,7 @@ rec {
in uniqList {outputList=newOutputList;
inputList = (tail inputList);};
condConcat = name: list: checker:
if list == [] then name else
if checker (head list) then

View file

@ -24,7 +24,7 @@ let
lib = import ../../../lib;
version = "2.6.22.1";
version = "2.6.22.6";
in
@ -34,7 +34,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2";
sha256 = "1n8azbky36l27y6h44pp9abc7h3k3vp6f4y1pvrqgzmywxp6gakb";
sha256 = "18qwmcps0cxirn15427mv833pd3iw0kx7zmvvsi6zkqlmslj8i4i";
};
patches = map (p: p.patch) kernelPatches;