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

Merge branch 'master' into x-updates

Browse Source
This commit is contained in:
Peter Simons 2012-10-10 18:46:48 +02:00
commit 6ff829f19d
25 changed files with 339 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
pkgs/applications/editors/netbeans/default.nix Normal file
View File

@ -0,0 +1,41 @@
{stdenv, fetchurl, oraclejdk, unzip, which, makeWrapper, makeDesktopItem}:
let
desktopItem = makeDesktopItem {
name = "netbeans";
exec = "netbeans";
comment = "Integrated Development Environment";
desktopName = "Netbeans IDE";
genericName = "Integrated Development Environment";
categories = "Application;Development;";
};
in
stdenv.mkDerivation {
name = "netbeans-7.2";
src = fetchurl {
url = http://download.netbeans.org/netbeans/7.2/final/zip/netbeans-7.2-201207171143-ml.zip;
sha256 = "18ya1w291hdnc35vb12yqnai82wmqm7351wn82fax12kzha5fmci";
};
buildCommand = ''
# Unpack and copy the stuff
unzip $src
mkdir -p $out
cp -a netbeans $out
# Create a wrapper capable of starting it
mkdir -p $out/bin
makeWrapper $out/netbeans/bin/netbeans $out/bin/netbeans \
--prefix PATH : ${oraclejdk}/bin:${which}/bin
# Create desktop item, so we can pick it from the KDE/GNOME menu
mkdir -p $out/share/applications
cp ${desktopItem}/share/applications/* $out/share/applications
'';
buildInputs = [ unzip makeWrapper ];
meta = {
description = "An integrated development environment for Java, C, C++ and PHP";
maintainers = [ stdenv.lib.maintainers.sander ];
};
}

8
pkgs/applications/graphics/darktable/default.nix
View File

@ -3,17 +3,17 @@
, libgnome_keyring, gphoto2, gtk, ilmbase, intltool, lcms, lcms2
, lensfun, libXau, libXdmcp, libexif, libglade, libgphoto2, libjpeg
, libpng, libpthreadstubs, libraw1394, librsvg, libtiff, libxcb
, openexr, pixman, pkgconfig, sqlite }:
, openexr, pixman, pkgconfig, sqlite, bash }:
assert stdenv ? glibc;
stdenv.mkDerivation rec {
version = "1.0";
version = "1.0.5";
name = "darktable-${version}";
src = fetchurl {
url = "mirror://sourceforge/darktable/darktable-${version}.tar.gz";
sha256 = "0wjv2x62kf25db61ivbn8y8xr9hr8hdlcjq6l1qxfqn2bn8a3qkm";
sha256 = "0c18530446d2f2459fe533a1ef6fc2711300efe7466f36c23168ec2230fb5fbd";
};
buildInputs =
@ -30,6 +30,8 @@ stdenv.mkDerivation rec {
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${atk}/include/atk-1.0"
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${ilmbase}/include/OpenEXR"
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${openexr}/include/OpenEXR"
substituteInPlace tools/create_preferences.sh.in --replace '#!/usr/bin/env bash' '#!${bash}/bin/bash'
'';
cmakeFlags = [

180
pkgs/applications/networking/browsers/firefox/16.0.nix Normal file
View File

@ -0,0 +1,180 @@
{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL
, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs
, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify
, yasm, mesa, sqlite, unzip, makeWrapper, pysqlite
, # If you want the resulting program to call itself "Firefox" instead
# of "Shiretoko" or whatever, enable this option. However, those
# binaries may not be distributed without permission from the
# Mozilla Foundation, see
# http://www.mozilla.org/foundation/trademarks/.
enableOfficialBranding ? false
}:
assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
rec {
firefoxVersion = "16.0";
xulVersion = "16.0"; # this attribute is used by other packages
src = fetchurl {
url = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";
sha1 = "8f79e4ccf28c57afd341b9fc258931b5f9e62064";
};
commonConfigureFlags =
[ "--enable-optimize"
"--enable-profiling"
"--disable-debug"
"--enable-strip"
"--with-system-jpeg"
"--with-system-zlib"
"--with-system-bz2"
"--with-system-nspr"
"--with-system-nss"
# "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support"
# "--enable-system-cairo" # disabled for the moment because our Cairo is too old
"--enable-system-sqlite"
"--disable-crashreporter"
"--disable-tests"
"--disable-necko-wifi" # maybe we want to enable this at some point
"--disable-installer"
"--disable-updater"
];
xulrunner = stdenv.mkDerivation rec {
name = "xulrunner-${xulVersion}";
inherit src;
buildInputs =
[ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2
python dbus dbus_glib pango freetype fontconfig xlibs.libXi
xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file
alsaLib nspr nss libnotify xlibs.pixman yasm mesa
xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite
xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper
];
configureFlags =
[ "--enable-application=xulrunner"
"--disable-javaxpcom"
] ++ commonConfigureFlags;
enableParallelBuilding = true;
preConfigure =
''
export NIX_LDFLAGS="$NIX_LDFLAGS -L$out/lib/xulrunner-${xulVersion}"
mkdir ../objdir
cd ../objdir
configureScript=../mozilla-release/configure
''; # */
#installFlags = "SKIP_GRE_REGISTRATION=1";
postInstall = ''
# Fix run-mozilla.sh search
libDir=$(cd $out/lib && ls -d xulrunner-[0-9]*)
echo libDir: $libDir
test -n "$libDir"
cd $out/bin
rm xulrunner
for i in $out/lib/$libDir/*; do
file $i;
if file $i | grep executable &>/dev/null; then
echo -e '#! /bin/sh\n"'"$i"'" "$@"' > "$out/bin/$(basename "$i")";
chmod a+x "$out/bin/$(basename "$i")";
fi;
done
for i in $out/lib/$libDir/*.so; do
patchelf --set-rpath "$(patchelf --print-rpath "$i"):$out/lib/$libDir" $i || true
done
for i in $out/lib/$libDir/{plugin-container,xulrunner,xulrunner-stub}; do
wrapProgram $i --prefix LD_LIBRARY_PATH ':' "$out/lib/$libDir"
done
rm -f $out/bin/run-mozilla.sh
''; # */
meta = {
description = "Mozilla Firefox XUL runner";
homepage = http://www.mozilla.com/en-US/firefox/;
};
passthru = { inherit gtk; version = xulVersion; };
};
firefox = stdenv.mkDerivation rec {
name = "firefox-${firefoxVersion}";
inherit src;
enableParallelBuilding = true;
buildInputs =
[ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python
dbus dbus_glib pango freetype fontconfig alsaLib nspr nss libnotify
xlibs.pixman yasm mesa sqlite file unzip pysqlite
];
propagatedBuildInputs = [xulrunner];
configureFlags =
[ "--enable-application=browser"
"--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}"
"--enable-chrome-format=jar"
"--disable-elf-hack"
]
++ commonConfigureFlags
++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding";
makeFlags = [
"SYSTEM_LIBXUL=1"
];
# Hack to work around make's idea of -lbz2 dependency
preConfigure =
''
find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${
stdenv.lib.concatStringsSep ":"
(map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc]))
}' ';'
'';
postInstall =
''
ln -s ${xulrunner}/lib/xulrunner-${xulrunner.version} $(echo $out/lib/firefox-*)/xulrunner
for j in $out/bin/*; do
i="$(readlink "$j")";
file $i;
if file $i | grep executable &>/dev/null; then
rm "$out/bin/$(basename "$i")"
echo -e '#! /bin/sh\nexec "'"$i"'" "$@"' > "$out/bin/$(basename "$i")"
chmod a+x "$out/bin/$(basename "$i")"
fi;
done;
cd "$out/lib/"firefox-*
rm firefox
echo -e '#!${stdenv.shell}\n${xulrunner}/bin/xulrunner "'"$PWD"'/application.ini" "$@"' > firefox
chmod a+x firefox
''; # */
meta = {
description = "Mozilla Firefox - the browser, reloaded";
homepage = http://www.mozilla.com/en-US/firefox/;
maintainers = [ stdenv.lib.maintainers.eelco ];
};
passthru = {
inherit gtk xulrunner nspr;
isFirefox3Like = true;
};
};
}

