diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-11-29 16:03:36 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-11-29 16:03:36 +0000 |
commit | 009bfb702d1c018fc32b10bab07d82ded62a1f0b (patch) | |
tree | b4081a1f5eb92df751ce86873ce0880fb044051c /pkgs | |
parent | 9d0330014e3062f341fd8eed362aadb17e85d5dc (diff) | |
parent | 6ff77b7f6cc91746a23c01ecb6ad7ddd04b1c675 (diff) |
* Sync with the trunk.
svn path=/nixpkgs/branches/cve-2010-3856/; revision=24921
Diffstat (limited to 'pkgs')
73 files changed, 1525 insertions, 236 deletions
diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index 937c5df5894bc..eb12aa0819ed5 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -98,6 +98,17 @@ stdenv.mkDerivation rec { url = http://mirrors.linux-bg.org/eclipse/eclipse/downloads/drops/R-3.5.1-200909170800/eclipse-SDK-3.5.1-linux-gtk.tar.gz; sha256 = "0a0lpa7gxg91zswpahi6fvg3csl4csvlym4z2ad5cc1d4yvicp56"; } + else if v == "3.6.1" then + if stdenv.system == "x86_64-linux" then + fetchurl { + url = http://ftp.ing.umu.se/mirror/eclipse/eclipse/downloads/drops/R-3.6.1-201009090800/eclipse-SDK-3.6.1-linux-gtk-x86_64.tar.gz; + sha256 = "1cg9rrb5w978sdqbzz9lnli1lds9zhb6wfsj3wp725bqf1i6v9lg"; + } + else + fetchurl { + url = http://ftp.ing.umu.se/mirror/eclipse/eclipse/downloads/drops/R-3.6.1-201009090800/eclipse-SDK-3.6.1-linux-gtk.tar.gz; + sha256 = "0s48rjaswi8m5gan1zlqvfwb4l06x5nslkq41wpkrbyj9ka8gh4x"; + } else throw "no source for eclipse version ${v} known"; desktopItem = makeDesktopItem { @@ -131,11 +142,12 @@ stdenv.mkDerivation rec { ensureDir $out/share/applications cp ${desktopItem}/share/applications/* $out/share/applications ''; - + meta = { homepage = http://www.eclipse.org/; description = "A extensible multi-language software development environment"; longDescription = '' ''; }; + } diff --git a/pkgs/applications/misc/hello/ex-2/default.nix b/pkgs/applications/misc/hello/ex-2/default.nix index a7cf2b19762fe..62b0059c7ac4b 100644 --- a/pkgs/applications/misc/hello/ex-2/default.nix +++ b/pkgs/applications/misc/hello/ex-2/default.nix @@ -2,6 +2,8 @@ stdenv.mkDerivation rec { name = "hello-2.6"; + + x = 108; src = fetchurl { url = "mirror://gnu/hello/${name}.tar.gz"; diff --git a/pkgs/applications/misc/xneur/default.nix b/pkgs/applications/misc/xneur/default.nix index 5a0c5fc12734a..c7a302c6589fd 100644 --- a/pkgs/applications/misc/xneur/default.nix +++ b/pkgs/applications/misc/xneur/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, xorg, pcre, GStreamer, glib, libxml2 -, aspell, cairo, imlib2, xosd, libnotify, gtk, pango, atk }: +, aspell, cairo, imlib2, xosd, libnotify, gtk, pango, atk, enchant }: let s = import ./src-for-default.nix; in @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ xorg.libX11 pkgconfig pcre GStreamer glib libxml2 aspell cairo xorg.libXpm imlib2 xosd xorg.libXt xorg.libXext xorg.libXi libnotify - gtk pango + gtk pango enchant ]; preConfigure = '' diff --git a/pkgs/applications/misc/xneur/src-for-default.nix b/pkgs/applications/misc/xneur/src-for-default.nix index 497d2adfd2c29..04a22cea79aba 100644 --- a/pkgs/applications/misc/xneur/src-for-default.nix +++ b/pkgs/applications/misc/xneur/src-for-default.nix @@ -1,9 +1,9 @@ rec { - version="0.10.0"; - name="xneur-0.10.0"; - hash="1jh40awnc5bvdj07jv99ymiln8nzr5ac5ahz9v4w0m560b7qq48f"; + version="0.11.1"; + name="xneur-0.11.1"; + hash="12r2wv1glnx3ilqkrypff9r3mxzk1m3yma3khmam1b0z32lfbxxx"; url="http://dists.xneur.ru/release-${version}/tgz/xneur-${version}.tar.bz2"; - advertisedUrl="http://dists.xneur.ru/release-0.10.0/tgz/xneur-0.10.0.tar.bz2"; + advertisedUrl="http://dists.xneur.ru/release-0.11.1/tgz/xneur-0.11.1.tar.bz2"; } diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index caa8430f0cd23..db8adeeb45fc9 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -1,61 +1,37 @@ -{ stdenv -, fetchurl -, ffmpeg -, cairo -, pango -, glib -, libXrender -, libXScrnSaver -, gtk -, nspr -, nss -, fontconfig -, freetype -, alsaLib -, libX11 -, GConf -, libXext -, libXt -, atk -, makeWrapper -, unzip -, expat -, zlib -, libjpeg -, bzip2 -, libpng -, dbus -, dbus_glib -, patchelf -, cups -, libgcrypt -}: +{ GConf, alsaLib, atk, bzip2, cairo, cups, dbus, dbus_glib, + expat, fetchurl, ffmpeg, fontconfig, freetype, glib, gtk, + libX11, libXScrnSaver, libXdamage, libXext, libXrender, libXt, + libgcrypt, libjpeg, libpng, makeWrapper, nspr, nss, pango, + patchelf, stdenv, unzip, zlib }: assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" ; stdenv.mkDerivation rec { name = "chrome-${version}"; version = "65039"; - src = - if stdenv.system == "x86_64-linux" then + src = + if stdenv.system == "x86_64-linux" then fetchurl { url = "http://build.chromium.org/buildbot/snapshots/chromium-rel-linux-64/${version}/chrome-linux.zip"; sha256 = "1ad7kwd1w1958mb3pwzhshawrf2nlxdsf0gy7d2q4qnx5d809vws"; - } - else if stdenv.system == "i686-linux" then + } + else if stdenv.system == "i686-linux" then fetchurl { url = "http://build.chromium.org/buildbot/snapshots/chromium-rel-linux/${version}/chrome-linux.zip"; sha256 = "06hz3gvv3623ldrj141w3mnzw049yylvv9b9q5r6my8icm722phf"; - } + } else throw "Chromium is not supported on this platform."; phases = "unpackPhase installPhase"; buildInputs = [makeWrapper unzip]; - libPath = + libPath = stdenv.lib.makeLibraryPath - [ stdenv.gcc.libc stdenv.gcc.gcc ffmpeg cairo pango glib libXrender gtk nspr nss fontconfig freetype alsaLib libX11 GConf libXext atk libXt expat zlib libjpeg bzip2 libpng libXScrnSaver dbus dbus_glib cups libgcrypt] ; + [ GConf alsaLib atk bzip2 cairo cups dbus dbus_glib expat + ffmpeg fontconfig freetype glib gtk libX11 libXScrnSaver + libXdamage libXext libXrender libXt libgcrypt libjpeg libpng + nspr nss pango stdenv.gcc.gcc zlib stdenv.gcc.libc ]; installPhase = '' ensureDir $out/bin @@ -64,8 +40,7 @@ stdenv.mkDerivation rec { cp -R * $out/chrome ln -s $out/chrome/chrome $out/bin/chrome - ${patchelf}/bin/patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" --set-rpath ${libPath}:$out/lib:${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib $out/chrome/chrome - + ${patchelf}/bin/patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" --set-rpath ${libPath}:$out/lib:${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib $out/chrome/chrome ln -s ${nss}/lib/libsmime3.so $out/lib/libsmime3.so.1d ln -s ${nss}/lib/libnssutil3.so $out/lib/libnssutil3.so.1d diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix index 923fa3e6bccdf..c20848eb2dac8 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix @@ -54,7 +54,7 @@ let } else { version = "10.1.102.64"; url = http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_10_linux.tar.gz; - sha256 = "1bx3cbls40si3l3x6ahncbn8dwrr41gj34hfn51k5ak9ccqn27wg"; + sha256 = "1jfk9va3id0m6q6csg6gfycmryvi7kylbb7dswpsh6zh1zv00s62"; } else throw "flashplayer is not supported on this platform"; diff --git a/pkgs/applications/networking/ekiga/default.nix b/pkgs/applications/networking/ekiga/default.nix index 46af2275c37bd..d411c3b0f57c8 100644 --- a/pkgs/applications/networking/ekiga/default.nix +++ b/pkgs/applications/networking/ekiga/default.nix @@ -3,7 +3,7 @@ x@{builderDefsPackage , perl, perlXMLParser, evolution_data_server, gnome_doc_utils, avahi , libsigcxx, gtk, dbus_glib, libnotify, libXext, xextproto, automake , autoconf, pkgconfig, libxml2, videoproto, unixODBC, db4, nspr, nss, zlib - , libXrandr, randrproto, which, libxslt + , libXrandr, randrproto, which, libxslt, libtasn1 , ...}: builderDefsPackage (a : diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index 2d0b8fa010587..bca70d14c0080 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -2,7 +2,7 @@ a : let fetchurl = a.fetchurl; - version = a.lib.attrByPath ["version"] "0.14" a; + version = a.lib.attrByPath ["version"] "0.14.1" a; buildInputs = with a; [ python pyGtkGlade gtk perl intltool dbus gettext pkgconfig makeWrapper libglade pyopenssl libXScrnSaver @@ -14,7 +14,7 @@ in rec { src = fetchurl { url = "http://www.gajim.org/downloads/0.14/gajim-${version}.tar.gz"; - sha256 = "3dc31b76f5e019515947b81685ec0e62ca20318b13cb80df4f4d7a045242d5bd"; + sha256 = "ef757572acf3f3d59408fd95b7ec99bc0e39c5b8c66bc61c78ba65e71c3d8e18"; }; inherit buildInputs; diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index d5ae3b5440f40..033f239de4464 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -21,10 +21,10 @@ } : stdenv.mkDerivation { - name = "pidgin-2.7.5"; + name = "pidgin-2.7.7"; src = fetchurl { - url = mirror://sourceforge/pidgin/pidgin-2.7.5.tar.bz2; - sha256 = "0y6qzgx907k9p8bi8fvjnn4ri7qzmqch1i5lfh45k2lngxxfxxgk"; + url = mirror://sourceforge/pidgin/pidgin-2.7.7.tar.bz2; + sha256 = "079gyxszrmzh4lhn1qk7s3v95amx78dv0yy5z3hpfd8fa4jdrvkc"; }; inherit nss ncurses; diff --git a/pkgs/applications/science/electronics/verilog/default.nix b/pkgs/applications/science/electronics/verilog/default.nix new file mode 100644 index 0000000000000..8f48879f76a3e --- /dev/null +++ b/pkgs/applications/science/electronics/verilog/default.nix @@ -0,0 +1,20 @@ +{stdenv, fetchurl, gperf, flex, bison}: + +stdenv.mkDerivation rec { + name = "verilog-0.9.3"; + + src = fetchurl { + url = "mirror://sourceforce/${name}.tar.gz"; + sha256 = "dd68c8ab874a93805d1e93fa76ee1e91fc0c7b20822ded3e57b6536cd8c0d1ba"; + }; + + buildInputs = [ gperf flex bison ]; + + meta = { + description = "Icarus Verilog compiler"; + homepage = http://www.icarus.com; + license = "GPLv2+"; + maintainers = with stdenv.lib.maintainers; [winden]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index b1827711ee6ff..b01d6e7ad0f1f 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -1,7 +1,7 @@ -{stdenv, fetchurl, zlib, openssl}: +{stdenv, fetchurl, zlib, openssl, tcl}: let - version = "20101101142335"; + version = "20101117133825"; in stdenv.mkDerivation { @@ -9,10 +9,19 @@ stdenv.mkDerivation { src = fetchurl { url = "http://www.fossil-scm.org/download/fossil-src-${version}.tar.gz"; - sha256 = "129a2zf5zpq397nmmmk31k1yhkgvrssgrh9z4aaj6lh50s3ax0bh"; + sha256 = "0h4g7qsbz5vyd3zxywcc2pf6vf3gavxqznpx8gn47j8y6mjp4byn"; }; - buildInputs = [ zlib openssl ]; + buildInputs = [ zlib openssl tcl ]; + buildNativeInputs = [ zlib openssl ]; + + doCheck = true; + + checkTarget = "test"; + + crossAttrs = { + doCheck = false; + }; installPhase = '' ensureDir $out/bin @@ -29,9 +38,11 @@ stdenv.mkDerivation { from the others by being extremely simple to setup and operate. ''; homepage = http://www.fossil-scm.org/; - license = "GPLv2"; + license = "BSD"; + platforms = with stdenv.lib.platforms; all; maintainers = [ #Add your name here! stdenv.lib.maintainers.z77z + stdenv.lib.maintainers.viric ]; }; } diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 8f7ec37823ae5..f66b0ed78b336 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -19,13 +19,13 @@ assert compressionSupport -> neon.compressionSupport; stdenv.mkDerivation rec { - version = "1.6.12"; + version = "1.6.15"; name = "subversion-${version}"; src = fetchurl { url = "http://subversion.tigris.org/downloads/${name}.tar.bz2"; - sha1 = "b4ae7c75abbbdade8b2c9122ca7e2e26c6468a82"; + sha1 = "b6fadf944a94b86f989f07bc2d781be41df017bf"; }; buildInputs = [ zlib apr aprutil sqlite ] @@ -39,6 +39,7 @@ stdenv.mkDerivation rec { ${if httpServer then "--with-apxs=${httpd}/bin/apxs" else "--without-apxs"} ${if pythonBindings || perlBindings then "--with-swig=${swig}" else "--without-swig"} ${if javahlBindings then "--enable-javahl --with-jdk=${jdk}" else ""} + ${if stdenv.isDarwin then "--enable-keychain" else ""} --with-zlib=${zlib} --with-sqlite=${sqlite} ''; diff --git a/pkgs/applications/video/kmplayer/default.nix b/pkgs/applications/video/kmplayer/default.nix index 51ae56cc8e4e0..a665670d9c987 100644 --- a/pkgs/applications/video/kmplayer/default.nix +++ b/pkgs/applications/video/kmplayer/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, lib, cmake, qt4, perl, gettext, pango, gtk, dbus_glib, kdelibs, automoc4, phonon}: stdenv.mkDerivation { - name = "kmplayer-0.11.2a"; + name = "kmplayer-0.11.2b"; src = fetchurl { - url = http://kmplayer.kde.org/pkgs/kmplayer-0.11.2a.tar.bz2; - sha256 = "1ddrghwsz11nhdxkca7jz0q2z1ajdb47n325h32jp5q7rm2qz80k"; + url = http://kmplayer.kde.org/pkgs/kmplayer-0.11.2b.tar.bz2; + sha256 = "00a1pw31p849cbgskyfi8jni9ar6yi2ivr625vza2za6apdxvkr7"; }; builder = ./builder.sh; buildInputs = [ cmake qt4 perl gettext stdenv.gcc.libc pango gtk dbus_glib kdelibs automoc4 phonon ]; diff --git a/pkgs/applications/virtualization/qemu/0.12.3.nix b/pkgs/applications/virtualization/qemu/0.13.nix index a16a4d587291a..45961f950cf81 100644 --- a/pkgs/applications/virtualization/qemu/0.12.3.nix +++ b/pkgs/applications/virtualization/qemu/0.13.nix @@ -1,18 +1,19 @@ {stdenv, fetchurl, SDL, zlib, which}: stdenv.mkDerivation rec { - name = "qemu-0.12.3"; + name = "qemu-0.13.0"; src = fetchurl { url = "http://download.savannah.gnu.org/releases/qemu/${name}.tar.gz"; - sha256 = "0jyyz9vm8qrjb6nzfgdwmj9y990fnk2bl9ja0sr1i555n27nzqiw"; + sha256 = "0xyqbwy78218ja6r9ya5p37j8hcd81l4cpw3ghvnxsjwn18mhvqy"; }; - - patchFlags = "-p2"; buildInputs = [SDL zlib which]; meta = { description = "QEmu processor emulator"; + license = "GPLv2+"; + maintainers = with stdenv.lib.maintainers; [viric]; + platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 13b523648c527..5d89d33a81b66 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation { -i AutoConfig.kmk sed -e 's@arch/x86/@@' \ -i Config.kmk + substituteInPlace Config.kmk --replace "VBOX_WITH_TESTCASES = 1" "#" cat >> AutoConfig.kmk << END_PATHS VBOX_PATH_APP_PRIVATE := $out VBOX_PATH_APP_DOCS := $out/doc diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index bb9b8eea08c4a..eb8a915514265 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lib, patchelf, cdrkit, kernel +{ stdenv, fetchurl, lib, patchelf, cdrkit, kernel, which, makeWrapper , libX11, libXt, libXext, libXmu, libXcomposite, libXfixes, libXrandr, libXcursor}: stdenv.mkDerivation { @@ -8,7 +8,14 @@ stdenv.mkDerivation { sha256 = "1pyfgrcdmw6zf3yxgzcd8c5qzqqn62bz4085ka453gfmi9d65lys"; }; KERN_DIR = "${kernel}/lib/modules/*/build"; - buildInputs = [ patchelf cdrkit ]; + buildInputs = [ patchelf cdrkit makeWrapper ]; + + installPhase = '' + ensureDir $out + cp -r install/* $out + + ''; + buildCommand = '' ${if stdenv.system == "i686-linux" then '' isoinfo -J -i $src -x /VBoxLinuxAdditions-x86.run > ./VBoxLinuxAdditions-x86.run @@ -73,6 +80,9 @@ stdenv.mkDerivation { install -m 755 bin/VBoxControl $out/bin install -m 755 bin/VBoxClient-all $out/bin + wrapProgram $out/bin/VBoxClient-all \ + --prefix PATH : "${which}/bin" + # Install OpenGL libraries ensureDir $out/lib cp -v lib/VBoxOGL*.so $out/lib diff --git a/pkgs/applications/window-managers/openbox/default.nix b/pkgs/applications/window-managers/openbox/default.nix new file mode 100644 index 0000000000000..016325140e05b --- /dev/null +++ b/pkgs/applications/window-managers/openbox/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl, pkgconfig, glib, pango, libxml2, libXau }: + +stdenv.mkDerivation rec { + name = "openbox-3-4-11-2"; + + buildInputs = [ pkgconfig glib pango libxml2 libXau ]; + + src = fetchurl { + url = http://openbox.org/dist/openbox/openbox-3.4.11.2.tar.gz; + sha256 = "2e7579389c30e6bb08cc721a2c1af512e049fec2670e71715aa1c4e129ec349d"; + }; + + meta = { + description = "X window manager for non-desktop embedded systems"; + homepage = http://openbox.org/; + license = "GPLv2+"; + }; +} diff --git a/pkgs/data/fonts/anonymous-pro/default.nix b/pkgs/data/fonts/anonymous-pro/default.nix new file mode 100644 index 0000000000000..42f32f0ba7160 --- /dev/null +++ b/pkgs/data/fonts/anonymous-pro/default.nix @@ -0,0 +1,50 @@ +x@{builderDefsPackage + , unzip + , ...}: +builderDefsPackage +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ + []; + + buildInputs = map (n: builtins.getAttr n x) + (builtins.attrNames (builtins.removeAttrs x helperArgNames)); + sourceInfo = rec { + version="1.002"; + name="anonymousPro"; + url="http://www.ms-studio.com/FontSales/AnonymousPro-${version}.zip"; + hash="86665847a51cdfb58a1e1dfd8b1ba33f183485affe50b53e3304f63d3d3552ab"; + }; +in +rec { + src = a.fetchurl { + url = sourceInfo.url; + sha256 = sourceInfo.hash; + }; + + inherit (sourceInfo) name version; + inherit buildInputs; + + phaseNames = ["doUnpack" "installFonts"]; + + doUnpack = a.fullDepEntry ('' + unzip ${src} + cd AnonymousPro*/ + '') ["addInputs"]; + + meta = { + description = "A TrueType font set intended for source code"; + maintainers = with a.lib.maintainers; + [ + raskin + ]; + platforms = with a.lib.platforms; + all; + }; + passthru = { + updateInfo = { + downloadPage = "http://www.ms-studio.com/FontSales/anonymouspro.html"; + }; + }; +}) x + diff --git a/pkgs/data/fonts/inconsolata/default.nix b/pkgs/data/fonts/inconsolata/default.nix new file mode 100644 index 0000000000000..887f37c241b6a --- /dev/null +++ b/pkgs/data/fonts/inconsolata/default.nix @@ -0,0 +1,51 @@ +x@{builderDefsPackage + , fontforge + , ...}: +builderDefsPackage +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ + []; + + buildInputs = map (n: builtins.getAttr n x) + (builtins.attrNames (builtins.removeAttrs x helperArgNames)); + sourceInfo = rec { + name="inconsolata"; + url="http://www.levien.com/type/myfonts/Inconsolata.sfd"; + hash="1cd29c8396adb18bfeddb1abf5bdb98b677649bb9b09f126d1335b123a4cfddb"; + }; +in +rec { + src = a.fetchurl { + url = sourceInfo.url; + sha256 = sourceInfo.hash; + }; + + inherit (sourceInfo) name; + inherit buildInputs; + + /* doConfigure should be removed if not needed */ + phaseNames = ["copySrc" "generateFontsFromSFD" "installFonts"]; + + copySrc = a.fullDepEntry ('' + cp ${src} inconsolata.sfd + '') ["minInit"]; + + generateFontsFromSFD = a.generateFontsFromSFD // {deps=["addInputs"];}; + + meta = { + description = "A monospace font for both screen and print"; + maintainers = with a.lib.maintainers; + [ + raskin + ]; + platforms = with a.lib.platforms; + all; + }; + passthru = { + updateInfo = { + downloadPage = "http://www.levien.com/type/myfonts/inconsolata.html"; + }; + }; +}) x + diff --git a/pkgs/desktops/kde-4.5/bindings/default.nix b/pkgs/desktops/kde-4.5/bindings/default.nix index 17dd970898bb6..03a2051321e0e 100644 --- a/pkgs/desktops/kde-4.5/bindings/default.nix +++ b/pkgs/desktops/kde-4.5/bindings/default.nix @@ -6,7 +6,7 @@ # some bindings are even broken. kde.package rec { - patches = [ ./python-site-packages-install-dir.diff ]; + patches = [ ./python-site-packages-install-dir.diff ./sip-4.11.patch ]; preConfigure = '' CUSTOM_RUBY_SITE_ARCH_DIR=$(ruby -r rbconfig -e "print Config::CONFIG['sitearchdir']" | sed -e "s@${ruby}@$out@") diff --git a/pkgs/desktops/kde-4.5/bindings/sip-4.11.patch b/pkgs/desktops/kde-4.5/bindings/sip-4.11.patch new file mode 100644 index 0000000000000..15059e2526d26 --- /dev/null +++ b/pkgs/desktops/kde-4.5/bindings/sip-4.11.patch @@ -0,0 +1,67 @@ +Make kdebindings compile against sip-4.11, from KDE svn +Index: kdebindings/python/pykde4/sip/kdecore/typedefs.sip +=================================================================== +--- kdebindings/python/pykde4/sip/kdecore/typedefs.sip (revision 1170601) ++++ kdebindings/python/pykde4/sip/kdecore/typedefs.sip (revision 1170602) +@@ -733,61 +733,6 @@ + }; + + +-%MappedType QList<uint> +-{ +-%TypeHeaderCode +-#include <qlist.h> +-%End +- +-%ConvertFromTypeCode +- // Create the list. +- PyObject *l; +- +- if ((l = PyList_New(sipCpp->size())) == NULL) +- return NULL; +- +- // Set the list elements. +- for (int i = 0; i < sipCpp->size(); ++i) { +- PyObject *pobj; +- +-#if PY_MAJOR_VERSION >= 3 +- if ((pobj = PyLong_FromLong(sipCpp->value(i))) == NULL) { +-#else +- if ((pobj = PyInt_FromLong(sipCpp->value(i))) == NULL) { +-#endif +- Py_DECREF(l); +- +- return NULL; +- } +- +- PyList_SET_ITEM(l, i, pobj); +- } +- +- return l; +-%End +- +-%ConvertToTypeCode +- // Check the type if that is all that is required. +- if (sipIsErr == NULL) +- return PyList_Check(sipPy); +- +- QList<uint> *ql = new QList<uint>; +- +- for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) { +-#if PY_MAJOR_VERSION >= 3 +- ql->append(PyLong_AsLong(PyList_GET_ITEM(sipPy, i))); +-#else +- ql->append(PyInt_AsLong(PyList_GET_ITEM(sipPy, i))); +-#endif +- } +- +- *sipCppPtr = ql; +- +- return sipGetState(sipTransferObj); +-%End +-}; +- +- + template <TYPE*> + %MappedType QStack<TYPE*> + { diff --git a/pkgs/development/compilers/ghc/7.0.1.nix b/pkgs/development/compilers/ghc/7.0.1.nix index 6c4454ae3b51a..d8acc3065105d 100644 --- a/pkgs/development/compilers/ghc/7.0.1.nix +++ b/pkgs/development/compilers/ghc/7.0.1.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, ghc, perl, gmp, ncurses}: stdenv.mkDerivation rec { - version = "7.0.1-rc2"; + version = "7.0.1"; name = "ghc-${version}"; @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { homepage = "http://haskell.org/ghc"; src = fetchurl { - url = "http://new-www.haskell.org/ghc/dist/${version}/ghc-7.0.0.20101028-src.tar.bz2"; - sha256 = "6048eb94163c96b99094960fe2e5ddd1053594323ba80548dabf50c62c1b7b71"; + url = "http://new-www.haskell.org/ghc/dist/${version}/${name}-src.tar.bz2"; + sha256 = "1iciljngxmqy465cw3pkl6jp0ydiils4bfz6ixfaxk7aqv7r7xsi"; }; buildInputs = [ghc perl gmp ncurses]; diff --git a/pkgs/development/compilers/jdk/default-5.nix b/pkgs/development/compilers/jdk/default-5.nix index 9fb52378b3f77..fb25cd704c44c 100644 --- a/pkgs/development/compilers/jdk/default-5.nix +++ b/pkgs/development/compilers/jdk/default-5.nix @@ -2,7 +2,7 @@ if stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" then - (import ./jdk5-sun-linux.nix) { + (import ./jdk5-oracle-linux.nix) { inherit stdenv fetchurl unzip; } else diff --git a/pkgs/development/compilers/jdk/jdk5-oracle-linux.nix b/pkgs/development/compilers/jdk/jdk5-oracle-linux.nix new file mode 100644 index 0000000000000..06471c482a197 --- /dev/null +++ b/pkgs/development/compilers/jdk/jdk5-oracle-linux.nix @@ -0,0 +1,26 @@ +/** + * This Nix expression requires the user to download the Java 5.0 JDK + * distribution to /tmp. Please obtain jdk-1_5_0_22-linux-i586.bin for + * 32-bit systems or jdk-1_5_0_22-linux-amd64.bin for 64-bit systems + * from java.sun.com (look for archived software downloads) + * by hand and place it in /tmp. Blame Oracle, not me. + * + * Note that this is not necessary if someone has already pushed a + * binary. + */ +{stdenv, fetchurl, unzip}: + +assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; + +let name = "jdk-1_5_0_22"; in +stdenv.mkDerivation { + inherit name; + filename = "jdk-1_5_0_22"; + dirname = "jdk1.5.0_22"; + builder = ./builder.sh; + pathname = if stdenv.system == "x86_64-linux" then "/tmp/${name}-linux-amd64.bin" else "/tmp/${name}-linux-i586.bin"; + md5 = if stdenv.system == "x86_64-linux" then "b62abcaf9ea8617c50fa213bbc88824a" else "df5dae6d50d2abeafb472dde6d9a17f3"; + + stdenv = stdenv; + inherit unzip; +} diff --git a/pkgs/development/compilers/jdk/jdk5-sun-linux.nix b/pkgs/development/compilers/jdk/jdk5-sun-linux.nix deleted file mode 100644 index 3e3742c33f373..0000000000000 --- a/pkgs/development/compilers/jdk/jdk5-sun-linux.nix +++ /dev/null @@ -1,24 +0,0 @@ -/** - * This Nix expression requires the user to download the j2sdk - * distribution to /tmp. Please obtain jdk-1_5_0_14-linux-i586.bin - * from java.sun.com by hand and place it in /tmp. Blame Sun, not me. - * - * Note that this is not necessary if someone has already pushed a - * binary. - */ -{stdenv, fetchurl, unzip}: - -assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; - -let name = "jdk-1_5_0_19"; in -stdenv.mkDerivation { - inherit name; - filename = "jdk-1_5_0_19"; - dirname = "jdk1.5.0_19"; - builder = ./builder.sh; - pathname = if stdenv.system == "x86_64-linux" then "/tmp/${name}-linux-amd64.bin" else "/tmp/${name}-linux-i586.bin"; - md5 = if stdenv.system == "x86_64-linux" then "28095941e14669d5025f66260e7b61e7" else "0d082a0c9f5a79b0895b3317c9590ec5"; - - stdenv = stdenv; - inherit unzip; -} diff --git a/pkgs/development/compilers/strategoxt/0.18.nix b/pkgs/development/compilers/strategoxt/0.18.nix index dd2620cfc4c10..a8abdf53d2765 100644 --- a/pkgs/development/compilers/strategoxt/0.18.nix +++ b/pkgs/development/compilers/strategoxt/0.18.nix @@ -73,11 +73,11 @@ rec { }; javafront = stdenv.mkDerivation (rec { - name = "java-front-0.9"; + name = "java-front-0.9.1"; src = fetchurl { - url = "http://hydra.nixos.org/build/79602/download/1/java-front-0.9.1pre19993.tar.gz"; - sha256 = "e07e7d9ecc4a57c24d7af309d576d6eda75cb07a9d3d06594edfded366863c9c"; + url = "http://hydra.nixos.org/build/766286/download/1/java-front-0.9.1pre20122.tar.gz"; + sha256 = "ef85d3af962fcd54e028ea501e64220b86af335a49143f2819bd3f4789bef7e6"; }; buildInputs = [pkgconfig aterm sdf strategoxt]; diff --git a/pkgs/development/eclipse/ecj/default.nix b/pkgs/development/eclipse/ecj/default.nix index cf82b76fb4715..53343f00ca551 100644 --- a/pkgs/development/eclipse/ecj/default.nix +++ b/pkgs/development/eclipse/ecj/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, unzip, ant, gcj }: let - version = "3.5.1"; - date = "200909170800"; + version = "3.6.1"; + date = "201009090800"; isGCJ = stdenv.lib.strings.substring 0 3 gcj.name == "gcj"; javaExec = if isGCJ then "gij" else "java"; javaFlags = if isGCJ then "--cp" else "-cp"; @@ -12,7 +12,7 @@ in src = fetchurl { url = "http://eclipse.ialto.org/eclipse/downloads/drops/R-${version}-${date}/ecjsrc-${version}.zip"; - sha256 = "1vnl2mavisc567bip736xzsvvbjif5279wc4a7pbdik5wlir8qr7"; + sha256 = "0xfsig2pzd9wy524wp11s7pc7cj81s28g1485995b44d9qbi17h8"; }; buildInputs = [ unzip ant gcj ]; diff --git a/pkgs/development/interpreters/php/5.2.nix b/pkgs/development/interpreters/php/5.2.nix new file mode 100644 index 0000000000000..8063b1a551244 --- /dev/null +++ b/pkgs/development/interpreters/php/5.2.nix @@ -0,0 +1,166 @@ +args: with args; + +let + + inherit (args.composableDerivation) composableDerivation edf wwf; + +in + +composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in { + + version = "5.2.14"; + + name = "php_configurable-${version}"; + + buildInputs = ["flex" "bison" "pkgconfig"]; + + flags = { + +# much left to do here... + + # SAPI modules: + + apxs2 = { + configureFlags = ["--with-apxs2=${apacheHttpd}/bin/apxs"]; + buildInputs = [apacheHttpd]; + }; + + # Extensions + + curl = { + configureFlags = ["--with-curl=${args.curl}" "--with-curlwrappers"]; + buildInputs = [curl openssl]; + }; + + zlib = { + configureFlags = ["--with-zlib=${args.zlib}"]; + buildInputs = [zlib]; + }; + + libxml2 = { + configureFlags = [ + "--with-libxml-dir=${libxml2}" + "--with-iconv-dir=${libiconv}" + ]; + buildInputs = [ libxml2 ]; + }; + + sqlite = { + configureFlags = ["--with-pdo-sqlite=${sqlite}"]; + buildInputs = [ sqlite ]; + }; + + postgresql = { + configureFlags = ["--with-pgsql=${postgresql}"]; + buildInputs = [ postgresql ]; + }; + + mysql = { + configureFlags = ["--with-mysql=${mysql}"]; + buildInputs = [ mysql ]; + }; + + mysqli = { + configureFlags = ["--with-mysqli=${mysql}/bin/mysql_config"]; + buildInputs = [ mysql]; + }; + + mysqli_embedded = { + configureFlags = ["--enable-embedded-mysqli"]; + depends = "mysqli"; + assertion = fixed.mysqliSupport; + }; + + pdo_mysql = { + configureFlags = ["--with-pdo-mysql=${mysql}"]; + buildInputs = [ mysql ]; + }; + + bcmath = { + configureFlags = ["--enable-bcmath"]; + }; + + gd = { + configureFlags = ["--with-gd=${args.gd}"]; + buildInputs = [gd libpng libjpeg ]; + }; + + soap = { + configureFlags = ["--enable-soap"]; + }; + + sockets = { + configureFlags = ["--enable-sockets"]; + }; + + openssl = { + configureFlags = ["--with-openssl=${args.openssl}"]; + buildInputs = ["openssl"]; + }; + + mbstring = { + configureFlags = ["--enable-mbstring"]; + }; + + /* + php is build within this derivation in order to add the xdebug lines to the php.ini. + So both Apache and command line php both use xdebug without having to configure anything. + Xdebug could be put in its own derivation. + * / + meta = { + description = "debugging support for PHP"; + homepage = http://xdebug.org; + license = "based on the PHP license - as is"; + }; + */ + }; + + cfg = { + mysqlSupport = getConfig ["php" "mysql"] true; + mysqliSupport = getConfig ["php" "mysqli"] true; + pdo_mysqlSupport = getConfig ["php" "pdo_mysql"] true; + libxml2Support = getConfig ["php" "libxml2"] true; + apxs2Support = getConfig ["php" "apxs2"] true; + bcmathSupport = getConfig ["php" "bcmath"] true; + socketsSupport = getConfig ["php" "sockets"] true; + curlSupport = getConfig ["php" "curl"] true; + gettextSupport = getConfig ["php" "gettext"] true; + postgresqlSupport = getConfig ["php" "postgresql"] true; + sqliteSupport = getConfig ["php" "sqlite"] true; + soapSupport = getConfig ["php" "soap"] true; + zlibSupport = getConfig ["php" "zlib"] true; + opensslSupport = getConfig ["php" "openssl"] true; + mbstringSupport = getConfig ["php" "mbstring"] true; + gdSupport = getConfig ["php" "gd"] true; + }; + + configurePhase = '' + iniFile=$out/etc/php-recommended.ini + [[ -z "$libxml2" ]] || export PATH=$PATH:$libxml2/bin + ./configure --with-config-file-scan-dir=/etc --with-config-file-path=$out/etc --prefix=$out $configureFlags + echo configurePhase end + ''; + + installPhase = '' + unset installPhase; installPhase; + cp php.ini-${ if builtins.lessThan (builtins.compareVersions version "5.3") 0 + then "recommended" /* < PHP 5.3 */ + else "production" /* >= PHP 5.3 */ + } $iniFile + ''; + + src = args.fetchurl { + url = "http://nl.php.net/get/php-${version}.tar.bz2/from/this/mirror"; + sha256 = "1l9b7iv0f6ds9x2ayclcfgjh62xbabbv11ixp5cqsyaq2ba5ynsi"; + name = "php-${version}.tar.bz2"; + }; + + meta = { + description = "The PHP language runtime engine"; + homepage = http://www.php.net/; + license = "PHP-3"; + }; + + patches = [./fix.patch]; + +}) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/5.3.nix index 8277021b0dc35..8277021b0dc35 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/5.3.nix diff --git a/pkgs/development/interpreters/r-lang/default.nix b/pkgs/development/interpreters/r-lang/default.nix index 63971dece1f2a..432198993808f 100644 --- a/pkgs/development/interpreters/r-lang/default.nix +++ b/pkgs/development/interpreters/r-lang/default.nix @@ -1,30 +1,37 @@ -{stdenv, fetchurl, readline, perl, gfortran, libX11, libpng, libXt, zlib, -withBioconductor ? false +{ stdenv, fetchurl, readline, perl, gfortran, libX11, libpng, libXt, zlib +, withBioconductor ? false }: stdenv.mkDerivation { name = "r-lang"; - version = "2.7.0"; + version = "2.12.0"; src = fetchurl { - url = http://cran.r-project.org/src/base/R-2/R-2.7.0.tar.gz; - sha256 = "17ql1j5d9rfpxs04j9v9qyxiysc9nh6yr43lgfdamayzjpia5jqm"; + url = http://cran.r-project.org/src/base/R-2/R-2.12.0.tar.gz; + sha256 = "93d72d845b01c6cd00e58f04b5e78fd6c83de96a8620505ad2a016772af02179"; }; bioconductor = if withBioconductor then import ../development/libraries/science/biology/bioconductor { inherit fetchurl stdenv readline; } else null; - + + postUnpack = '' + gunzip R-2.12.0/src/library/Recommended/Matrix_0.999375-44.tar.gz + tar --file=R-2.12.0/src/library/Recommended/Matrix_0.999375-44.tar --delete Matrix/src/dummy.cpp + gzip R-2.12.0/src/library/Recommended/Matrix_0.999375-44.tar + ''; + buildInputs = [readline perl gfortran libpng libX11 libXt zlib]; configureFlags = ["--enable-R-shlib"] ; meta = { description = "R is a language and environment for statistical computing and graphics"; - longDescription = ''R is a language and environment for statistical computin -g and graphics. It is a GNU project which is similar to the S language. R provid -es a wide variety of statistical (linear and nonlinear modelling, classical stat -istical tests, time-series analysis, classification, clustering, ...) and graphi -cal techniques, and is highly extensible.''; license = "GPL2"; homepage = http://www.r-project.org/; + longDescription = '' + R is a language and environment for statistical computing and + graphics. It is a GNU project which is similar to the S language. + R provides a wide variety of statistical (linear and nonlinear + modelling, classical statistical tests, time-series analysis, + classification, clustering, ...) and graphical techniques, and is + highly extensible. + ''; }; } - - diff --git a/pkgs/development/libraries/allegro/default.nix b/pkgs/development/libraries/allegro/default.nix new file mode 100644 index 0000000000000..1669d083f226b --- /dev/null +++ b/pkgs/development/libraries/allegro/default.nix @@ -0,0 +1,59 @@ +x@{builderDefsPackage + , texinfo, libXext, xextproto, libX11, xproto, libXpm, libXt, libXcursor + , alsaLib, cmake, zlib, libpng, libvorbis, libXxf86dga, libXxf86misc + , xf86dgaproto, xf86miscproto, xf86vidmodeproto, libXxf86vm, openal + , ...}: +builderDefsPackage +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ + []; + + buildInputs = map (n: builtins.getAttr n x) + (builtins.attrNames (builtins.removeAttrs x helperArgNames)); + sourceInfo = rec { + baseName="allegro"; + version="4.4.0.1"; + name="${baseName}-${version}"; + project="alleg"; + url="mirror://sourceforge/project/${project}/${baseName}/${version}/${name}.tar.gz"; + hash="0qgkmazr07lmnbj6h6yk10vmcm15gafcwy5jn7xpwy7bahzraiz0"; + }; +in +rec { + src = a.fetchurl { + url = sourceInfo.url; + sha256 = sourceInfo.hash; + }; + + inherit (sourceInfo) name version; + inherit buildInputs; + + /* doConfigure should be removed if not needed */ + phaseNames = ["doCmake" "doMakeInstall"]; + + doCmake = a.fullDepEntry ('' + export NIX_LDFLAGS="$NIX_LDFLAGS -lXext -lX11 -lXpm -lXcursor -lXxf86vm" + cmake -D CMAKE_INSTALL_PREFIX=$out -D CMAKE_SKIP_RPATH=ON . + '') ["minInit" "doUnpack" "addInputs"]; + + makeFlags = [ + ]; + + meta = { + description = "A game programming library"; + license = "free-noncopyleft"; # giftware + maintainers = with a.lib.maintainers; + [ + raskin + ]; + platforms = with a.lib.platforms; + linux; + }; + passthru = { + updateInfo = { + downloadPage = "http://sourceforge.net/projects/alleg/files/"; + }; + }; +}) x + diff --git a/pkgs/development/libraries/cgui/default.nix b/pkgs/development/libraries/cgui/default.nix new file mode 100644 index 0000000000000..6bd3dd41de747 --- /dev/null +++ b/pkgs/development/libraries/cgui/default.nix @@ -0,0 +1,57 @@ +x@{builderDefsPackage + , texinfo, allegro, perl + , ...}: +builderDefsPackage +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ + []; + + buildInputs = map (n: builtins.getAttr n x) + (builtins.attrNames (builtins.removeAttrs x helperArgNames)); + sourceInfo = rec { + baseName="cgui"; + version="2.0.3"; + name="${baseName}-${version}"; + project="${baseName}"; + url="mirror://sourceforge/project/${project}/${version}/${name}.tar.gz"; + hash="00kk4xaw68m44awy8zq4g5plx372swwccvzshn68a0a8f3f2wi4x"; + }; +in +rec { + src = a.fetchurl { + url = sourceInfo.url; + sha256 = sourceInfo.hash; + }; + + inherit (sourceInfo) name version; + inherit buildInputs; + + /* doConfigure should be removed if not needed */ + phaseNames = ["genMakefile" "doMakeInstall"]; + + genMakefile = a.fullDepEntry ('' + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -fPIC" + sh fix.sh unix + '') ["minInit" "doUnpack" "addInputs"]; + + makeFlags = [ + "SYSTEM_DIR=$out" + ]; + + meta = { + description = "A multiplatform basic GUI library"; + maintainers = with a.lib.maintainers; + [ + raskin + ]; + platforms = with a.lib.platforms; + linux; + }; + passthru = { + updateInfo = { + downloadPage = "http://sourceforge.net/projects/cgui/files/"; + }; + }; +}) x + diff --git a/pkgs/development/libraries/haskell/Chart/default.nix b/pkgs/development/libraries/haskell/Chart/default.nix new file mode 100644 index 0000000000000..6e5fdb9b787e9 --- /dev/null +++ b/pkgs/development/libraries/haskell/Chart/default.nix @@ -0,0 +1,15 @@ +{cabal, cairo, colour, dataAccessor, dataAccessorTemplate, gtk, mtl}: + +cabal.mkDerivation (self : { + pname = "Chart"; + version = "0.13.1"; + sha256 = "1gh8qw8xil543wssflhpjrgnig4v79vi7xizrm93a93i4n84npd5"; + propagatedBuildInputs = + [cairo colour dataAccessor dataAccessorTemplate gtk mtl]; + meta = { + description = "A library for generating 2D Charts and Plots"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/criterion/default.nix b/pkgs/development/libraries/haskell/criterion/default.nix index 0b1cac4076f7a..ce6b5d5e2dc5a 100644 --- a/pkgs/development/libraries/haskell/criterion/default.nix +++ b/pkgs/development/libraries/haskell/criterion/default.nix @@ -1,13 +1,17 @@ {cabal, deepseq, mtl, parallel, parsec, vector, vectorAlgorithms, - mwcRandom, statistics}: + mwcRandom, statistics, Chart, dataAccessor}: cabal.mkDerivation (self : { pname = "criterion"; version = "0.5.0.5"; sha256 = "1b1g7a2ip07j0554cj4d0413859fbdkaxpcgq2znjz7wh8z5aabn"; - propagatedBuildInputs = - [deepseq mtl parallel parsec vector vectorAlgorithms mwcRandom statistics]; + propagatedBuildInputs = [ + deepseq mtl parallel parsec vector vectorAlgorithms mwcRandom statistics + Chart dataAccessor + ]; + + configureFlags = "-fchart"; meta = { homepage = "http://bitbucket.org/bos/criterion"; diff --git a/pkgs/development/libraries/haskell/data-accessor/data-accessor-template.nix b/pkgs/development/libraries/haskell/data-accessor/data-accessor-template.nix new file mode 100644 index 0000000000000..ff985fbfef8d0 --- /dev/null +++ b/pkgs/development/libraries/haskell/data-accessor/data-accessor-template.nix @@ -0,0 +1,14 @@ +{cabal, dataAccessor, utilityHt}: + +cabal.mkDerivation (self : { + pname = "data-accessor-template"; + version = "0.2.1.5"; + sha256 = "0fvf1cacvqzyl9x88h7fa0d6p94qhkvf177a84g036qjxn0khyja"; + propagatedBuildInputs = [dataAccessor utilityHt]; + meta = { + description = "Utilities for accessing and manipulating the fields of records"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix b/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix new file mode 100644 index 0000000000000..99e842444607e --- /dev/null +++ b/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix @@ -0,0 +1,14 @@ +{cabal, transformers}: + +cabal.mkDerivation (self : { + pname = "data-accessor"; + version = "0.2.1.4"; + sha256 = "1fnfbcw1fzas2sbk9yhwd05ncvgqfy47hi9xh0ygsqilx7nwkdxv"; + propagatedBuildInputs = [transformers]; + meta = { + description = "Utilities for accessing and manipulating the fields of records"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/multiplate/default.nix b/pkgs/development/libraries/haskell/multiplate/default.nix new file mode 100644 index 0000000000000..3354a5873d0b3 --- /dev/null +++ b/pkgs/development/libraries/haskell/multiplate/default.nix @@ -0,0 +1,14 @@ +{cabal, transformers}: + +cabal.mkDerivation (self : { + pname = "multiplate"; + version = "0.0.1"; + sha256 = "06bdj0r83arxxl6vqif9dmna140qcgvjizcyhvyqymsid605hrp4"; + propagatedBuildInputs = [transformers]; + meta = { + description = "Lightweight generic library for mutually recursive datatypes"; + license = "MIT"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/qt-4.x/4.6/default.nix b/pkgs/development/libraries/qt-4.x/4.6/default.nix index 3253e58e7c21e..904e29beae9b4 100644 --- a/pkgs/development/libraries/qt-4.x/4.6/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.6/default.nix @@ -96,6 +96,6 @@ stdenv.mkDerivation rec { description = "A cross-platform application framework for C++"; license = "GPL/LGPL"; maintainers = with stdenv.lib.maintainers; [ sander urkud ]; - platforms = stdenv.lib.platforms.mesaPlatforms; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/rlog/default.nix b/pkgs/development/libraries/rlog/default.nix new file mode 100644 index 0000000000000..aae678688848b --- /dev/null +++ b/pkgs/development/libraries/rlog/default.nix @@ -0,0 +1,15 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation { + name = "rlog-1.4"; + + src = fetchurl { + url = "http://rlog.googlecode.com/files/rlog-1.4.tar.gz"; + sha256 = "0y9zg0pd7vmnskwac1qdyzl282z7kb01nmn57lsg2mjdxgnywf59"; + }; + + meta = { + homepage = http://www.arg0.net/rlog; + description = "A C++ logging library used in encfs"; + }; +} diff --git a/pkgs/development/libraries/sqlite/3.6.x.nix b/pkgs/development/libraries/sqlite/3.6.x.nix index f700b862246bd..6a1c02dede1a5 100644 --- a/pkgs/development/libraries/sqlite/3.6.x.nix +++ b/pkgs/development/libraries/sqlite/3.6.x.nix @@ -3,11 +3,11 @@ assert readline != null -> ncurses != null; stdenv.mkDerivation { - name = "sqlite-3.6.23"; + name = "sqlite-3.6.23.1"; src = fetchurl { - url = "http://www.sqlite.org/sqlite-amalgamation-3.6.23.tar.gz"; - sha256 = "a5de9ec9273acabc6cb18235df802549c476410b09d58a206e02862b4dc303ae"; + url = "http://www.sqlite.org/sqlite-amalgamation-3.6.23.1.tar.gz"; + sha256 = "0n1maahlqxk7p6kmsv0v2afy6qbv15n85mgkr4ylbf3ghcjdg06h"; }; buildInputs = [readline ncurses]; diff --git a/pkgs/development/libraries/szip/default.nix b/pkgs/development/libraries/szip/default.nix new file mode 100644 index 0000000000000..38cde3bfd7071 --- /dev/null +++ b/pkgs/development/libraries/szip/default.nix @@ -0,0 +1,9 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation { + name = "szip-2.1"; + src = fetchurl { + url = ftp://ftp.hdfgroup.org/lib-external/szip/2.1/src/szip-2.1.tar.gz; + sha256 = "05707lrdhwp8mv0dgzh2b6m2mwamv1z6k29m2v1v7pz0c1w2gb6z"; + }; +} \ No newline at end of file diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix new file mode 100644 index 0000000000000..9e60f1ce8ba15 --- /dev/null +++ b/pkgs/development/libraries/v8/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchsvn, python, scons, makeWrapper }: + +let + system = stdenv.system; + arch = if system == "i686-linux" then "ia32" else if system == "x86_64-linux" then "x64" else ""; +in +assert system == "i686-linux" || system == "x86_64-linux"; +stdenv.mkDerivation rec { + name = "v8-r${toString src.rev}"; + src = fetchsvn { + url = http://v8.googlecode.com/svn/trunk ; + sha256 = "1p51zh1l9c2gq3g4qk713n6qki9by3llx4p46inncvqfrimgshxb"; + rev = 5865; + }; + + buildInputs = [python scons makeWrapper]; + + buildPhase = '' + export CXX=`type -p g++` + scons snapshot=on importenv=PATH arch=${arch} + scons snapshot=on library=shared importenv=PATH arch=${arch} + scons sample=shell snapshot=on importenv=PATH arch=${arch} + ''; + + installPhase = '' + ensureDir $out/bin + ensureDir $out/lib + + cp -v libv8.* $out/lib + cp -v shell $out/bin/v8-shell + cp -vR include $out/ + wrapProgram $out/bin/v8-shell --set LD_LIBRARY_PATH $out/lib + + ''; +} diff --git a/pkgs/development/perl-modules/gd-options-passthrough-and-fontconfig.patch b/pkgs/development/perl-modules/gd-options-passthrough-and-fontconfig.patch new file mode 100644 index 0000000000000..24eab55f6eb55 --- /dev/null +++ b/pkgs/development/perl-modules/gd-options-passthrough-and-fontconfig.patch @@ -0,0 +1,49 @@ +This patch configures Getopt::Long to pass options +so they will be available at the second GetOptions call. + +Also an option to specify the search path for libfontconfig +is added. +diff -Naur GD-2.45/Makefile.PL GD-2.45-patched/Makefile.PL +--- GD-2.45/Makefile.PL 2009-07-10 13:40:07.000000000 -0430 ++++ GD-2.45-patched/Makefile.PL 2010-11-26 22:48:52.372992578 -0430 +@@ -16,9 +16,9 @@ + my (@INC,@LIBPATH,@LIBS); + my $AUTOCONFIG = 0; # global set by try_to_autoconfigure() below + +-my ($options,$lib_gd_path,$lib_ft_path,$lib_png_path,$lib_jpeg_path,$lib_xpm_path,$lib_zlib_path,$force); ++my ($options,$lib_gd_path,$lib_ft_path,$lib_png_path,$lib_jpeg_path,$lib_xpm_path,$lib_zlib_path,$lib_fontconfig_path,$force); + +-use Getopt::Long; ++use Getopt::Long qw(:config pass_through); + GetOptions("ignore_missing_gd" => \$force); + + unless (try_to_autoconfigure(\$options,\$lib_gd_path,\@INC,\@LIBPATH,\@LIBS) || $force) { +@@ -49,6 +49,7 @@ + "lib_jpeg_path=s" => \$lib_jpeg_path, + "lib_xpm_path=s" => \$lib_xpm_path, + "lib_zlib_path=s" => \$lib_zlib_path, ++ "lib_fontconfig_path=s" => \$lib_fontconfig_path, + ); + unless ($result) { + print STDERR <<END; +@@ -64,6 +65,7 @@ + -lib_jpeg_path path path to libjpeg + -lib_xpm_path path path to libxpm + -lib_zlib_path path path to libpng ++ -lib_fontconfig_path path path to libfontconfig + -ignore_missing_gd Ignore missing or old libgd installations and try to compile anyway + + If no options are passed on the command line. The program will +@@ -111,6 +113,12 @@ + @INC = ("-I$lib_zlib_path/include", @INC); + @LIBPATH = ("-L$lib_zlib_path/lib", @LIBPATH); + } ++if( defined($lib_fontconfig_path) ) ++{ ++ print "Fontconfig library used from: $lib_fontconfig_path\n"; ++ @INC = ("-I$lib_fontconfig_path/include", @INC); ++ @LIBPATH = ("-L$lib_fontconfig_path/lib", @LIBPATH); ++} + ############################################################################################# + + if ($^O eq 'VMS'){ diff --git a/pkgs/development/python-modules/pygobject/default.nix b/pkgs/development/python-modules/pygobject/default.nix index 303bb36a3a87a..4ef851f5b3edf 100644 --- a/pkgs/development/python-modules/pygobject/default.nix +++ b/pkgs/development/python-modules/pygobject/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, python, pkgconfig, glib }: stdenv.mkDerivation rec { - name = "pygobject-2.26.0"; + name = "pygobject-2.27.0"; src = fetchurl { - url = "http://ftp.gnome.org/pub/GNOME/sources/pygobject/2.26/${name}.tar.bz2"; - sha256 = "5554acff9c27b647144143b0459359864e4a6f2ff62c7ba21cf310ad755cf7c7"; + url = "http://ftp.gnome.org/pub/GNOME/sources/pygobject/2.27/${name}.tar.bz2"; + sha256 = "18mq4mj9s9sw12m6gbbc4iffrq993c7q09v9yahlnamrqn3bv53m"; }; configureFlags = "--disable-introspection"; diff --git a/pkgs/development/python-modules/pyqt/default.nix b/pkgs/development/python-modules/pyqt/default.nix index 94c5b99e4dbb2..37eae0fe20382 100644 --- a/pkgs/development/python-modules/pyqt/default.nix +++ b/pkgs/development/python-modules/pyqt/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, python, sip, qt4, pythonDBus, pkgconfig, lndir, makeWrapper }: -stdenv.mkDerivation { - name = "pyqt-x11-gpl-4.7.4"; +stdenv.mkDerivation rec { + name = "PyQt-x11-gpl-4.8.1"; src = fetchurl { - url = http://www.riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-4.7.4.tar.gz; - sha256 = "0a7iqzp75hd29rvwhyqfmaj5ymd49wq8scysjkivhc5qkx5rh00r"; + url = "http://www.riverbankcomputing.co.uk/static/Downloads/PyQt4/${name}.tar.gz"; + sha256 = "0w7k1jz7wcfwqq77hiwgds5s6py7kkg1rszd6c94bk9dr06vishz"; }; preConfigure = '' diff --git a/pkgs/development/python-modules/python-sip/default.nix b/pkgs/development/python-modules/python-sip/default.nix index e2b5496aef846..7af20764fabe7 100644 --- a/pkgs/development/python-modules/python-sip/default.nix +++ b/pkgs/development/python-modules/python-sip/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, python }: stdenv.mkDerivation rec { - name = "sip-4.10.5"; + name = "sip-4.11.2"; src = fetchurl { url = "http://www.riverbankcomputing.co.uk/static/Downloads/sip4/${name}.tar.gz"; - sha256 = "1hkn2n5hvfcfz0xprwyy5dzjzndgmvlf7abjsd868pv3hxdx1rs8"; + sha256 = "0g1pj203m491rhy111ayr4k4lsbcqd8sa1np503xv94a90b05l6f"; }; configurePhase = "python ./configure.py -d $out/lib/${python.libPrefix}/site-packages -b $out/bin -e $out/include"; diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix index fdf2bf1777f2e..3de750c028a64 100644 --- a/pkgs/development/tools/analysis/valgrind/default.nix +++ b/pkgs/development/tools/analysis/valgrind/default.nix @@ -1,18 +1,13 @@ { stdenv, fetchurl, perl, gdb, autoconf, automake }: stdenv.mkDerivation rec { - name = "valgrind-3.5.0"; + name = "valgrind-3.6.0"; src = fetchurl { url = "http://valgrind.org/downloads/${name}.tar.bz2"; - sha256 = "105s4y6h5rsfvml1dfhsjvqgsxvnclbnxbpgk8b4ghpbpcr52fkl"; + sha256 = "0pr8h0q909z15g2i2jrcryhqbshair42rylf3mprhyx4nm9h23xw"; }; - # Make Valgrind compile with Glibc 2.11. - patches = [ ./glibc-2.11.patch ]; - patchFlags = "-p0"; - preConfigure = "autoreconf"; - # Perl is needed for `cg_annotate'. # GDB is needed to provide a sane default for `--db-command'. buildInputs = [ perl autoconf automake ] ++ stdenv.lib.optional (!stdenv.isDarwin) gdb; diff --git a/pkgs/development/tools/analysis/valgrind/glibc-2.11.patch b/pkgs/development/tools/analysis/valgrind/glibc-2.11.patch deleted file mode 100644 index e2ce53217c9e4..0000000000000 --- a/pkgs/development/tools/analysis/valgrind/glibc-2.11.patch +++ /dev/null @@ -1,53 +0,0 @@ -r10941 from svn://svn.valgrind.org/valgrind/trunk - ------------------------------------------------------------------------- -r10941 | bart | 2009-11-15 20:11:19 +0100 (Sun, 15 Nov 2009) | 2 lines - -Added support for glibc 2.11. - ------------------------------------------------------------------------- - -Index: configure.in -=================================================================== ---- configure.in (revision 10940) -+++ configure.in (revision 10941) -@@ -656,6 +656,16 @@ - ], - GLIBC_VERSION="2.10") - -+AC_EGREP_CPP([GLIBC_211], [ -+#include <features.h> -+#ifdef __GNU_LIBRARY__ -+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ == 11) -+ GLIBC_211 -+ #endif -+#endif -+], -+GLIBC_VERSION="2.11") -+ - AC_EGREP_CPP([AIX5_LIBC], [ - #include <standards.h> - #if defined(_AIXVERSION_510) || defined(_AIXVERSION_520) || defined(_AIXVERSION_530) -@@ -742,6 +752,13 @@ - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" - ;; -+ 2.11) -+ AC_MSG_RESULT(2.11 family) -+ AC_DEFINE([GLIBC_2_11], 1, [Define to 1 if you're using glibc 2.11.x]) -+ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" -+ ;; - aix5) - AC_MSG_RESULT(AIX 5.1 or 5.2 or 5.3) - AC_DEFINE([AIX5_LIBC], 1, [Define to 1 if you're using AIX 5.1 or 5.2 or 5.3]) -@@ -755,7 +772,7 @@ - - *) - AC_MSG_RESULT(unsupported version) -- AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.10]) -+ AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.11]) - AC_MSG_ERROR([or AIX 5.1 or 5.2 or 5.3 GLIBC_VERSION]) - AC_MSG_ERROR([or Darwin libc]) - ;; diff --git a/pkgs/development/tools/analysis/valkyrie/default.nix b/pkgs/development/tools/analysis/valkyrie/default.nix new file mode 100644 index 0000000000000..3a0879d6edfd5 --- /dev/null +++ b/pkgs/development/tools/analysis/valkyrie/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, qt4 }: + +stdenv.mkDerivation rec { + name = "valkyrie-2.0.0"; + + src = fetchurl { + url = "http://valgrind.org/downloads/${name}.tar.bz2"; + sha256 = "0hwvsncf62mdkahwj9c8hpmm94c1wr5jn89370k6rj894kxry2x7"; + }; + + buildInputs = [ qt4 ]; + + configurePhase = "qmake PREFIX=$out"; + + meta = { + homepage = http://www.valgrind.org/; + description = "Qt4-based GUI for the Valgrind 3.6.x series"; + + license = "GPLv2"; + + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/games/atanks/default.nix b/pkgs/games/atanks/default.nix new file mode 100644 index 0000000000000..211e388b871a8 --- /dev/null +++ b/pkgs/games/atanks/default.nix @@ -0,0 +1,55 @@ +x@{builderDefsPackage + , allegro + , ...}: +builderDefsPackage +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ + []; + + buildInputs = map (n: builtins.getAttr n x) + (builtins.attrNames (builtins.removeAttrs x helperArgNames)); + sourceInfo = rec { + baseName="atanks"; + version="4.7"; + name="${baseName}-${version}"; + project="${baseName}"; + url="mirror://sourceforge/project/${project}/${baseName}/${name}/${name}.tar.gz"; + hash="0kd98anwb785irv4qm1gqpk2xnh1q0fxnfazkjqpwjvgrliyj2rh"; + }; +in +rec { + src = a.fetchurl { + url = sourceInfo.url; + sha256 = sourceInfo.hash; + }; + + inherit (sourceInfo) name version; + inherit buildInputs; + + /* doConfigure should be removed if not needed */ + phaseNames = ["fixInstall" "doMakeInstall"]; + makeFlags=[ + "PREFIX=$out/" + ]; + fixInstall = a.fullDepEntry ('' + sed -e "s@INSTALL=.*bin/install @INSTALL=install @" -i Makefile + sed -e "s@-g 0 -m ... -o 0@@" -i Makefile + '') ["doUnpack" "minInit"]; + + meta = { + description = "Atomic Tanks ballistics game"; + maintainers = with a.lib.maintainers; + [ + raskin + ]; + platforms = with a.lib.platforms; + linux; + }; + passthru = { + updateInfo = { + downloadPage = "http://sourceforge.net/projects/atanks/files/atanks/"; + }; + }; +}) x + diff --git a/pkgs/games/stardust/default.nix b/pkgs/games/stardust/default.nix new file mode 100644 index 0000000000000..c7ee0df6a7a34 --- /dev/null +++ b/pkgs/games/stardust/default.nix @@ -0,0 +1,62 @@ +x@{builderDefsPackage + , zlib, libtiff, libxml2, SDL, xproto, libX11, libXi, inputproto, libXmu + , libXext, xextproto, mesa + , ...}: +builderDefsPackage +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ + []; + + buildInputs = map (n: builtins.getAttr n x) + (builtins.attrNames (builtins.removeAttrs x helperArgNames)); + sourceInfo = rec { + baseName="stardust"; + version="0.1.13"; + name="${baseName}-${version}"; + url="http://iwar.free.fr/IMG/gz/${name}.tar.gz"; + hash="19rs9lz5y5g2yiq1cw0j05b11digw40gar6rw8iqc7bk3s8355xp"; + }; +in +rec { + src = a.fetchurl { + url = sourceInfo.url; + sha256 = sourceInfo.hash; + }; + + inherit (sourceInfo) name version; + inherit buildInputs; + + /* doConfigure should be removed if not needed */ + phaseNames = ["doConfigure" "fixPaths" "doMakeInstall"]; + + configureFlags = [ + "--bindir=$out/bin" + "--datadir=$out/share" + ]; + + makeFlags = [ + "bindir=$out/bin" + "datadir=$out/share" + ]; + + fixPaths = a.fullDepEntry ('' + sed -e "s@#define PACKAGE .*@#define PACKAGE \"stardust\"@" -i config.h + '') ["minInit"]; + + meta = { + description = "Space flight simulator"; + maintainers = with a.lib.maintainers; + [ + raskin + ]; + platforms = with a.lib.platforms; + linux; + }; + passthru = { + updateInfo = { + downloadPage = "http://iwar.free.fr/article.php3?id_article=6"; + }; + }; +}) x + diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix index 8b664998d927b..9f1f04eec672a 100644 --- a/pkgs/lib/maintainers.nix +++ b/pkgs/lib/maintainers.nix @@ -19,7 +19,9 @@ roconnor = "Russell O'Connor <roconnor@theorem.ca>"; sander = "Sander van der Burg <s.vanderburg@tudelft.nl>"; simons = "Peter Simons <simons@cryp.to>"; + thammers = "Tobias Hammerschmidt <jawr@gmx.de>"; urkud = "Yury G. Kudryashov <urkud+nix@ya.ru>"; viric = "LluÃs Batlle i Rossell <viriketo@gmail.com>"; + winden = "Antonio Vargas Gonzalez <windenntw@gmail.com>"; z77z = "Marco Maggesi <maggesi@math.unifi.it>"; } diff --git a/pkgs/misc/emulators/vice/default.nix b/pkgs/misc/emulators/vice/default.nix index 6a0eb40200171..293fe43d06537 100644 --- a/pkgs/misc/emulators/vice/default.nix +++ b/pkgs/misc/emulators/vice/default.nix @@ -3,10 +3,10 @@ }: stdenv.mkDerivation rec { - name = "vice-2.1"; + name = "vice-2.2"; src = fetchurl { - url = http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-2.1.tar.gz; - sha256 = "dc42df924bd4b4ab4af43e372d873a79ea035059f31f2f5c297c234b1c532c66"; + url = http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-2.2.tar.gz; + sha256 = "0l8mp9ybx494fdqgr1ps4x3c3qzms4yyg4hzcn3ihzy92zw1nn2x"; }; buildInputs = [ perl gettext libpng giflib libjpeg alsaLib readline mesa pkgconfig gtk SDL autoconf automake ]; diff --git a/pkgs/misc/emulators/wine/src-for-default.nix b/pkgs/misc/emulators/wine/src-for-default.nix index 9f8e7c8914c3f..86d6bfd00ee79 100644 --- a/pkgs/misc/emulators/wine/src-for-default.nix +++ b/pkgs/misc/emulators/wine/src-for-default.nix @@ -1,9 +1,9 @@ rec { - version="1.3.4"; - name="wine-1.3.4"; - hash="1p2zh9c3k0b2ryy8cdldcz6x7mdg0c2gkvj0hxa3bi9cczsqg4s4"; + version="1.3.8"; + name="wine-1.3.8"; + hash="1nxz2xm9xndrsiaiw18g0098dkw7p2k32qsnm0l47giw2h6gdsvf"; url="http://prdownloads.sourceforge.net/wine/wine-${version}.tar.bz2"; - advertisedUrl="http://prdownloads.sourceforge.net/wine/wine-1.3.4.tar.bz2"; + advertisedUrl="http://prdownloads.sourceforge.net/wine/wine-1.3.8.tar.bz2"; } diff --git a/pkgs/misc/maven/3.0.nix b/pkgs/misc/maven/3.0.nix new file mode 100644 index 0000000000000..f66a2f7f04b20 --- /dev/null +++ b/pkgs/misc/maven/3.0.nix @@ -0,0 +1,15 @@ +{stdenv, fetchurl, jdk, makeWrapper}: + +assert jdk != null; + +stdenv.mkDerivation { + name = "apache-maven-3.0"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://apache/maven/binaries/apache-maven-3.0-bin.tar.gz; + sha256 = "18i7vf7w79pvga4k0plixv2ppdvm476cgikaxxnar1fac5v0qsh4"; + }; + + buildInputs = [makeWrapper]; + inherit jdk; +} diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix index db25bebb06c91..248e24c90bdb1 100644 --- a/pkgs/os-specific/linux/ati-drivers/default.nix +++ b/pkgs/os-specific/linux/ati-drivers/default.nix @@ -21,7 +21,7 @@ in stdenv.mkDerivation rec { name = "ati-drivers-${version}"; - version = "10-10-x86"; + version = "10-11-x86"; builder = ./builder.sh; @@ -30,8 +30,8 @@ stdenv.mkDerivation rec { src = assert stdenv.system == "x86_64-linux"; fetchurl { - url = https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/ati-driver-installer-10-10-x86.x86_64.run; - sha256 = "1g71sj8qbarshw3hfds2v6y9q7lma3d36d0x79c7vvgllcd5c76x"; + url = https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/ati-driver-installer-10-11-x86.x86_64.run; + sha256 = "1z33w831ayx1j5lm9d1xv6whkmzsz9v8li3s8c96hwnwki6zpimr"; }; buildInputs = [xlibs.libXext xlibs.libX11 diff --git a/pkgs/os-specific/linux/iotop/default.nix b/pkgs/os-specific/linux/iotop/default.nix new file mode 100644 index 0000000000000..54a6cf8e457b0 --- /dev/null +++ b/pkgs/os-specific/linux/iotop/default.nix @@ -0,0 +1,46 @@ +x@{builderDefsPackage + , python, makeWrapper + , ...}: +builderDefsPackage +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ + []; + + buildInputs = map (n: builtins.getAttr n x) + (builtins.attrNames (builtins.removeAttrs x helperArgNames)); + sourceInfo = rec { + baseName="iotop"; + version="0.4.1"; + name="${baseName}-${version}"; + url="http://guichaz.free.fr/${baseName}/files/${name}.tar.bz2"; + hash="1dfvw3khr2rvqllvs9wad9ca3ld4i7szqf0ibq87rn36ickrf3ll"; + }; +in +rec { + src = a.fetchurl { + url = sourceInfo.url; + sha256 = sourceInfo.hash; + }; + + inherit (sourceInfo) name version; + inherit buildInputs; + + phaseNames = ["installPythonPackage" "wrapBinContentsPython"]; + + meta = { + description = "A tool to find out the processes doing the most IO"; + maintainers = with a.lib.maintainers; + [ + raskin + ]; + platforms = with a.lib.platforms; + linux; + }; + passthru = { + updateInfo = { + downloadPage = "http://guichaz.free.fr/iotop/"; + }; + }; +}) x + diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.32.nix b/pkgs/os-specific/linux/kernel/linux-2.6.32.nix index 3466b39972243..a81085fd5e2ef 100644 --- a/pkgs/os-specific/linux/kernel/linux-2.6.32.nix +++ b/pkgs/os-specific/linux/kernel/linux-2.6.32.nix @@ -198,11 +198,11 @@ in import ./generic.nix ( rec { - version = "2.6.32.25"; + version = "2.6.32.26"; src = fetchurl { url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2"; - sha256 = "1ycri78c335qqmfqxg8c4m03f6gy0q1y35yv7yg2f2m6aqhylh2z"; + sha256 = "1kpkl5ps8xrwddmn90rzynra49am9rdm37smplhf3w3ifvpc1mf3"; }; config = configWithPlatform stdenv.platform; diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix index b651d39b8887d..996965b958038 100644 --- a/pkgs/os-specific/linux/nfs-utils/default.nix +++ b/pkgs/os-specific/linux/nfs-utils/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, tcpWrapper, utillinuxng, libcap }: stdenv.mkDerivation rec { - name = "nfs-utils-1.2.2"; + name = "nfs-utils-1.2.3"; src = fetchurl { url = "mirror://sourceforge/nfs/${name}.tar.bz2"; - sha256 = "07nhr7ds5ic4x81l9qphrlmi4ifxl28xzr1zpzvg334ncrv2fizx"; + sha256 = "06gzb4idg6rkr4wpj7lrdmg3zdqiz86j43dygykbyz0987lyqxam"; }; # Needs `libblkid' and `libcomerr' from `e2fsprogs' or `util-linux-ng'. diff --git a/pkgs/os-specific/linux/untie/default.nix b/pkgs/os-specific/linux/untie/default.nix new file mode 100644 index 0000000000000..441f041e6bec9 --- /dev/null +++ b/pkgs/os-specific/linux/untie/default.nix @@ -0,0 +1,46 @@ +x@{builderDefsPackage + , ...}: +builderDefsPackage +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ + []; + + buildInputs = map (n: builtins.getAttr n x) + (builtins.attrNames (builtins.removeAttrs x helperArgNames)); + sourceInfo = rec { + baseName="untie"; + version="0.3"; + name="${baseName}-${version}"; + url="http://guichaz.free.fr/${baseName}/files/${name}.tar.bz2"; + hash="154c3550af3d3513022a15381bbc2693f5dd7789bf0a4320635991b8f6b3648c"; + }; +in +rec { + src = a.fetchurl { + url = sourceInfo.url; + sha256 = sourceInfo.hash; + }; + + inherit (sourceInfo) name version; + inherit buildInputs; + + phaseNames = ["doMakeInstall"]; + makeFlags=["PREFIX=$out"]; + + meta = { + description = "A tool to run processes untied from some of the namespaces"; + maintainers = with a.lib.maintainers; + [ + raskin + ]; + platforms = with a.lib.platforms; + linux; + }; + passthru = { + updateInfo = { + downloadPage = "http://guichaz.free.fr/untie"; + }; + }; +}) x + diff --git a/pkgs/servers/evolution-data-server/default.nix b/pkgs/servers/evolution-data-server/default.nix index d313da9f2f9c9..84c1eee57e58f 100644 --- a/pkgs/servers/evolution-data-server/default.nix +++ b/pkgs/servers/evolution-data-server/default.nix @@ -3,7 +3,7 @@ x@{builderDefsPackage , db4, krb5, openldap, glib, libxml2, GConf , nss, gtk, libgnome, libsoup, gnome_keyring , gtkdoc, sqlite, libgweather, libical, icu - , dbus_glib, gperf, nspr, gdk_pixbuf ? null + , dbus_glib, gperf, nspr , ...}: builderDefsPackage (a : diff --git a/pkgs/tools/compression/xdelta/default.nix b/pkgs/tools/compression/xdelta/default.nix new file mode 100644 index 0000000000000..c85c7366cda84 --- /dev/null +++ b/pkgs/tools/compression/xdelta/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation { + name = "xdelta-3.0z"; + + src = fetchurl { + url = http://xdelta.googlecode.com/files/xdelta3.0z.tar.gz; + sha256 = "1rpk4n3yz8x81vakzn3n75h79a2ycm06p5v72djklx0wn9gb412m"; + }; + + installPhase = + '' + mkdir -p $out/bin + cp xdelta3 $out/bin/ + + mkdir -p $out/share/man/man1 + cp xdelta3.1 $out/share/man/man1/ + ''; + + meta = { + homepage = http://xdelta.org/; + description = "A binary diff tool that uses the VCDIFF (RFC 3284) format and compression"; + }; +} diff --git a/pkgs/tools/filesystems/encfs/default.nix b/pkgs/tools/filesystems/encfs/default.nix new file mode 100644 index 0000000000000..c950810026a81 --- /dev/null +++ b/pkgs/tools/filesystems/encfs/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, openssl, fuse, boost, rlog }: + +stdenv.mkDerivation { + name = "encfs-1.6.1"; + + src = fetchurl { + url = "http://encfs.googlecode.com/files/encfs-1.6-1.tgz"; + sha256 = "0k50ic5nyibb9giif9dqm6sj20q0yzri3drg78m788z17xp060mw"; + }; + + buildInputs = [ boost fuse openssl rlog ]; + + configureFlags = "--with-boost-serialization=boost_wserialization --with-boost-filesystem=boost_filesystem"; + + meta = { + homepage = http://www.arg0.net/encfs; + description = "EncFS provides an encrypted filesystem in user-space via FUSE"; + }; +} diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix index 4191ffd6f800c..998737660242f 100644 --- a/pkgs/tools/misc/system-config-printer/default.nix +++ b/pkgs/tools/misc/system-config-printer/default.nix @@ -1,5 +1,7 @@ {stdenv, fetchurl, udev, intltool, python, pkgconfig, glib, xmlto, - docbook_xml_dtd_412, docbook_xsl, libxml2, desktop_file_utils, libusb, cups}: + makeWrapper, pygobject, pygtk, docbook_xml_dtd_412, docbook_xsl, + pythonDBus, libxml2, desktop_file_utils, libusb, cups, pycups, + notify }: stdenv.mkDerivation rec { name = "${meta.name}-${meta.version}"; @@ -9,10 +11,15 @@ stdenv.mkDerivation rec { sha256 = "16xjvahmdkkix7281gx7ac9zqaxgfb7pjjlgcc6kmw52cifk86ww"; }; buildInputs = [ udev intltool python pkgconfig glib xmlto docbook_xml_dtd_412 - libxml2 docbook_xsl desktop_file_utils libusb cups]; + libxml2 docbook_xsl desktop_file_utils libusb cups makeWrapper pygobject + pygtk pythonDBus pycups notify ]; configureFlags = "--with-udev-rules"; + postInstall = '' + wrapProgram $out/bin/system-config-printer --set PYTHONPATH "$PYTHONPATH:$(toPythonPath $out):$(toPythonPath ${notify})/gtk-2.0" + ''; + meta = { name = "system-config-printer"; version = "1.2.4"; diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix new file mode 100644 index 0000000000000..10793753ab59a --- /dev/null +++ b/pkgs/tools/misc/tmux/default.nix @@ -0,0 +1,40 @@ +{stdenv, fetchurl, ncurses, libevent}: + +stdenv.mkDerivation rec { + pname = "tmux"; + version = "1.3"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/${pname}/${name}.tar.gz"; + sha256 = "72c2d6f1c30fb4ccbd29b530a7d8a08e67c9c2d87ac8d67e3806561670fc0362"; + }; + + makeFlags = "PREFIX=\${out}"; + + buildInputs = [ ncurses libevent ]; + + meta = { + homepage = http://tmux.sourceforge.net/; + description = "tmux is a terminal multiplexer"; + + longDescription = + '' tmux is intended to be a modern, BSD-licensed alternative to programs such as GNU screen. Major features include: + + * A powerful, consistent, well-documented and easily scriptable command interface. + * A window may be split horizontally and vertically into panes. + * Panes can be freely moved and resized, or arranged into preset layouts. + * Support for UTF-8 and 256-colour terminals. + * Copy and paste with multiple buffers. + * Interactive menus to select windows, sessions or clients. + * Change the current window by searching for text in the target. + * Terminal locking, manually or after a timeout. + * A clean, easily extended, BSD-licensed codebase, under active development. + ''; + + license = stdenv.lib.licenses.bsd3; + + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.thammers ]; + }; +} diff --git a/pkgs/tools/networking/flvstreamer/default.nix b/pkgs/tools/networking/flvstreamer/default.nix new file mode 100644 index 0000000000000..c3ac4e205ae22 --- /dev/null +++ b/pkgs/tools/networking/flvstreamer/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + + name = "flvstreamer-2.1c1"; + + src = fetchurl { + url = "http://download.savannah.gnu.org/releases/flvstreamer/source/${name}.tar.gz"; + sha256 = "e90e24e13a48c57b1be01e41c9a7ec41f59953cdb862b50cf3e667429394d1ee"; + }; + + buildPhase = '' + make posix + ''; + + installPhase = '' + ensureDir $out/bin + cp flvstreamer $out/bin + cp streams $out/bin + cp rtmpsrv $out/bin + cp rtmpsuck $out/bin + ''; + + meta = { + description = "flvstreamer is an command-line RTMP client"; + + longDescription = + '' flvstreamer is an open source command-line RTMP client intended to + stream audio or video content from all types of flash or rtmp servers. + ''; + + license = "GPLv2+"; + + homepage = http://savannah.nongnu.org/projects/flvstreamer; + + maintainers = [ stdenv.lib.maintainers.thammers ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/tools/networking/tcpdump/default.nix index 640b305591e27..e9e55f48beec1 100644 --- a/pkgs/tools/networking/tcpdump/default.nix +++ b/pkgs/tools/networking/tcpdump/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libpcap, enableStatic ? false }: stdenv.mkDerivation rec { - name = "tcpdump-4.1.0"; + name = "tcpdump-4.1.1"; src = fetchurl { url = "http://www.tcpdump.org/release/${name}.tar.gz"; - sha256 = "1yhmz23cb0qx16nwnmyk2v7nnqai20lzcc4lx34v728qdpkmc1in"; + sha256 = "02kz3sghpg16p26dhid8ma67pxil8x5jqdd83fvdnypcc6ylpkg6"; }; buildInputs = [ libpcap ]; diff --git a/pkgs/tools/package-management/nix/sqlite.nix b/pkgs/tools/package-management/nix/sqlite.nix index be9dfeec6c4f2..793fc57350a3a 100644 --- a/pkgs/tools/package-management/nix/sqlite.nix +++ b/pkgs/tools/package-management/nix/sqlite.nix @@ -1,22 +1,24 @@ { stdenv, fetchurl, perl, curl, bzip2, sqlite, openssl ? null +, pkgconfig, boehmgc , storeDir ? "/nix/store" , stateDir ? "/nix/var" }: stdenv.mkDerivation rec { - name = "nix-1.0pre23559"; + name = "nix-1.0pre24749"; src = fetchurl { - url = "http://hydra.nixos.org/build/614186/download/4/${name}.tar.bz2"; - sha256 = "5c7fd783effc9c570f6feb5631f94e369a37de6b4fb2f51459964e48c465dcfa"; + url = "http://hydra.nixos.org/build/757682/download/4/${name}.tar.bz2"; + sha256 = "ab2bda296eb91a600d01a22ed4096acdf9b5d613f1155f98433d87e273a58970"; }; - buildInputs = [ perl curl openssl ]; + buildInputs = [ perl curl openssl pkgconfig boehmgc ]; configureFlags = '' --with-store-dir=${storeDir} --localstatedir=${stateDir} --with-bzip2=${bzip2} --with-sqlite=${sqlite} --disable-init-state + --enable-gc CFLAGS=-O3 CXXFLAGS=-O3 ''; diff --git a/pkgs/tools/system/dd_rescue/default.nix b/pkgs/tools/system/dd_rescue/default.nix new file mode 100644 index 0000000000000..b018de88f4647 --- /dev/null +++ b/pkgs/tools/system/dd_rescue/default.nix @@ -0,0 +1,63 @@ +x@{builderDefsPackage + , ...}: +builderDefsPackage +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ + []; + + buildInputs = map (n: builtins.getAttr n x) + (builtins.attrNames (builtins.removeAttrs x helperArgNames)); + sourceInfo = rec { + baseName="dd_rescue"; + version="1.22"; + name="${baseName}-${version}"; + url="http://www.garloff.de/kurt/linux/ddrescue/${name}.tar.gz"; + hash="0n0vs4cn5csdcsmlndg3z36ws68zlckj17zrbm6wynrbs8iirclp"; + }; +in +rec { + src = a.fetchurl { + url = sourceInfo.url; + sha256 = sourceInfo.hash; + }; + dd_rhelp_src = a.fetchurl { + url = "http://www.kalysto.org/pkg/dd_rhelp-0.1.2.tar.gz"; + sha256 = "0fhzkflg1ygiaj5ha0bf594d76vlgjsfwlpcmwrbady9frxvlkvv"; + }; + + inherit (sourceInfo) name version; + inherit buildInputs; + + /* doConfigure should be removed if not needed */ + phaseNames = ["doMakeInstall" "install_dd_rhelp" "fixPaths"]; + makeFlags=[ + ''prefix="$out"'' + ''DESTDIR="$out"'' + ''INSTASROOT='' + ]; + + fixPaths = a.doPatchShebangs ''$out/bin''; + + install_dd_rhelp = a.fullDepEntry ('' + ensureDir "$out/share/dd_rescue" "$out/bin" + tar xf "${dd_rhelp_src}" -C "$out/share/dd_rescue" + cp "$out/share/dd_rescue"/dd_rhelp*/dd_rhelp "$out/bin" + '') ["minInit" "defEnsureDir"]; + + meta = { + description = "A tool to copy data from a damaged block device"; + maintainers = with a.lib.maintainers; + [ + raskin + ]; + platforms = with a.lib.platforms; + linux; + }; + passthru = { + updateInfo = { + downloadPage = "http://www.garloff.de/kurt/linux/ddrescue/"; + }; + }; +}) x + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7c8449049f640..fe9ad364e7523 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -533,6 +533,8 @@ let ddclient = callPackage ../tools/networking/ddclient { }; + dd_rescue = callPackage ../tools/system/dd_rescue { }; + ddrescue = callPackage ../tools/system/ddrescue { }; desktop_file_utils = callPackage ../tools/misc/desktop-file-utils { }; @@ -582,6 +584,8 @@ let enblendenfuse = callPackage ../tools/graphics/enblend-enfuse { }; + encfs = callPackage ../tools/filesystems/encfs { }; + enscript = callPackage ../tools/text/enscript { }; ethtool = callPackage ../tools/misc/ethtool { }; @@ -614,6 +618,8 @@ let finger_bsd = callPackage ../tools/networking/bsd-finger { }; + flvstreamer = callPackage ../tools/networking/flvstreamer { }; + fontforge = callPackage ../tools/misc/fontforge { }; fontforgeX = callPackage ../tools/misc/fontforge { @@ -745,7 +751,7 @@ let hddtemp = callPackage ../tools/misc/hddtemp { }; hdf5 = callPackage ../tools/misc/hdf5 { }; - + hevea = callPackage ../tools/typesetting/hevea { }; highlight = callPackage ../tools/text/highlight { }; @@ -1209,7 +1215,10 @@ let svnfs = callPackage ../tools/filesystems/svnfs { }; - system_config_printer = callPackage ../tools/misc/system-config-printer { }; + system_config_printer = callPackage ../tools/misc/system-config-printer { + inherit (pythonPackages) notify; + libxml2 = libxml2Python; + }; sitecopy = callPackage ../tools/networking/sitecopy { }; @@ -1230,6 +1239,8 @@ let extraFonts = true; }; + tmux = callPackage ../tools/misc/tmux { }; + tor = callPackage ../tools/security/tor { }; torsocks = callPackage ../tools/security/tor/torsocks.nix { }; @@ -1255,6 +1266,8 @@ let inherit pciutils libx86 zlib; }; + verilog = callPackage ../applications/science/electronics/verilog {}; + viking = callPackage ../applications/misc/viking { }; vncrec = builderDefsPackage ../tools/video/vncrec { @@ -1384,6 +1397,8 @@ let xclip = callPackage ../tools/misc/xclip { }; + xdelta = callPackage ../tools/compression/xdelta { }; + xfsprogs = callPackage ../tools/filesystems/xfsprogs { }; xmlroff = callPackage ../tools/typesetting/xmlroff { @@ -2105,7 +2120,16 @@ let perl = if system != "i686-cygwin" then perl510 else sysPerl; - php = makeOverridable (import ../development/interpreters/php) { + php = php5_3; + + php5_2 = makeOverridable (import ../development/interpreters/php/5.2.nix) { + inherit + stdenv fetchurl lib composableDerivation autoconf automake + flex bison apacheHttpd mysql libxml2 + zlib curl gd postgresql openssl pkgconfig sqlite getConfig libiconv libjpeg libpng; + }; + + php5_3 = makeOverridable (import ../development/interpreters/php/5.3.nix) { inherit stdenv fetchurl lib composableDerivation autoconf automake flex bison apacheHttpd mysql libxml2 @@ -2539,6 +2563,8 @@ let valgrind = callPackage ../development/tools/analysis/valgrind { }; + valkyrie = callPackage ../development/tools/analysis/valkyrie { }; + xxdiff = builderDefsPackage (import ../development/tools/misc/xxdiff/3.2.nix) { flex = flex2535; qt = qt3; @@ -2567,6 +2593,8 @@ let agg = callPackage ../development/libraries/agg { }; + allegro = callPackage ../development/libraries/allegro {}; + amrnb = callPackage ../development/libraries/amrnb { }; amrwb = callPackage ../development/libraries/amrwb { }; @@ -2631,6 +2659,8 @@ let ccrtp = callPackage ../development/libraries/ccrtp { }; + cgui = callPackage ../development/libraries/cgui {}; + check = callPackage ../development/libraries/check { }; chipmunk = builderDefsPackage (import ../development/libraries/chipmunk) { @@ -2822,9 +2852,9 @@ let geos = callPackage ../development/libraries/geos { }; - gettext = callPackage ../development/libraries/gettext { }; + gettext = gettext_0_17; - # XXX: Remove me when `stdenv-updates' is merged. + gettext_0_17 = callPackage ../development/libraries/gettext { }; gettext_0_18 = callPackage ../development/libraries/gettext/0.18.nix { }; gd = callPackage ../development/libraries/gd { }; @@ -3794,6 +3824,8 @@ let jvm = gcj; }; + rlog = callPackage ../development/libraries/rlog { }; + rte = callPackage ../development/libraries/rte { }; rubberband = callPackage ../development/libraries/rubberband { @@ -3855,6 +3887,8 @@ let sword = callPackage ../development/libraries/sword { }; + szip = callPackage ../development/libraries/szip { }; + t1lib = callPackage ../development/libraries/t1lib { }; taglib = callPackage ../development/libraries/taglib { }; @@ -4041,6 +4075,8 @@ let swt = callPackage ../development/libraries/java/swt { }; + v8 = callPackage ../development/libraries/v8 { }; + xalanj = xalanJava; xalanJava = callPackage ../development/libraries/java/xalanj { ant = apacheAntGcj; # for bootstrap purposes @@ -4500,6 +4536,10 @@ let ifplugd = callPackage ../os-specific/linux/ifplugd { }; + iotop = callPackage ../os-specific/linux/iotop { + python = pythonFull; + }; + iproute = callPackage ../os-specific/linux/iproute { }; iputils = ( @@ -5035,6 +5075,8 @@ let tunctl = true; mconsole = true; }; + untie = callPackage ../os-specific/linux/untie {}; + upstart = callPackage ../os-specific/linux/upstart { }; usbutils = callPackage ../os-specific/linux/usbutils { }; @@ -5122,6 +5164,8 @@ let andagii = callPackage ../data/fonts/andagii {}; + anonymousPro = callPackage ../data/fonts/anonymous-pro {}; + arkpandora_ttf = builderDefsPackage (import ../data/fonts/arkpandora) { }; @@ -5166,6 +5210,8 @@ let hicolor_icon_theme = callPackage ../data/misc/hicolor-icon-theme { }; + inconsolata = callPackage ../data/fonts/inconsolata {}; + junicode = callPackage ../data/fonts/junicode { }; liberation_ttf = callPackage ../data/fonts/redhat-liberation-fonts { }; @@ -5462,6 +5508,9 @@ let inherit (gtkLibs216) glib gtk; }; eclipseLatest = eclipse.override { version = "latest"; }; + eclipse36 = callPackage ../applications/editors/eclipse { + version = "3.6.1"; + }; ed = callPackage ../applications/editors/ed { }; @@ -6062,6 +6111,8 @@ let nvi = callPackage ../applications/editors/nvi { }; + openbox = callPackage ../applications/window-managers/openbox { }; + openjump = callPackage ../applications/misc/openjump { }; openoffice = callPackage ../applications/office/openoffice { @@ -6147,7 +6198,7 @@ let pythonmagick = callPackage ../applications/graphics/PythonMagick { }; - qemu = callPackage ../applications/virtualization/qemu/0.12.3.nix { }; + qemu = callPackage ../applications/virtualization/qemu/0.13.nix { }; qemuSVN = callPackage ../applications/virtualization/qemu/svn-6642.nix { }; @@ -6548,6 +6599,8 @@ let libsigcxx = libsigcxx12; }; + atanks = callPackage ../games/atanks {}; + ballAndPaddle = callPackage ../games/ball-and-paddle { }; blackshades = callPackage ../games/blackshades { }; @@ -6569,8 +6622,8 @@ let crack_attack = callPackage ../games/crack-attack { }; - dwarf_fortress = callPackage ../games/dwarf-fortress { - gnomegtk = gnome.gtk; + dwarf_fortress = callPackage_i686 ../games/dwarf-fortress { + gnomegtk = pkgsi686Linux.gnome.gtk; }; eduke32 = callPackage ../games/eduke32 { }; @@ -6674,6 +6727,8 @@ let stdenv = stdenv2; }; + stardust = callPackage ../games/stardust {}; + superTux = callPackage ../games/super-tux { }; superTuxKart = callPackage ../games/super-tux-kart { }; @@ -6994,8 +7049,7 @@ let dpkg = callPackage ../tools/package-management/dpkg { }; - ekiga = lib.callPackageWith (pkgs // pkgs.xorg // pkgs.gtkLibs // pkgs.gnome) - ../applications/networking/ekiga {}; + ekiga = newScope (pkgs.gtkLibs // pkgs.gnome) ../applications/networking/ekiga { }; electricsheep = callPackage ../misc/screensavers/electricsheep { }; @@ -7052,8 +7106,8 @@ let martyr = callPackage ../development/libraries/martyr { }; maven = callPackage ../misc/maven/maven-1.0.nix { }; - maven2 = callPackage ../misc/maven { }; + maven3 = callPackage ../misc/maven/3.0.nix { }; mess = callPackage ../misc/emulators/mess { }; @@ -7070,8 +7124,7 @@ let }; # The SQLite branch. - nixSqlite = lowPrio (makeOverridable (import ../tools/package-management/nix/sqlite.nix) { - inherit fetchurl stdenv perl curl bzip2 openssl sqlite; + nixSqlite = lowPrio (callPackage ../tools/package-management/nix/sqlite.nix { storeDir = getPkgConfig "nix" "storeDir" "/nix/store"; stateDir = getPkgConfig "nix" "stateDir" "/nix/var"; }); diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 9cfb3718c9d39..d514dc617dda2 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -82,6 +82,8 @@ rec { cgi = callPackage ../development/libraries/haskell/cgi {}; + Chart = callPackage ../development/libraries/haskell/Chart {}; + cmdargs = callPackage ../development/libraries/haskell/cmdargs {}; colorizeHaskell = callPackage ../development/libraries/haskell/colorize-haskell {}; @@ -108,6 +110,10 @@ rec { csv = callPackage ../development/libraries/haskell/csv {}; + dataAccessor = callPackage ../development/libraries/haskell/data-accessor/data-accessor.nix {}; + + dataAccessorTemplate = callPackage ../development/libraries/haskell/data-accessor/data-accessor-template.nix {}; + dataenc = callPackage ../development/libraries/haskell/dataenc {}; dataReify = callPackage ../development/libraries/haskell/data-reify {}; @@ -439,6 +445,8 @@ rec { mtl = callPackage ../development/libraries/haskell/mtl {}; + multiplate = callPackage ../development/libraries/haskell/multiplate {}; + multirec = callPackage ../development/libraries/haskell/multirec {}; multiset = callPackage ../development/libraries/haskell/multiset {}; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8c2b616d796ca..88f666b8c0d0d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -556,6 +556,14 @@ rec { }; }; + ClassBase = buildPerlPackage rec { + name = "Class-Base-0.03"; + src = fetchurl { + url = "mirror://cpan/authors/id/A/AB/ABW/${name}.tar.gz"; + sha256 = "149875qzfyayvkb6dm8frg0kmkzyjswwrjz7gyvwi7l8b19kiyk4"; + }; + }; + ClassC3 = buildPerlPackage rec { name = "Class-C3-0.21"; src = fetchurl { @@ -616,6 +624,14 @@ rec { }; }; + ClassMakeMethods = buildPerlPackage rec { + name = "Class-MakeMethods-1.009"; + src = fetchurl { + url = "mirror://cpan/authors/id/E/EV/EVO/${name}.tar.gz"; + sha256 = "10f65j4ywrnwyz0dm1q5ymmpv875drj40mj1xvsjv0bnjinnwzj8"; + }; + }; + ClassMOP = buildPerlPackage rec { name = "Class-MOP-0.88"; src = fetchurl { @@ -1235,6 +1251,49 @@ rec { }; }; + GD = buildPerlPackage rec { + name = "GD-2.45"; + src = fetchurl { + url = "mirror://cpan/authors/id/L/LD/LDS/${name}.tar.gz"; + sha256 = "1p84585b4iyqa21hbqni0blj8fzd917ynd3y1hwh3mrmyfqj178x"; + }; + + buildInputs = [ pkgs.gd pkgs.libjpeg pkgs.zlib pkgs.freetype + pkgs.libpng pkgs.fontconfig pkgs.xlibs.libXpm GetOptLong ]; + + # Patch needed to get arguments past the first GetOptions call + # and to specify libfontconfig search path. + # Patch has been sent upstream. + patches = [ ../development/perl-modules/gd-options-passthrough-and-fontconfig.patch ]; + + # Remove a failing test. The test does a binary comparison of a generated + # file with a file packaged with the source, and these are different + # ( although the images look the same to my eye ); this is + # possibly because the source packaged image was generated with a + # different version of some library ( libpng maybe? ). + postPatch = "sed -ie 's/if (GD::Image->can(.newFromJpeg.)) {/if ( 0 ) {/' t/GD.t"; + + makeMakerFlags = "--lib_png_path=${pkgs.libpng} --lib_jpeg_path=${pkgs.libjpeg} --lib_zlib_path=${pkgs.zlib} --lib_ft_path=${pkgs.freetype} --lib_fontconfig_path=${pkgs.fontconfig} --lib_xpm_path=${pkgs.xlibs.libXpm}"; + }; + + GetOptLong = buildPerlPackage rec { + name = "Getopt-Long-2.38"; + src = fetchurl { + url = "mirror://cpan/authors/id/J/JV/JV/modules/${name}.tar.gz"; + sha256 = "0lrsm8vlqhdnkzfvyaiyfivmaar0rirrnwa2v0qk6l130a497mky"; + }; + }; + + Graph = buildPerlPackage rec { + name = "Graph-0.94"; + src = fetchurl { + url = "mirror://cpan/authors/id/J/JH/JHI/modules/${name}.tar.gz"; + sha256 = "1lyfl9s4mkhahnpxk2z5v6j750jqb4sls56b9rnkl5lni9ms7xgn"; + }; + + buildInputs = [ TestPod TestPodCoverage ]; + }; + GraphViz = buildPerlPackage rec { name = "GraphViz-2.04"; src = fetchurl { @@ -1244,7 +1303,7 @@ rec { # XXX: It'd be nicer it `GraphViz.pm' could record the path to graphviz. buildInputs = [ pkgs.graphviz ]; - propagatedBuildInputs = [ IPCRun ]; + propagatedBuildInputs = [ IPCRun TestMore ]; meta = { description = "Perl interface to the GraphViz graphing tool"; @@ -1482,6 +1541,14 @@ rec { }; }; + IOStringy = buildPerlPackage rec { + name = "IO-stringy-2.110"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DS/DSKOLL/${name}.tar.gz"; + sha256 = "1vh4n0k22hx20rwvf6h7lp25wb7spg0089shrf92d2lkncwg8g3y"; + }; + }; + IPCRun = buildPerlPackage rec { name = "IPC-Run-0.82"; src = fetchurl { @@ -1951,6 +2018,14 @@ rec { }; }; + OLEStorageLight = buildPerlPackage rec { + name = "OLE-Storage_Lite-0.19"; + src = fetchurl { + url = "mirror://cpan/authors/id/J/JM/JMCNAMARA/${name}.tar.gz"; + sha256 = "179cxwqxb0f9dpx8954nvwjmggxxi5ndnang41yav1dx6mf0abp7"; + }; + }; + ParamsUtil = buildPerlPackage rec { name = "Params-Util-1.01"; src = fetchurl { @@ -1975,11 +2050,11 @@ rec { }; }; - ParseRecDescent = buildPerlPackage { - name = "ParseRecDescent-1.96.0"; + ParseRecDescent = buildPerlPackage rec { + name = "Parse-RecDescent-1.965001"; src = fetchurl { - url = mirror://cpan/authors/id/D/DC/DCONWAY/Parse-RecDescent-1.96.0.tar.gz; - sha256 = "1hnsnpzdwcwpbnsspaz55gx7x7h1rpxdk7k1ninnqk1jximl3y9n"; + url = "mirror://cpan/authors/id/D/DC/DCONWAY/${name}.tar.gz"; + sha256 = "0r4dnrjgxv5irkyx1kgkg8vj6wqx67q5hbkifpb54906kc1n7yh0"; }; }; @@ -2231,6 +2306,16 @@ rec { }; }; + SpreadsheetParseExcel = buildPerlPackage rec { + name = "Spreadsheet-ParseExcel-0.58"; + src = fetchurl { + url = "mirror://cpan/authors/id/J/JM/JMCNAMARA/${name}.tar.gz"; + sha256 = "1ha32kfgf0b9mk00dvsx0jq72xsx0qskmgrnixcdfh044lcxzk17"; + }; + + propagatedBuildInputs = [ IOStringy OLEStorageLight ]; + }; + SQLAbstract = buildPerlPackage rec { name = "SQL-Abstract-1.60"; src = fetchurl { @@ -2254,6 +2339,20 @@ rec { buildInputs = [TestPod TestPodCoverage]; }; + SQLTranslator = buildPerlPackage rec { + name = "SQL-Translator-0.11006"; + src = fetchurl { + url = "mirror://cpan/authors/id/R/RI/RIBASUSHI/${name}.tar.gz"; + sha256 = "0ifnzap3pgkxvkv2gxpmv02637pfraza5m4zk99braw319ra4mla"; + }; + propagatedBuildInputs = [ + ClassBase ClassDataInheritable ClassMakeMethods DigestSHA1 CarpClan IOStringy + ParseRecDescent ClassAccessor DBI FileShareDir XMLWriter YAML TestDifferences + TemplateToolkit GraphViz XMLLibXML TestPod TextRecordParser HTMLParser + SpreadsheetParseExcel Graph GD + ]; + }; + StringFormat = buildPerlPackage rec { name = "String-Format-1.16"; src = fetchurl { @@ -2445,6 +2544,15 @@ rec { propagatedBuildInputs = [TestTester TestNoWarnings]; }; + TestDifferences = buildPerlPackage rec { + name = "Test-Differences-0.500"; + src = fetchurl { + url = "mirror://cpan/authors/id/O/OV/OVID/${name}.tar.gz"; + sha256 = "0ha36j6wr1d47zzilb28bvkm5lm5c6i4rqp4aqyknwg4qmagjr4w"; + }; + propagatedBuildInputs = [ TestMore TextDiff ]; + }; + TestException = buildPerlPackage { name = "Test-Exception-0.27"; src = fetchurl { @@ -2627,6 +2735,15 @@ rec { }; }; + TextDiff = buildPerlPackage rec { + name = "Text-Diff-1.37"; + src = fetchurl { + url = "mirror://cpan/authors/id/A/AD/ADAMK/${name}.tar.gz"; + sha256 = "08das6k4nrf8dgcg2l1jcy8868kgzx976j38rpdndgrgq0nz148n"; + }; + propagatedBuildInputs = [ AlgorithmDiff ]; + }; + TextMarkdown = buildPerlPackage rec { name = "Text-Markdown-1.0.26"; src = fetchurl { @@ -2646,6 +2763,21 @@ rec { propagatedBuildInputs = [ CompressZlib ]; }; + TextRecordParser = buildPerlPackage rec { + name = "Text-RecordParser-v1.5.0"; + src = fetchurl { + url = "mirror://cpan/authors/id/K/KC/KCLARK/${name}.tar.gz"; + sha256 = "0zlwpayjnpjani3v3hgi77207i3n5fppcxww20chdldx98dkj7jm"; + }; + + # In a NixOS chroot build, the tests fail because the font configuration + # at /etc/fonts/font.conf is not available. + doCheck = false; + + propagatedBuildInputs = [ TestException IOStringy ClassAccessor Readonly ListMoreUtils + TestPod TestPodCoverage GraphViz ReadonlyXS TextTabularDisplay]; + }; + TextSimpleTable = buildPerlPackage { name = "Text-SimpleTable-0.05"; src = fetchurl { @@ -2663,6 +2795,15 @@ rec { propagatedBuildInputs = [TextAligner]; }; + TextTabularDisplay = buildPerlPackage rec { + name = "Text-TabularDisplay-1.22"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DA/DARREN/${name}.tar.gz"; + sha256 = "05r3jvdf8av16hgy0i3wnc581ski08q1bnllq5cq1fnc7h2nm1c7"; + }; + propagatedBuildInputs = [TextAligner]; + }; + TieIxhash = buildPerlPackage rec { name = "Tie-IxHash-1.21"; src = fetchurl { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8c4595dcd21a4..b3a39592c78be 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -886,6 +886,29 @@ rec { }; }; + magic = buildPythonPackage rec { + name = "magic-0.3.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/python-magic/python-${name}.tar.gz"; + md5 = "397cff81d2502e81fd3830a61ca2ad2c"; + }; + + preConfigure = + '' + # Ensure that the module can find libmagic by hard-coding the + # path to libmagic.so. Maybe there is a nicer way. + substituteInPlace magic.py --replace \ + "ctypes.util.find_library('magic')" \ + "'${pkgs.file}/lib/libmagic.so'" + ''; + + meta = { + description = "A Python wrapper around libmagic"; + homepage = https://github.com/ahupp/python-magic; + }; + }; + setuptoolsDarcs = buildPythonPackage { name = "setuptools-darcs-1.2.9"; |