colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Sync with the trunk.

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=25225
This commit is contained in:
Eelco Dolstra 2010-12-21 15:14:33 +00:00
commit c14382cb45
22 changed files with 205 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/editors/emacs-modes/php/builder.sh Normal file
View File

@ -0,0 +1,7 @@
source $stdenv/setup
mkdir -p $out/share/emacs/site-lisp
cd $out/share/emacs/site-lisp
tar xvfz $src
mv php-mode-*/* .
rmdir php-mode-*

12
pkgs/applications/editors/emacs-modes/php/default.nix Normal file
View File

@ -0,0 +1,12 @@
{stdenv, fetchurl}:
stdenv.mkDerivation rec {
name = "php-mode-1.5.0";
src = fetchurl {
url = "http://downloads.sourceforge.net/php-mode/${name}.tar.gz";
sha256 = "1bffgg4rpiggxqc1hvjcby24sfyzj5728zg7r6f4v6a126a7kcfq";
};
builder = ./builder.sh;
}

6
pkgs/applications/misc/adobe-reader/default.nix
View File

@ -3,13 +3,13 @@
assert stdenv.system == "i686-linux";
stdenv.mkDerivation {
name = "adobe-reader-9.3.3-1";
name = "adobe-reader-9.4-1";
builder = ./builder.sh;
src = fetchurl {
url = http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/9.3.3/enu/AdbeRdr9.3.3-1_i486linux_enu.tar.bz2;
sha256 = "1qssbdjy3v07agyh55bhsmvzakq9bs3hd6dw032ikwbpvb2gs807";
url = http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/9.4.0/enu/AdbeRdr9.4-1_i486linux_enu.tar.bz2;
sha256 = "093msw0b5k3ab0vv7bh4n81fxp51s2lynvsm076i5jvlp71l8adf";
};
# !!! Adobe Reader contains copies of OpenSSL, libcurl, and libicu.

16
pkgs/applications/science/logic/coq/default.nix
View File

@ -1,7 +1,7 @@
# TODO:
# - coqide compilation should be optional or (better) separate;
{stdenv, fetchurl, ocaml, camlp5, lablgtk, ncurses}:
{stdenv, fetchurl, ocaml, findlib, camlp5, lablgtk, ncurses}:
let
version = "8.3";
@ -15,15 +15,17 @@ stdenv.mkDerivation {
sha256 = "02iy4rxz1n1kc85fb3vs4xpxqfxjw87y2gvmi39fxrj8742qx0dx";
};
buildInputs = [ ocaml camlp5 ncurses lablgtk ];
buildInputs = [ ocaml findlib camlp5 ncurses lablgtk ];
prefixKey = "-prefix ";
configureFlags =
"-camldir ${ocaml}/bin " +
"-camlp5dir ${camlp5}/lib/ocaml/camlp5 " +
"-lablgtkdir ${lablgtk}/lib/ocaml/lablgtk2 " +
"-opt -coqide opt";
preConfigure = ''
configureFlagsArray=(
-camldir ${ocaml}/bin
-camlp5dir $(ocamlfind query camlp5)
-lablgtkdir ${lablgtk}/lib/ocaml/lablgtk2 -opt -coqide opt
)
'';
buildFlags = "world"; # Debug with "world VERBOSE=1";

8
pkgs/applications/version-management/veracity/src-for-default.nix
View File

@ -1,9 +1,9 @@
rec {
version="0.5.5.10349";
name="veracity-0.5.5.10349";
hash="1059cf0p0kpmylk9228an1kvz49s3d6sd3ncz6dw804z79q16s66";
version="0.5.5.10353";
name="veracity-0.5.5.10353";
hash="06clsn9li6bxdihmzcjd6ch5n6n5wgydd0sw76mk0ljy7s9ylhjr";
url="http://download-us.sourcegear.com/Veracity/nightly/veracity-source-${version}.tar.gz";
advertisedUrl="http://download-us.sourcegear.com/Veracity/nightly/veracity-source-0.5.5.10349.tar.gz";
advertisedUrl="http://download-us.sourcegear.com/Veracity/nightly/veracity-source-0.5.5.10353.tar.gz";
}

10
pkgs/development/compilers/sbcl/src-for-default.nix
View File

@ -1,9 +1,9 @@
rec {
version="1.0.44";
name="sbcl-1.0.44";
hash="0nl1vrz6mibbhjaxbi64gr0sbq9hf2yjc1h4i05kjw5l6dhws8hg";
url="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.44/sbcl-1.0.44-source.tar.bz2";
advertisedUrl="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.44/sbcl-1.0.44-source.tar.bz2";
version="1.0.45";
name="sbcl-1.0.45";
hash="1asl4qy2mizj239cmgnw2dza03h7j3ysrkdavc5gnv9y4gn9miyi";
url="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.45/sbcl-1.0.45-source.tar.bz2";
advertisedUrl="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.45/sbcl-1.0.45-source.tar.bz2";
}

10
pkgs/development/libraries/lablgtk/default.nix
View File

@ -1,15 +1,21 @@
{stdenv, fetchurl, ocaml, pkgconfig, gtk, libgnomecanvas}:
stdenv.mkDerivation (rec {
version = "2.12.0";
version = "2.14.2";
name = "lablgtk-${version}";
src = fetchurl {
url = "http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/${name}.tar.gz";
sha256 = "1kflrg4rqqzrz0ffdzlhz510m82k21m5x78yr5nxd98avcd39qxk";
sha256 = "1fnh0amm7lwgyjdhmlqgsp62gwlar1140425yc1j6inwmgnsp0a9";
};
buildInputs = [ocaml pkgconfig gtk libgnomecanvas];
configureFlags = "--with-libdir=$(out)/lib/ocaml";
buildFlags = "world";
meta = {
platforms = ocaml.meta.platforms;
maintainers = [
stdenv.lib.maintainers.z77z
];
};
})

2
pkgs/development/ocaml-modules/camlzip/default.nix
View File

@ -18,6 +18,8 @@ stdenv.mkDerivation {
patches = [ ./makefile.patch ];
createFindlibDestdir = true;
postPatch = ''
substitute ${./META} META --subst-var-by VERSION "${version}"
substituteInPlace Makefile \

2
pkgs/development/ocaml-modules/camomile/0.7.3.nix
View File

@ -15,7 +15,7 @@ stdenv.mkDerivation {
buildInputs = [ocaml findlib];
#dontAddPrefix = true;
createFindlibDestdir = true;
meta = {
homepage = http://camomile.sourceforge.net/;

2
pkgs/development/ocaml-modules/camomile/0.8.1.nix
View File

@ -15,7 +15,7 @@ stdenv.mkDerivation {
buildInputs = [ocaml findlib];
#dontAddPrefix = true;
createFindlibDestdir = true;
meta = {
homepage = http://camomile.sourceforge.net/;

2
pkgs/development/ocaml-modules/cryptgps/default.nix
View File

@ -17,6 +17,8 @@ stdenv.mkDerivation {
configurePhase = "true"; # Skip configure phase
createFindlibDestdir = true;
meta = {
homepage = http://projects.camlcity.org/projects/cryptgps.html;
description = "Cryptographic functions for OCaml";

2
pkgs/development/ocaml-modules/menhir/default.nix
View File

@ -17,6 +17,8 @@ stdenv.mkDerivation {
configurePhase = "true"; # Skip configure
createFindlibDestdir = true;
preBuild = ''
#Fix makefiles.
RM=$(type -p rm)

2
pkgs/development/ocaml-modules/ounit/default.nix
View File

@ -23,6 +23,8 @@ stdenv.mkDerivation {
checkTarget = "test";
createFindlibDestdir = true;
meta = {
homepage = http://www.xs4all.nl/~mmzeeman/ocaml/;
description = "Unit test framework for OCaml";

2
pkgs/development/ocaml-modules/pcre/default.nix
View File

@ -16,6 +16,8 @@ stdenv.mkDerivation {
buildInputs = [pcre ocaml findlib];
createFindlibDestdir = true;
configurePhase = "true"; # Skip configure phase
meta = {

2
pkgs/development/ocaml-modules/sqlite3/default.nix
View File

@ -23,6 +23,8 @@ stdenv.mkDerivation {
ensureDir $out/bin
'';
createFindlibDestdir = true;
meta = {
homepage = "http://ocaml.info/home/ocaml_sources.html#ocaml-sqlite3";
description = "OCaml bindings to the SQLite 3 database access library";

2
pkgs/development/ocaml-modules/ssl/default.nix
View File

@ -19,6 +19,8 @@ stdenv.mkDerivation {
configureFlags = "--disable-ldconf";
createFindlibDestdir = true;
meta = {
homepage = http://savonet.rastageeks.org/;
description = "OCaml bindings for libssl ";

94
pkgs/development/tools/ocaml/camlp5/META Normal file
View File

@ -0,0 +1,94 @@
# Specifications for the "camlp5" preprocessor:
requires = ""
version = "[distributed with Ocaml]"
description = "Base for camlp5 syntax extensions"
# For the toploop:
archive(byte,toploop,camlp5o) = "camlp5o.cma"
archive(byte,toploop,camlp5r) = "camlp5r.cma"
# Scheme-like syntax:
# Do #predicates "syntax,camlp5scheme", followed by #require "camlp5"
archive(byte,toploop,camlp5scheme) = "camlp5sch.cma"
# Standard ML-like syntax:
# Do #predicates "syntax,camlp5sml", followed by #require "camlp5"
archive(byte,toploop,camlp5sml) = "gramlib.cma camlp5_top.cma pa_sml.cmo"
# Lisp-like syntax:
# Do #predicates "syntax,camlp5lisp", followed by #require "camlp5"
archive(byte,toploop,camlp5lisp) = "gramlib.cma camlp5_top.cma pa_lisp.cmo"
# For the preprocessor itself:
archive(syntax,preprocessor,camlp5o) = "pa_o.cmo pa_op.cmo pr_dump.cmo"
archive(syntax,preprocessor,camlp5r) = "pa_r.cmo pa_rp.cmo pr_dump.cmo"
archive(syntax,preprocessor,camlp5sml) = "pa_sml.cmo pr_dump.cmo"
archive(syntax,preprocessor,camlp5scheme) = "pa_scheme.cmo pr_dump.cmo"
archive(syntax,preprocessor,camlp5lisp) = "pa_lisp.cmo pr_dump.cmo"
preprocessor = "camlp5 -nolib"
package "gramlib" (
requires(toploop) = "camlp5"
version = "[distributed with Ocaml]"
description = "Grammar library to create syntax extensions"
archive(byte) = "gramlib.cma"
archive(byte,toploop) = "" # already contained in camlp5*.cma
archive(native) = "gramlib.cmxa"
)
package "quotations" (
requires = "camlp5"
version = "[distributed with Ocaml]"
description = "Syntax extension: Quotations to create AST nodes"
archive(syntax,preprocessor) = "q_MLast.cmo"
archive(syntax,toploop) = "q_MLast.cmo"
)
package "phony_quotations" (
requires = "camlp5"
version = "[distributed with Ocaml]"
description = "Syntax extension: Phony quotations"
archive(syntax,preprocessor) = "q_phony.cmo"
archive(syntax,toploop) = "q_phony.cmo"
)
package "extend" (
requires = "camlp5"
version = "[distributed with Ocaml]"
description = "Syntax extension: EXTEND the camlp5 grammar"
archive(syntax,preprocessor) = "pa_extend.cmo"
archive(syntax,toploop) = "pa_extend.cmo"
)
package "extfun" (
requires = "camlp5"
version = "[distributed with Ocaml]"
description = "Syntax extension: Extensible functions"
archive(syntax,preprocessor) = "pa_extfun.cmo"
archive(syntax,toploop) = "pa_extfun.cmo"
)
package "fstream" (
requires = "camlp5"
version = "[distributed with Ocaml]"
description = "Syntax extension: Functional stream parsers"
archive(syntax,preprocessor) = "pa_fstream.cmo"
archive(syntax,toploop) = "pa_fstream.cmo"
)
package "macro" (
requires = "camlp5"
version = "[distributed with Ocaml]"
description = "Syntax extension: Conditional compilation"
archive(syntax,preprocessor) = "pa_macro.cmo"
archive(syntax,toploop) = "pa_macro.cmo"
)
package "unit_constraints" (
requires = "camlp5"
version = "[distributed with Ocaml]"
description = "Syntax extension: Type constraints of type unit (revised syntax only)"
archive(syntax,preprocessor,camlp5r) = "pa_ru.cmo"
archive(syntax,toploop,camlp5r) = "pa_ru.cmo"
error(syntax,-camlp5r) = "Not available"
)

15
pkgs/development/tools/ocaml/camlp5/default.nix
View File

@ -1,9 +1,11 @@
{stdenv, fetchurl, ocaml, transitional ? false}:
let
ocaml_version = (builtins.parseDrvName ocaml.name).version;
pname = "camlp5";
version = "5.12";
version = "5.15";
webpage = http://pauillac.inria.fr/~ddr/camlp5/;
metafile = ./META;
in
stdenv.mkDerivation {
@ -12,17 +14,20 @@ stdenv.mkDerivation {
src = fetchurl {
url = "${webpage}/distrib/src/${pname}-${version}.tgz";
sha256 = "985a5e373ea75f89667e71bc857c868c395769fce664cba88aa76f93b0ad8461";
sha256 = "1sx5wlfpydqskm97gp7887p3avbl3vanlmrwj35wx5mbzj6kn9nq";
};
buildInputs = [ ocaml ];
prefixKey = "-prefix ";
configureFlags = if transitional then "--transitional" else "--strict";
preConfigure = "configureFlagsArray=(" + (if transitional then "--transitional" else "--strict") +
" --libdir $out/lib/ocaml/${ocaml_version}/site-lib)";
buildFlags = "world.opt";
postInstall = "cp ${metafile} $out/lib/ocaml/${ocaml_version}/site-lib/camlp5/META";
meta = {
description = "Preprocessor-pretty-printer for OCaml";
longDescription = ''
@ -31,5 +36,9 @@ stdenv.mkDerivation {
'';
homepage = "${webpage}";
license = "BSD";
platforms = ocaml.meta.platforms;
maintainers = [
stdenv.lib.maintainers.z77z
];
};
}

8
pkgs/development/tools/ocaml/findlib/default.nix
View File

@ -40,7 +40,9 @@ stdenv.mkDerivation {
export OCAMLPATH="''${OCAMLPATH}''${OCAMLPATH:+:}''$1/lib/ocaml/${ocaml_version}/site-lib/"
fi
export OCAMLFIND_DESTDIR="''$out/lib/ocaml/${ocaml_version}/site-lib/"
ensureDir ''$OCAMLFIND_DESTDIR
if test -n $createFindlibDestdir; then
ensureDir $OCAMLFIND_DESTDIR
fi
}
envHooks=(''${envHooks[@]} addOCamlPath)
@ -50,5 +52,9 @@ stdenv.mkDerivation {
homepage = http://projects.camlcity.org/projects/findlib.html;
description = "O'Caml library manager";
license = "MIT/X11";
platforms = ocaml.meta.platforms;
maintainers = [
stdenv.lib.maintainers.z77z
];
};
}

4
pkgs/os-specific/linux/kernel/linux-2.6.32.nix
View File

@ -198,11 +198,11 @@ in
import ./generic.nix (
rec {
version = "2.6.32.26";
version = "2.6.32.27";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2";
sha256 = "1kpkl5ps8xrwddmn90rzynra49am9rdm37smplhf3w3ifvpc1mf3";
sha256 = "08zj1mysfhqz81vmly2cassbf6r5nzi9y6sps27c8sz9xfwzly5c";
};
config = configWithPlatform stdenv.platform;

6
pkgs/os-specific/linux/nvidia-x11/default.nix
View File

@ -7,7 +7,7 @@
with stdenv.lib;
let versionNumber = "260.19.21"; in
let versionNumber = "260.19.29"; in
stdenv.mkDerivation {
name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernel.version}"}";
@ -18,12 +18,12 @@ stdenv.mkDerivation {
if stdenv.system == "i686-linux" then
fetchurl {
url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run";
sha256 = "1gr11icpi1jcba39i86mvb6yvawika04hja2c2gri9mz7bbbn1kp";
sha256 = "0zbjmpwbc35bzg15j8zs7xy3qlaywhrb8mmps7df8bv59fb0krxn";
}
else if stdenv.system == "x86_64-linux" then
fetchurl {
url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run";
sha256 = "1pl5pwp72vdvw74449pv9h4hnygg5sasz8z3f0vbmch4c8hdmyz9";
sha256 = "119dhzafkfijfw94hw7sz0iffp1lshdh6vadvr6d1vr6hpcggdw6";
}
else throw "nvidia-x11 does not support platform ${stdenv.system}";

38
pkgs/top-level/all-packages.nix
View File

@ -2026,6 +2026,12 @@ let
mkOcamlPackages = ocaml: self: let callPackage = newScope self; in rec {
inherit ocaml;
camlp5_strict = callPackage ../development/tools/ocaml/camlp5 { };
camlp5_transitional = callPackage ../development/tools/ocaml/camlp5 {
transitional = true;
};
camlzip = callPackage ../development/ocaml-modules/camlzip { };
camomile = camomile_0_7_3;
@ -2036,6 +2042,10 @@ let
findlib = callPackage ../development/tools/ocaml/findlib { };
lablgtk = callPackage ../development/libraries/lablgtk {
inherit (gnome) libgnomecanvas;
};
menhir = callPackage ../development/ocaml-modules/menhir { };
ocaml_batteries = callPackage ../development/ocaml-modules/batteries { };
@ -2440,12 +2450,6 @@ let
byacc = callPackage ../development/tools/parsing/byacc { };
camlp5_strict = callPackage ../development/tools/ocaml/camlp5 { };
camlp5_transitional = callPackage ../development/tools/ocaml/camlp5 {
transitional = true;
};
ccache = callPackage ../development/tools/misc/ccache { };
ctags = callPackage ../development/tools/misc/ctags { };
@ -3285,10 +3289,6 @@ let
krb5 = callPackage ../development/libraries/kerberos/krb5.nix { };
lablgtk = callPackage ../development/libraries/lablgtk {
inherit (gnome) libgnomecanvas;
};
lcms = lcms1;
lcms1 = callPackage ../development/libraries/lcms { };
@ -5728,6 +5728,8 @@ let
# we want it to have higher precedence.
org = hiPrio (callPackage ../applications/editors/emacs-modes/org { });
phpMode = callPackage ../applications/editors/emacs-modes/php { };
prologMode = callPackage ../applications/editors/emacs-modes/prolog { };
proofgeneral = callPackage ../applications/editors/emacs-modes/proofgeneral { };
@ -6201,7 +6203,8 @@ let
};
monotoneViz = builderDefsPackage (import ../applications/version-management/monotone-viz/mtn-head.nix) {
inherit ocaml lablgtk graphviz pkgconfig autoconf automake libtool;
inherit ocaml graphviz pkgconfig autoconf automake libtool;
inherit (ocamlPackages) lablgtk;
inherit (gnome) gtk libgnomecanvas glib;
};
@ -6513,7 +6516,9 @@ let
boost = boostFull;
};
unison = callPackage ../applications/networking/sync/unison { };
unison = callPackage ../applications/networking/sync/unison {
inherit (ocamlPackages) lablgtk;
};
uucp = callPackage ../tools/misc/uucp { };
@ -7089,7 +7094,8 @@ let
### SCIENCE/LOGIC
coq = callPackage ../applications/science/logic/coq {
camlp5 = camlp5_transitional;
inherit (ocamlPackages) findlib lablgtk;
camlp5 = ocamlPackages.camlp5_transitional;
};
cvc3 = callPackage ../applications/science/logic/cvc3 {};
@ -7104,7 +7110,9 @@ let
hol = callPackage ../applications/science/logic/hol { };
hol_light = callPackage ../applications/science/logic/hol_light { };
hol_light = callPackage ../applications/science/logic/hol_light {
inherit (ocamlPackages) camlp5_transitional;
};
hol_light_sources = callPackage ../applications/science/logic/hol_light/sources.nix { };
@ -7131,7 +7139,7 @@ let
spass = callPackage ../applications/science/logic/spass {};
ssreflect = callPackage ../applications/science/logic/ssreflect {
camlp5 = camlp5_transitional;
camlp5 = ocamlPackages.camlp5_transitional;
};
### SCIENCE / ELECTRONICS