6
pkgs/development/compilers/go/default.nix
View File

@ -7,11 +7,11 @@ let
in
stdenv.mkDerivation {
name = "go-1.0.2";
name = "go-1.0.3";
src = fetchurl {
url = http://go.googlecode.com/files/go1.0.2.src.tar.gz;
sha256 = "1a4mpkb3bd9dwp0r3fgrfcyk5lgw0f0cfrbskg2lrhc7a12zpz3h";
url = http://go.googlecode.com/files/go1.0.3.src.tar.gz;
sha256 = "1pz31az3icwqfqfy3avms05jnqr0qrbrx9yqsclkdwbjs4rkbfkz";
};
buildInputs = [ bison glibc bash makeWrapper ];

4
pkgs/development/compilers/ocaml/4.00.0.nix → pkgs/development/compilers/ocaml/4.00.1.nix
View File

@ -8,11 +8,11 @@ in
stdenv.mkDerivation rec {
name = "ocaml-4.00.0";
name = "ocaml-4.00.1";
src = fetchurl {
url = "http://caml.inria.fr/pub/distrib/ocaml-4.00/${name}.tar.bz2";
sha256 = "ec886d7bc587ce472fcbdf294feb4b1fa2d8e7ef78ab6a4e66551699435d5cd7";
sha256 = "33c3f4acff51685f5bfd7c260f066645e767d4e865877bf1613c176a77799951";
};
prefixKey = "-prefix ";

8
pkgs/development/compilers/openjdk/default.nix
View File

@ -17,6 +17,9 @@
, libXrender
, libXtst
, libXi
, libXinerama
, libXcursor
, fontconfig
, cpio
, jreOnly ? false
}:
@ -82,8 +85,13 @@ stdenv.mkDerivation rec {
libXrender
libXtst
libXi
libXinerama
libXcursor
fontconfig
];
NIX_LDFLAGS = "-lfontconfig -lXcursor -lXinerama";
postUnpack = ''
mkdir -p drops
cp ${jaxp_src} drops/${jaxp_src_name}

9
pkgs/development/ocaml-modules/extlib/default.nix
View File

@ -4,11 +4,10 @@ stdenv.mkDerivation {
name = "ocaml-extlib-1.5.2";
src = fetchurl {
url = "http://ocaml-extlib.googlecode.com/files/extlib-1.5.2.tar.gz";
sha256 = "ca6d69adeba4242ce41c02a23746ba1e464c0bbec66e2d16b02c3c6e85dc10aa";
url = http://ocaml-extlib.googlecode.com/files/extlib-1.5.3.tar.gz;
sha256 = "c095eef4202a8614ff1474d4c08c50c32d6ca82d1015387785cf03d5913ec021";
};
patches = [ ./hashtable-ocaml4-compat.patch ];
buildInputs = [ocaml findlib];
createFindlibDestdir = true;
@ -19,9 +18,9 @@ stdenv.mkDerivation {
'';
meta = {
homepage = "http://code.google.com/p/ocaml-extlib/";
homepage = http://code.google.com/p/ocaml-extlib/;
description = "Enhancements to the OCaml Standard Library modules";
license = "LGPL";
license = stdenv.lib.licenses.lgpl21;
platforms = ocaml.meta.platforms;
};
}

12
pkgs/development/ocaml-modules/extlib/hashtable-ocaml4-compat.patch
View File

@ -1,12 +0,0 @@
Revision 396 from the official extlib repository.
--- extlib/extHashtbl.ml (revision 395)
+++ extlib/extHashtbl.ml (working copy)
@@ -32,6 +32,7 @@
}
include Hashtbl
+ let create n = Hashtbl.create (* no seed *) n
external h_conv : ('a, 'b) t -> ('a, 'b) h_t = "%identity"
external h_make : ('a, 'b) h_t -> ('a, 'b) t = "%identity"

7
pkgs/development/ocaml-modules/ocamlnet/default.nix
View File

@ -2,15 +2,14 @@
let
ocaml_version = (builtins.parseDrvName ocaml.name).version;
version = "3.1";
in
stdenv.mkDerivation {
name = "ocamlnet-${version}";
name = "ocamlnet-3.6";
src = fetchurl {
url = "http://download.camlcity.org/download/ocamlnet-${version}.tar.gz";
sha256 = "0kdc2540ad84j6haj9jxlwryz9cb8q8kjdr48f2wgvcaii38v9f5";
url = http://download.camlcity.org/download/ocamlnet-3.6.tar.gz;
sha256 = "306c20aee6512be3564c0f39872b70f929c06e1e893cfcf528ac47ae35cf7a69";
};
buildInputs = [ncurses ocaml findlib ocaml_pcre camlzip openssl ocaml_ssl];

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

@ -5,11 +5,11 @@ let
in
stdenv.mkDerivation {
name = "ounit-1.1.0";
name = "ounit-1.1.2";
src = fetchurl {
url = http://forge.ocamlcore.org/frs/download.php/495/ounit-1.1.0.tar.gz;
sha256 = "12vybg9xlw5c8ip23p8cljfzhkdsm25482sf1yh46fcqq8p2jmqx";
url = http://forge.ocamlcore.org/frs/download.php/886/ounit-1.1.2.tar.gz;
sha256 = "e6bc1b0cdbb5b5552d85bee653e23aafe20bb97fd7cd229c867d01ff999888e3";
};
buildInputs = [ocaml findlib];
@ -25,7 +25,7 @@ stdenv.mkDerivation {
meta = {
homepage = http://www.xs4all.nl/~mmzeeman/ocaml/;
description = "Unit test framework for OCaml";
license = "MIT/X11";
license = stdenv.lib.licenses.mit;
platforms = ocaml.meta.platforms;
maintainers = [
stdenv.lib.maintainers.z77z

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

@ -2,28 +2,18 @@
let
ocaml_version = (builtins.parseDrvName ocaml.name).version;
pname = "camlp5";
version = "6.02.3";
webpage = http://pauillac.inria.fr/~ddr/camlp5/;
metafile = ./META;
in
stdenv.mkDerivation {
name = "${pname}${if transitional then "_transitional" else ""}-${version}";
name = "camlp5${if transitional then "_transitional" else ""}-6.06";
src = fetchurl {
url = "${webpage}/distrib/src/${pname}-${version}.tgz";
sha256 = "1z9bwh267117br0vlhirv9yy2niqp2n25zfnl14wg6kgg9bqx7rj";
url = http://pauillac.inria.fr/~ddr/camlp5/distrib/src/camlp5-6.06.tgz;
sha256 = "763f89ee6cde4ca063a50708c3fe252d55ea9f8037e3ae9801690411ea6180c5";
};
patches = fetchurl {
url = "${webpage}/distrib/src/patch-${version}-1";
sha256 = "159qpvr07mnn72yqwx24c6mw7hs6bl77capsii7apg9dcxar8w7v";
};
patchFlags = "-p 0";
buildInputs = [ ocaml ];
prefixKey = "-prefix ";
@ -41,8 +31,8 @@ stdenv.mkDerivation {
Camlp5 is a preprocessor and pretty-printer for OCaml programs.
It also provides parsing and printing tools.
'';
homepage = "${webpage}";
license = "BSD";
homepage = http://pauillac.inria.fr/~ddr/camlp5/;
license = stdenv.lib.licenses.bsd3;
platforms = ocaml.meta.platforms;
maintainers = [
stdenv.lib.maintainers.z77z

6
pkgs/misc/screensavers/xscreensaver/default.nix
View File

@ -4,12 +4,12 @@
}:
stdenv.mkDerivation rec {
version = "5.18";
version = "5.19";
name = "xscreensaver-${version}";
src = fetchurl {
url = "http://www.jwz.org/xscreensaver/${name}.tar.gz";
sha256 = "3d70edb8f46511f5427f21b4ba4d8323f336888f60268d16731f5231c6883db9";
sha256 = "fd62ea0f996abe1bea3770dd7141681454521b49302f9bced8af9c2ee428c0e0";
};
buildInputs =
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
''
# Fix build error in version 5.18. Remove this patch when updating
# to a later version.
sed -i -e '/AF_LINK/d' hacks/glx/sonar-icmp.c
#sed -i -e '/AF_LINK/d' hacks/glx/sonar-icmp.c
# Fix path to GTK.
sed -e 's%@GTK_DATADIR@%@datadir@% ; s%@PO_DATADIR@%@datadir@%' \
-i driver/Makefile.in po/Makefile.in.in

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

@ -230,7 +230,7 @@ in
import ./generic.nix (
rec {
version = "3.0.43";
version = "3.0.45";
preConfigure = ''
substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' ""
@ -238,7 +238,7 @@ import ./generic.nix (
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
sha256 = "1mrsdqsphkixvd5x97nz465r490hr679rq6f98jbyr0g5m4fyc29";
sha256 = "0mgv6iqnfam16v2s8hdxpf2imx49sjhndjc80646lk9053l5rh0d";
};
config = configWithPlatform stdenv.platform;

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

@ -239,7 +239,7 @@ in
import ./generic.nix (
rec {
version = "3.4.11";
version = "3.4.13";
testing = false;
preConfigure = ''
@ -248,7 +248,7 @@ import ./generic.nix (
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
sha256 = "0fda9z5dxvn8sbgr1c143ly8ixm0grymwm4r94nryby9i03s03a2";
sha256 = "16wpnqnjxcrm2aszjdkrn4vlcdm9j35ixnq7myvc432w7pkdqk11";
};
config = configWithPlatform stdenv.platform;

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

@ -240,7 +240,7 @@ in
import ./generic.nix (
rec {
version = "3.5.4";
version = "3.5.6";
testing = false;
preConfigure = ''
@ -249,7 +249,7 @@ import ./generic.nix (
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
sha256 = "09pi00sk55rpl4mbhd27mnfajgy22bm0zwcgi68iyilc5wir1m12";
sha256 = "0z6hklmpm33d1cjwzsny5s03kajp9zmdgxhfrd0aky98x36202gf";
};
config = configWithPlatform stdenv.platform;

5
pkgs/os-specific/linux/kernel/linux-3.6.nix
View File

@ -244,8 +244,7 @@ in
import ./generic.nix (
rec {
version = "3.6";
modDirVersion = "3.6.0";
version = "3.6.1";
testing = false;
preConfigure = ''
@ -254,7 +253,7 @@ import ./generic.nix (
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
sha256 = "0kvqj6bhzcq581aav8mjzzxisz7s5vwng7b5kwzp2d8p3kpsdfaa";
sha256 = "0jpjhnp0pnly2nvfhb5z2wqaw66yzr9pd477rsdmx1wi9gsp07mz";
};
config = configWithPlatform stdenv.platform;

16
pkgs/os-specific/linux/kernel/patches.nix
View File

@ -189,6 +189,21 @@ rec {
features.aufs3 = true;
};
# not officially released yet, but 3.x seems to work fine
aufs3_6 = rec {
name = "aufs3.6";
version = "3.x.20120827";
utilRev = "91af15f977d12e02165759620005f6ce1a4d7602";
utilHash = "dda4df89828dcf0e4012d88b4aa3eda8c30af69d6530ff5fedc2411de872c996";
patch = makeAufs3StandalonePatch {
inherit version;
rev = "46660ad144289fa1f0aca59bd00d592b560d0dbb";
sha256 = "823b7b4c011c103d63711900b3213008de3c9e408b909e0cc2b8697c1e82b67d";
};
features.aufsBase = true;
features.aufs3 = true;
};
# Increase the timeout on CIFS requests from 15 to 120 seconds to
# make CIFS more resilient to high load on the CIFS server.
cifs_timeout_2_6_15 =
@ -226,6 +241,7 @@ rec {
patch = ./dell-rfkill.patch;
};
# seems no longer necessary on 3.6
perf3_5 =
{ name = "perf-3.5";
patch = ./perf-3.5.patch;

18
pkgs/servers/http/nginx/default.nix
View File

@ -1,10 +1,13 @@
{ stdenv, fetchurl, openssl, zlib, pcre, libxml2, libxslt }:
stdenv.mkDerivation rec {
name = "nginx-1.1.7";
name = "nginx-1.2.4";
src = fetchurl {
url = "http://nginx.org/download/${name}.tar.gz";
sha256 = "1y0bzmrgnyqw8ghc508nipy5k46byrxc2sycqp35fdx0jmjz3h51";
sha256 = "0hvcv4lgfcrsl40azkd3rxhf73l05jzzgflclpkdvjd95xgw51y5";
};
buildInputs = [ openssl zlib pcre libxml2 libxslt ];
configureFlags = [
@ -15,7 +18,7 @@ stdenv.mkDerivation rec {
"--with-http_gzip_static_module"
"--with-http_secure_link_module"
# Install destination problems
# "--with-http_perl_module"
# "--with-http_perl_module"
];
preConfigure = ''
@ -27,11 +30,8 @@ stdenv.mkDerivation rec {
'';
meta = {
description = "nginx - 'engine x' - reverse proxy and lightweight webserver";
maintainers = [
stdenv.lib.maintainers.raskin
];
platforms = with stdenv.lib.platforms;
all;
description = "A reverse proxy and lightweight webserver";
maintainers = [ stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.all;
};
}

6
pkgs/servers/samba/default.nix
View File

@ -18,11 +18,11 @@
assert useKerberos -> kerberos != null;
stdenv.mkDerivation rec {
name = "samba-3.6.7";
name = "samba-3.6.8";
src = fetchurl {
url = "http://us3.samba.org/samba/ftp/stable/${name}.tar.gz";
sha256 = "1jnl9v6axz30ymh6in1fwan7zjy9n5n7x70vi1afazxs27qa0n5q";
sha256 = "1phl6mmrc72jyvbyrw6cv6b92cxq3v2pbn1fh97nnb4hild1fnjg";
};
patches =
@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
''
mkdir -p $out
mv $TMPDIR/inst/$out/* $out/
mkdir -pv $out/lib/cups/backend
ln -sv ../../../bin/smbspool $out/lib/cups/backend/smb
mkdir -pv $out/etc/openldap/schema

6
pkgs/servers/sql/mysql/jdbc/default.nix
View File

@ -1,12 +1,12 @@
{stdenv, fetchurl, ant, unzip}:
stdenv.mkDerivation {
name = "mysql-connector-java-5.1.17";
name = "mysql-connector-java-5.1.22";
builder = ./builder.sh;
src = fetchurl {
url = ftp://mirror.leaseweb.com/mysql/Downloads/Connector-J/mysql-connector-java-5.1.17.zip;
sha256 = "1c4hsx0qwb3rp66a1dllnah2zi9gqqnr4aqm9p59yrqj5jr22ldp";
url = http://cdn.mysql.com/Downloads/Connector-J/mysql-connector-java-5.1.22.zip;
sha256 = "0hfx1znq0iqclkc8visca7x67lvlk3cswni69ghi2c5cpa2d4ijm";
};
buildInputs = [ unzip ant ];

20
pkgs/servers/sql/postgresql/psqlodbc/default.nix Normal file
View File

@ -0,0 +1,20 @@
{ stdenv, fetchurl, libiodbc, postgresql, openssl }:
stdenv.mkDerivation rec {
name = "psqlodbc-09.01.0200";
src = fetchurl {
url = "http://ftp.postgresql.org/pub/odbc/versions/src/${name}.tar.gz";
sha256 = "0b4w1ahfpp34jpscfk2kv9050lh3xl9pvcysqvaigkcd0vsk1hl9";
};
buildInputs = [ libiodbc postgresql openssl ];
configureFlags = "--with-iodbc=${libiodbc}";
meta = {
homepage = http://psqlodbc.projects.postgresql.org/;
description = "ODBC driver for PostgreSQL";
license = "LGPL";
};
}

6
pkgs/tools/filesystems/btrfsprogs/default.nix
View File

@ -1,14 +1,14 @@
{ stdenv, fetchgit, zlib, libuuid, acl, attr, e2fsprogs }:
let version = "0.19-20120328"; in
let version = "0.20pre20121005"; in
stdenv.mkDerivation {
name = "btrfs-progs-${version}";
src = fetchgit {
url = "git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git";
rev = "1957076ab4fefa47b6efed3da541bc974c83eed7";
sha256 = "566d863c5500652e999d0d6b823365fb06f2f8f9523e65e69eaa3e993e9b26e1";
rev = "91d9eec1ff044394f2b98ee7fcb76713dd33b994";
sha256 = "72d4cd4fb23d876a17146d6231ad40a2151fa47c648485c54cf7478239b43764";
};
buildInputs = [ zlib libuuid acl attr e2fsprogs ];

1
pkgs/tools/misc/debian-devscripts/default.nix
View File

@ -21,6 +21,7 @@ stdenv.mkDerivation rec {
sed -re "s@/etc( |$|/)@$out/etc\\1@" -i Makefile* */Makefile*
'';
postInstall = ''
sed -re 's@(^|[ !`"])/bin/bash@\1${stdenv.shell}@g' -i "$out/bin"/*
for i in "$out/bin"/*; do
wrapProgram "$i" \
--prefix PERL5LIB : "$PERL5LIB" \

4
pkgs/tools/misc/plowshare/default.nix
View File

@ -4,10 +4,10 @@ stdenv.mkDerivation rec {
name = "plowshare-${version}";
version = "git20120916";
version = "20120916";
src = fetchurl {
url = "http://plowshare.googlecode.com/files/plowshare-snapshot-${version}.tar.gz";
url = "http://plowshare.googlecode.com/files/plowshare-snapshot-git${version}.tar.gz";
sha256 = "eccdb28d49ac47782abc8614202b3a88426cd587371641ecf2ec008880dc6067";
};

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

@ -2446,7 +2446,7 @@ let
ocaml_3_12_1 = callPackage ../development/compilers/ocaml/3.12.1.nix { };
ocaml_4_00_0 = callPackage ../development/compilers/ocaml/4.00.0.nix { };
ocaml_4_00_1 = callPackage ../development/compilers/ocaml/4.00.1.nix { };
metaocaml_3_09 = callPackage ../development/compilers/ocaml/metaocaml-3.09.nix { };
@ -2545,7 +2545,7 @@ let
ocamlPackages_3_10_0 = mkOcamlPackages ocaml_3_10_0 pkgs.ocamlPackages_3_10_0;
ocamlPackages_3_11_2 = mkOcamlPackages ocaml_3_11_2 pkgs.ocamlPackages_3_11_2;
ocamlPackages_3_12_1 = mkOcamlPackages ocaml_3_12_1 pkgs.ocamlPackages_3_12_1;
ocamlPackages_4_00_0 = mkOcamlPackages ocaml_4_00_0 pkgs.ocamlPackages_4_00_0;
ocamlPackages_4_00_1 = mkOcamlPackages ocaml_4_00_1 pkgs.ocamlPackages_4_00_1;
ocaml_make = callPackage ../development/ocaml-modules/ocamlmake { };
@ -5437,6 +5437,10 @@ let
postgresql_jdbc = callPackage ../servers/sql/postgresql/jdbc { };
psqlodbc = callPackage ../servers/sql/postgresql/psqlodbc {
postgresql = postgresql91;
};
pyIRCt = builderDefsPackage (import ../servers/xmpp/pyIRCt) {
inherit xmpppy pythonIRClib python makeWrapper;
};
@ -5868,8 +5872,7 @@ let
kernelPatches =
[
kernelPatches.sec_perm_2_6_24
# kernelPatches.aufs3_5
# kernelPatches.perf3_5
kernelPatches.aufs3_6
] ++ lib.optionals (platform.kernelArch == "mips")
[ kernelPatches.mips_fpureg_emu
kernelPatches.mips_fpu_sigill
@ -6965,6 +6968,13 @@ let
firefox15Wrapper = lowPrio (wrapFirefox { browser = firefox15Pkgs.firefox; });
firefox16Pkgs = callPackage ../applications/networking/browsers/firefox/16.0.nix {
inherit (gnome) libIDL;
inherit (pythonPackages) pysqlite;
};
firefox16Wrapper = lowPrio (wrapFirefox { browser = firefox16Pkgs.firefox; });
flac = callPackage ../applications/audio/flac { };
flashplayer = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer-11 {
@ -7446,6 +7456,8 @@ let
navit = callPackage ../applications/misc/navit { };
netbeans = callPackage ../applications/editors/netbeans { };
ncdu = callPackage ../tools/misc/ncdu { };
nedit = callPackage ../applications/editors/nedit {