swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 04:49:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Sync with the trunk.

Browse source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=34028
This commit is contained in:
Eelco Dolstra 2012-05-09 11:49:52 +00:00
parent 32649ce94c 5930e47068
commit 24594b0fb3
59 changed files with 632 additions and 451 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/applications/misc/calibre/default.nix
View file

@ -4,11 +4,14 @@
}:
stdenv.mkDerivation rec {
name = "calibre-0.8.48";
name = "calibre-0.8.50";
src = fetchurl {
url = "http://calibre-ebook.googlecode.com/files/${name}.tar.xz";
sha256 = "0i2js6d64ribflvcwjj8xbyq2zicj484pl19jl6spprw4ny5im42";
urls = [
"http://calibre-ebook.googlecode.com/files/${name}.tar.xz"
"mirror://sourceforge/calibre/${name}.tar.xz"
];
sha256 = "0x6yazqjilh31rbd5knns1hag2visvp03jw5wm99lsyn9vz4qcbi";
};
inherit python;

4
pkgs/applications/misc/mysql-workbench/default.nix
View file

@ -7,12 +7,12 @@
stdenv.mkDerivation rec {
pname = "mysql-workbench";
version = "5.2.34";
version = "5.2.39";
name = "${pname}-${version}";
src = fetchurl {
url = "http://mirror.services.wisc.edu/mysql/Downloads/MySQLGUITools/mysql-workbench-gpl-${version}-src.tar.gz";
sha256 = "1b5ijaccy2k7if4pld8ihz1wa1wr1f9gj2m5xa4kf7v05zcx93c6";
sha256 = "0e4e14f1b39dca2b65f924381d82b406dc25a530fbd25631b4cd05bddc4ab5bd";
};
buildInputs = [ boost file gettext glib glibc libgnome_keyring gtk gtkmm intltool

6
pkgs/applications/science/logic/hol_light/default.nix
View file

@ -9,11 +9,11 @@ let
in
stdenv.mkDerivation {
name = "hol_light-20120312";
name = "hol_light-20120427";
src = fetchsvn {
url = http://hol-light.googlecode.com/svn/trunk;
rev = "128";
sha256 = "35dc164c05b07663bf596ea9553209087c1538dea87a04c23f01d5423b23dbfe";
rev = "134";
sha256 = "91e7575eeac37a1fbd127eabe99f736b9e1a19fb7b1a0fa27cf31b66edad4b17";
};
buildInputs = [ ocaml findlib camlp5 ];

6
pkgs/applications/video/MPlayer/default.nix
View file

@ -10,6 +10,7 @@
, x264Support ? false, x264 ? null
, xvidSupport ? false, xvidcore ? null
, lameSupport ? true, lame ? null
, speexSupport ? true, speex ? null
, screenSaverSupport ? true, libXScrnSaver
, pulseSupport ? false, pulseaudio
, mesa, pkgconfig, unzip, yasm, freefont_ttf
@ -29,6 +30,7 @@ assert jackaudioSupport -> jackaudio != null;
assert amrSupport -> (amrnb != null && amrwb != null);
assert screenSaverSupport -> libXScrnSaver != null;
assert vdpauSupport -> libvdpau != null;
assert speexSupport -> speex != null;
let
@ -111,7 +113,8 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional pulseSupport pulseaudio
++ stdenv.lib.optional screenSaverSupport libXScrnSaver
++ stdenv.lib.optional lameSupport lame
++ stdenv.lib.optional vdpauSupport libvdpau;
++ stdenv.lib.optional vdpauSupport libvdpau
++ stdenv.lib.optional speexSupport speex;
buildNativeInputs = [ yasm ];
@ -132,6 +135,7 @@ stdenv.mkDerivation rec {
${if codecs != null then "--codecsdir=${codecs}" else ""}
${if (stdenv.isi686 || stdenv.isx86_64) then "--enable-runtime-cpudetection" else ""}
${if x11Support then "--enable-x11" else ""}
${stdenv.lib.optionalString speexSupport "--enable-speex"}
--disable-xanim
--disable-ivtv
--enable-vidix

37
pkgs/applications/video/cc1394/default.nix Normal file
View file

@ -0,0 +1,37 @@
{ stdenv, fetchurl, libraw1394, libdc1394avt, qt4, SDL }:
stdenv.mkDerivation rec {
name = "cc1394-3.0";
src = fetchurl {
url = http://www.alliedvisiontec.com/fileadmin/content/PDF/Software/AVT_software/zip_files/AVTFire4Linux3v0.src.tar;
sha256 = "13fz3apxcv2rkb34hxd48lbhss6vagp9h96f55148l4mlf5iyyfv";
};
unpackPhase = ''
tar xf $src
BIGTAR=`echo *`
tar xf */cc1394*.tar.gz
rm -R $BIGTAR
cd cc*
'';
NIX_LDFLAGS = "-lX11";
enableParalellBuilding = true;
preConfigure = ''
sed -i -e s,/usr,$out, cc1394.pro
qmake PREFIX=$out
'';
buildInputs = [ libraw1394 libdc1394avt qt4 SDL ];
meta = {
homepage = http://www.alliedvisiontec.com/us/products/software/linux/avt-fire4linux.html;
description = "AVT Viewer application for AVT cameras";
license = "BSD";
maintainers = [ stdenv.lib.maintainers.viric ];
platforms = stdenv.lib.platforms.linux;
};
}

25
pkgs/applications/video/coriander/default.nix Normal file
View file

@ -0,0 +1,25 @@
{stdenv, fetchurl, pkgconfig, glib, gtk, libgnomeui, libXv, libraw1394, libdc1394
, SDL, automake, GConf }:
stdenv.mkDerivation rec {
name = "coriander-2.0.1";
src = fetchurl {
url = "http://damien.douxchamps.net/ieee1394/coriander/archives/coriander-2.0.1.tar.gz";
sha256 = "0l6hpfgy5r4yardilmdrggsnn1fbfww516sk5a90g1740cd435x5";
};
preConfigure = ''
cp ${automake}/share/automake-*/mkinstalldirs .
'';
buildInputs = [ pkgconfig glib gtk libgnomeui libXv libraw1394 libdc1394 SDL GConf ];
meta = {
homepage = http://damien.douxchamps.net/ieee1394/coriander/;
description = "GUI for controlling a Digital Camera through the IEEE1394 bus";
license = "GPLv3+";
maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; linux;
};
}

4
pkgs/applications/video/vlc/default.nix
View file

@ -5,7 +5,7 @@
, libcaca, pulseaudio, flac, schroedinger, libxml2, librsvg
, mpeg2dec, udev, gnutls, avahi, libcddb, jackaudio, SDL, SDL_image
, libmtp, unzip, taglib, libkate, libtiger, libv4l, samba, liboggz
, libass, libva, libdvbpsi
, libass, libva, libdvbpsi, libdc1394, libraw1394
}:
stdenv.mkDerivation rec {
@ -24,6 +24,7 @@ stdenv.mkDerivation rec {
udev gnutls avahi libcddb jackaudio SDL SDL_image libmtp unzip taglib
libkate libtiger libv4l samba liboggz libass libdvbpsi libva
xlibs.xlibs xlibs.libXv xlibs.libXvMC xlibs.libXpm xlibs.xcbutilkeysyms
libdc1394 libraw1394
];
buildNativeInputs = [ pkgconfig ];
@ -31,6 +32,7 @@ stdenv.mkDerivation rec {
configureFlags =
[ "--enable-alsa"
"--with-kde-solid=$out/share/apps/solid/actions"
"--enable-dc1394"
];
preConfigure = ''sed -e "s@/bin/echo@echo@g" -i configure'';

70
pkgs/applications/virtualization/virt-manager/default.nix Normal file
View file

@ -0,0 +1,70 @@
x@{builderDefsPackage
, gnome, gtk, glib, libxml2, libvirt, gtkvnc, cyrus_sasl, libtasn1, makeWrapper
, intltool, python, pygtk, libxml2Python
# virtinst is required, but it breaks when building
, ...}:
builderDefsPackage
(a :
let
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
["gnome"];
buildInputs = (map (n: builtins.getAttr n x)
(builtins.attrNames (builtins.removeAttrs x helperArgNames)))
++ [gnome.libglade intltool python libvirt];
sourceInfo = rec {
baseName="virt-manager";
version = "0.9.1";
name = "virt-manager-${version}";
url = "http://virt-manager.et.redhat.com/download/sources/virt-manager/virt-manager-${version}.tar.gz";
hash = "15e064167ba5ff84ce6fc8790081d61890430f2967f89886a84095a23e40094a";
};
in
rec {
src = a.fetchurl {
url = sourceInfo.url;
sha256 = sourceInfo.hash;
};
patchPhase = a.fullDepEntry ''
substituteInPlace "src/virt-manager.in" --replace "exec /usr/bin/python" "exec ${python}/bin/python"
sed -e '/import libxml2/i import sys\
sys.path.append("${libxml2Python}/lib/${python.libPrefix}/site-packages")' \
-i src/virtManager/util.py
sed -e '/import libxml2/i import sys\
sys.path.append("${libxml2Python}/lib/${python.libPrefix}/site-packages")' \
-i src/virtManager/libvirtobject.py
'' ["minInit"];
inherit (sourceInfo) name version;
inherit buildInputs;
/* doConfigure should be removed if not needed */
phaseNames = [ "doUnpack" "patchPhase" "doConfigure" "doMakeInstall" "installPhase" ];
installPhase = a.fullDepEntry ''
wrapProgram $out/bin/virt-manager --set PYTHONPATH $PYTHONPATH
'' ["minInit"];
#NIX_CFLAGS_COMPILE = "-fno-stack-protector";
meta = {
homepage = http://virt-manager.org;
description = "The 'Virtual Machine Manager' application (virt-manager for short package name) is a desktop user interface for managing virtual machines.";
maintainers = with a.lib.maintainers;
[
qknight
];
platforms = with a.lib.platforms;
linux;
license = a.lib.licenses.gpl2;
};
passthru = {
updateInfo = {
downloadPage = "http://virt-manager.org/download.html";
};
};
}) x

2
pkgs/development/compilers/julia/default.nix
View file

@ -106,7 +106,7 @@ stdenv.mkDerivation rec {
echo -e '#!/bin/sh' >> "$out/bin/julia-webserver"
echo -e "cd \"$out/share/julia\"" >> "$out/bin/julia-webserver"
echo -e '${lighttpd}/sbin/lighttpd -D -f ./ui/lighttpd.conf &' >> "$out/bin/julia-webserver"
echo -e '../../bin/julia-release-webserver -p 2001' >> "$out/bin/julia-webserver"
echo -e "'$out/bin/julia-release-webserver' -p 2001" >> "$out/bin/julia-webserver"
chmod a+x "$out/bin/julia-webserver"
'';

6
pkgs/development/compilers/uhc/default.nix
View file

@ -3,12 +3,12 @@
}:
stdenv.mkDerivation {
name = "uhc-svn-git20120412";
name = "uhc-svn-git20120502";
src = fetchgit {
url = "https://github.com/UU-ComputerScience/uhc.git";
rev = "eef10f64d84bc0aa145121f2a61accea03b9bc76";
sha256 = "c867d22423adb17396a28eef030c53f282b1443db2149aa7b8ab659ac7c18576";
rev = "ab26d787657bb729d8a4f92ef5d067d9990f6ce3";
sha256 = "66c5b6d95dc80a652f6e17476a1b18fbef4b4ff6199a92d033f0055526ec97ff";
};
postUnpack = "sourceRoot=\${sourceRoot}/EHC";

15
pkgs/development/interpreters/perl/sys-perl/default.nix Normal file
View file

@ -0,0 +1,15 @@
{ stdenv }:
stdenv.mkDerivation {
name = "perl";
unpackPhase = "true";
installPhase =
''
mkdir -p $out/bin
ln -s /usr/bin/perl $out/bin
'';
setupHook = ./setup-hook.sh;
}

5
pkgs/development/interpreters/perl/sys-perl/setup-hook.sh Normal file
View file

@ -0,0 +1,5 @@
addPerlLibPath () {
addToSearchPath PERL5LIB $1/lib/perl5/site_perl/5.10/i686-cygwin
}
envHooks=(${envHooks[@]} addPerlLibPath)

220
pkgs/development/interpreters/ruby/generated.nix
View file

@ -3,20 +3,21 @@
g: # Get dependencies from patched gems
{
aliases = {
ZenTest = g.ZenTest_4_7_0;
actionmailer = g.actionmailer_3_2_2;
actionpack = g.actionpack_3_2_2;
activemodel = g.activemodel_3_2_2;
activerecord = g.activerecord_3_2_2;
activeresource = g.activeresource_3_2_2;
activesupport = g.activesupport_3_2_2;
ZenTest = g.ZenTest_4_8_0;
actionmailer = g.actionmailer_3_2_3;
actionpack = g.actionpack_3_2_3;
activemodel = g.activemodel_3_2_3;
activerecord = g.activerecord_3_2_3;
activeresource = g.activeresource_3_2_3;
activesupport = g.activesupport_3_2_3;
addressable = g.addressable_2_2_8;
arel = g.arel_3_0_2;
atoulme_Antwrap = g.atoulme_Antwrap_0_7_1;
autotest_rails = g.autotest_rails_4_1_2;
builder = g.builder_3_0_0;
buildr = g.buildr_1_4_6;
bundler = g.bundler_1_1_3;
childprocess = g.childprocess_0_3_1;
childprocess = g.childprocess_0_3_2;
diff_lcs = g.diff_lcs_1_1_3;
erubis = g.erubis_2_7_0;
ffi = g.ffi_1_0_11;
@ -25,12 +26,13 @@ g: # Get dependencies from patched gems
hoe = g.hoe_2_3_3;
i18n = g.i18n_0_6_0;
journey = g.journey_1_0_3;
json = g.json_1_6_6;
json_pure = g.json_pure_1_6_6;
json = g.json_1_7_0;
json_pure = g.json_pure_1_7_0;
libwebsocket = g.libwebsocket_0_1_3;
mail = g.mail_2_4_4;
mime_types = g.mime_types_1_18;
minitar = g.minitar_0_5_3;
multi_json = g.multi_json_1_2_0;
multi_json = g.multi_json_1_3_4;
net_sftp = g.net_sftp_2_0_4;
net_ssh = g.net_ssh_2_3_0;
nix = g.nix_0_1_1;
@ -39,30 +41,30 @@ g: # Get dependencies from patched gems
rack_cache = g.rack_cache_1_2;
rack_ssl = g.rack_ssl_1_3_2;
rack_test = g.rack_test_0_6_1;
rails = g.rails_3_2_2;
railties = g.railties_3_2_2;
rails = g.rails_3_2_3;
railties = g.railties_3_2_3;
rake = g.rake_0_9_2_2;
rb_fsevent = g.rb_fsevent_0_9_0;
rb_fsevent = g.rb_fsevent_0_9_1;
rdoc = g.rdoc_3_12;
rjb = g.rjb_1_3_9;
rjb = g.rjb_1_4_0;
rspec = g.rspec_2_1_0;
rspec_core = g.rspec_core_2_1_0;
rspec_expectations = g.rspec_expectations_2_1_0;
rspec_mocks = g.rspec_mocks_2_1_0;
rubyforge = g.rubyforge_2_0_4;
rubyzip = g.rubyzip_0_9_6_1;
sass = g.sass_3_1_15;
selenium_webdriver = g.selenium_webdriver_2_20_0;
sprockets = g.sprockets_2_1_2;
rubyzip = g.rubyzip_0_9_8;
sass = g.sass_3_1_17;
selenium_webdriver = g.selenium_webdriver_2_21_2;
sprockets = g.sprockets_2_1_3;
thor = g.thor_0_14_6;
tilt = g.tilt_1_3_3;
treetop = g.treetop_1_4_10;
tzinfo = g.tzinfo_0_3_32;
tzinfo = g.tzinfo_0_3_33;
xml_simple = g.xml_simple_1_0_12;
};
gem_nix_args = [ ''autotest-rails'' ''buildr'' ''nix'' ''rails'' ''rake'' ''rb-fsevent'' ''sass'' ''selenium-webdriver'' ];
gems = {
ZenTest_4_7_0 = {
ZenTest_4_8_0 = {
basename = ''ZenTest'';
meta = {
description = ''ZenTest provides 4 different tools: zentest, unit_diff, autotest, and multiruby'';
@ -70,10 +72,11 @@ g: # Get dependencies from patched gems
longDescription = ''ZenTest provides 4 different tools: zentest, unit_diff, autotest, and
multiruby.
ZenTest scans your target and unit-test code and writes your missing
code based on simple naming rules, enabling XP at a much quicker
pace. ZenTest only works with Ruby and Test::Unit. Nobody uses this
tool anymore but it is the package namesake, so it stays.
zentest scans your target and unit-test code and writes your missing
code based on simple naming rules, enabling XP at a much quicker pace.
zentest only works with Ruby and Minitest or Test::Unit. There is
enough evidence to show that this is still proving useful to users, so
it stays.
unit_diff is a command-line filter to diff expected results from
actual results and allow you to quickly see exactly what is wrong.
@ -88,75 +91,89 @@ multiruby runs anything you want on multiple versions of ruby. Great
for compatibility checking! Use multiruby_setup to manage your
installed versions.'';
};
name = ''ZenTest-4.7.0'';
name = ''ZenTest-4.8.0'';
requiredGems = [ ];
sha256 = ''1gvhmar81y9rqyf0vh06kxagqswkxkyys4w0s0z6hq84rb4z0v1w'';
sha256 = ''1z999prd8imx8wnb8jv3i19xmzrwd72b05zhk875mbg5q64nbpnz'';
};
actionmailer_3_2_2 = {
actionmailer_3_2_3 = {
basename = ''actionmailer'';
meta = {
description = ''Email composition, delivery, and receiving framework (part of Rails).'';
homepage = ''http://www.rubyonrails.org'';
longDescription = ''Email on Rails. Compose, deliver, receive, and test emails using the familiar controller/view pattern. First-class support for multipart email and attachments.'';
};
name = ''actionmailer-3.2.2'';
name = ''actionmailer-3.2.3'';
requiredGems = [ g.mail_2_4_4 ];
sha256 = ''0x4308y786100146m2fx7bygp77cwzsds3cgwjjlkw9hgyapcxz0'';
sha256 = ''09zzg09q6321l4gdyk9w7400di7rqvrhh427s666frlh1a91gdj4'';
};
actionpack_3_2_2 = {
actionpack_3_2_3 = {
basename = ''actionpack'';
meta = {
description = ''Web-flow and rendering framework putting the VC in MVC (part of Rails).'';
homepage = ''http://www.rubyonrails.org'';
longDescription = ''Web apps on Rails. Simple, battle-tested conventions for building and testing MVC web applications. Works with any Rack-compatible server.'';
};
name = ''actionpack-3.2.2'';
requiredGems = [ g.activemodel_3_2_2 g.rack_cache_1_2 g.rack_test_0_6_1 g.journey_1_0_3 g.sprockets_2_1_2 g.erubis_2_7_0 ];
sha256 = ''0371q3xr81r07ch3y0ziil9481smv7rv03xdlhp78b5wgqq2d8zs'';
name = ''actionpack-3.2.3'';
requiredGems = [ g.activemodel_3_2_3 g.rack_cache_1_2 g.rack_test_0_6_1 g.journey_1_0_3 g.sprockets_2_1_3 g.erubis_2_7_0 ];
sha256 = ''0wg42jikmsy5bj8wp3kp21ggj1x6g0abbk1i39rlpfvsgj7fwx8v'';
};
activemodel_3_2_2 = {
activemodel_3_2_3 = {
basename = ''activemodel'';
meta = {
description = ''A toolkit for building modeling frameworks (part of Rails).'';
homepage = ''http://www.rubyonrails.org'';
longDescription = ''A toolkit for building modeling frameworks like Active Record and Active Resource. Rich support for attributes, callbacks, validations, observers, serialization, internationalization, and testing.'';
};
name = ''activemodel-3.2.2'';
name = ''activemodel-3.2.3'';
requiredGems = [ g.builder_3_0_0 ];
sha256 = ''0qsgan79g0mq5dc0w4jng0847db6354ds9nxb627cc0ijxzny4zi'';
sha256 = ''1n287g8nbm0bkvz0qh7pqw1racpzvfjzmgil9fn38p4k7dl3akg3'';
};
activerecord_3_2_2 = {
activerecord_3_2_3 = {
basename = ''activerecord'';
meta = {
description = ''Object-relational mapper framework (part of Rails).'';
homepage = ''http://www.rubyonrails.org'';
longDescription = ''Databases on Rails. Build a persistent domain model by mapping database tables to Ruby classes. Strong conventions for associations, validations, aggregations, migrations, and testing come baked-in.'';
};
name = ''activerecord-3.2.2'';
requiredGems = [ g.arel_3_0_2 g.tzinfo_0_3_32 ];
sha256 = ''08hgn2hwg2vjxcq8k656n4xhh0xyi09w5ailgqgqhkksa51m2i5b'';
name = ''activerecord-3.2.3'';
requiredGems = [ g.arel_3_0_2 g.tzinfo_0_3_33 ];
sha256 = ''0ms5q7c13d1pmzgspnwh58h9y5bzdfsjzkrkxqrrjxp0212ixcxn'';
};
activeresource_3_2_2 = {
activeresource_3_2_3 = {
basename = ''activeresource'';
meta = {
description = ''REST modeling framework (part of Rails).'';
homepage = ''http://www.rubyonrails.org'';
longDescription = ''REST on Rails. Wrap your RESTful web app with Ruby classes and work with them like Active Record models.'';
};
name = ''activeresource-3.2.2'';
name = ''activeresource-3.2.3'';
requiredGems = [ ];
sha256 = ''0fagf0mp895axy5j21yrshgqlssi949rp0a3qgaqz5bcl1b0ck8b'';
sha256 = ''1hdsr4fs355lv3ncfjv8h2s4p61rhsbz2yk21ms3n19qwblbvnwa'';
};
activesupport_3_2_2 = {
activesupport_3_2_3 = {
basename = ''activesupport'';
meta = {
description = ''A toolkit of support libraries and Ruby core extensions extracted from the Rails framework.'';
homepage = ''http://www.rubyonrails.org'';
longDescription = ''A toolkit of support libraries and Ruby core extensions extracted from the Rails framework. Rich support for multibyte strings, internationalization, time zones, and testing.'';
};
name = ''activesupport-3.2.2'';
requiredGems = [ g.i18n_0_6_0 g.multi_json_1_2_0 ];
sha256 = ''0d7rzjd2rv5qjs1mgfyhdmj08hx8lz0f1vnjq6lhz2k776qiiaxh'';
name = ''activesupport-3.2.3'';
requiredGems = [ g.i18n_0_6_0 g.multi_json_1_3_4 ];
sha256 = ''05656xcknixlkpjj5xrzk4bbniywmjn9blj0nsrpglplcf5ivh4g'';
};
addressable_2_2_8 = {
basename = ''addressable'';
meta = {
description = ''URI Implementation'';
homepage = ''http://addressable.rubyforge.org/'';
longDescription = ''Addressable is a replacement for the URI implementation that is part of
Ruby's standard library. It more closely conforms to the relevant RFCs and
adds support for IRIs and URI templates.
'';
};
name = ''addressable-2.2.8'';
requiredGems = [ ];
sha256 = ''1zrwrs5aji7ah2qh4x47f4j85s3sdsrrx4xayyhnrcykcg7s4n49'';
};
arel_3_0_2 = {
basename = ''arel'';
@ -195,7 +212,7 @@ database compatibility and query generation.'';
check out Buildr!'';
};
name = ''atoulme-Antwrap-0.7.1'';
requiredGems = [ g.rjb_1_3_9 ];
requiredGems = [ g.rjb_1_4_0 ];
sha256 = ''0r9jy2asyma8h0878nhjfbi00qvb4yapc8glngvmkkj21zbx2mfy'';
};
autotest_rails_4_1_2 = {
@ -207,7 +224,7 @@ database compatibility and query generation.'';
rails support and extra plugins for migrations and fixtures.'';
};
name = ''autotest-rails-4.1.2'';
requiredGems = [ g.ZenTest_4_7_0 ];
requiredGems = [ g.ZenTest_4_8_0 ];
sha256 = ''1wkb5jayb39yx0i8ly7sibygf9f9c3w24jg2z1qgm135zlb070v4'';
};
builder_2_1_2 = {
@ -262,18 +279,18 @@ for those one-off tasks, with a language that's a joy to use.
};
name = ''bundler-1.1.3'';
requiredGems = [ ];
sha256 = ''0078yv2iivpirw04v6s71vx3brx7is2p3bmb5v7ybfi9c8myap6z'';
sha256 = ''df5ce52b6229bae5cf2eabae71858ea7e735fa0e479b4d00cff1ee18c5f6e800'';
};
childprocess_0_3_1 = {
childprocess_0_3_2 = {
basename = ''childprocess'';
meta = {
description = ''This gem aims at being a simple and reliable solution for controlling external programs running in the background on any Ruby / OS combination.'';
homepage = ''http://github.com/jarib/childprocess'';
longDescription = ''This gem aims at being a simple and reliable solution for controlling external programs running in the background on any Ruby / OS combination.'';
};
name = ''childprocess-0.3.1'';
name = ''childprocess-0.3.2'';
requiredGems = [ g.ffi_1_0_11 ];
sha256 = ''0phkpxvwz88kgbi4d2akiqbppf374kn2rwf64hfs99p1j1ksbw5l'';
sha256 = ''006j501yik87rlgkng2nqn13awnlgagk9p93bfsiccvc4fn73m3q'';
};
diff_lcs_1_1_2 = {
basename = ''diff_lcs'';
@ -423,16 +440,16 @@ See class rdoc for help. Hint: ri Hoe'';
requiredGems = [ ];
sha256 = ''15bxq7dqhk88n7cjvmx0ipizc22mzf5mnb58r1nq2sq5mcpag6gb'';
};
json_1_6_6 = {
json_1_7_0 = {
basename = ''json'';
meta = {
description = ''JSON Implementation for Ruby'';
homepage = ''http://flori.github.com/json'';
longDescription = ''This is a JSON implementation as a Ruby extension in C.'';
};
name = ''json-1.6.6'';
name = ''json-1.7.0'';
requiredGems = [ ];
sha256 = ''0g26j5r3hznmn8c4b8hadgfzdr7lvdy3xrr4za8dm60m79i0nvbd'';
sha256 = ''5affdd32dfc4a21f3d076d12e223a5da3778d0d027a6b033f556ba394c6ca6de'';
};
json_pure_1_4_3 = {
basename = ''json_pure'';
@ -445,16 +462,27 @@ See class rdoc for help. Hint: ri Hoe'';
requiredGems = [ ];
sha256 = ''1xw357gkmk6712c94lhpsrq8j9v91mgc2nxlr1m6n20yl6sz2g9r'';
};
json_pure_1_6_6 = {
json_pure_1_7_0 = {
basename = ''json_pure'';
meta = {
description = ''JSON Implementation for Ruby'';
homepage = ''http://flori.github.com/json'';
longDescription = ''This is a JSON implementation in pure Ruby.'';
};
name = ''json_pure-1.6.6'';
name = ''json_pure-1.7.0'';
requiredGems = [ ];
sha256 = ''0n1qs826h18ckgqa0k9wsw2ypm61jjicd4s9nsyaakaqyf62p9cg'';
sha256 = ''1c661piay7i4zvjl2v8w01x69v17ip5gxwqkfzclqf3zznym28pp'';
};
libwebsocket_0_1_3 = {
basename = ''libwebsocket'';
meta = {
description = ''Universal Ruby library to handle WebSocket protocol'';
homepage = ''http://github.com/imanel/libwebsocket'';
longDescription = ''Universal Ruby library to handle WebSocket protocol'';
};
name = ''libwebsocket-0.1.3'';
requiredGems = [ g.addressable_2_2_8 ];
sha256 = ''12i3lyjd9dqvk9wpnrz9zzj7dgb6660dz8xlc7h1nixhsny1y83n'';
};
mail_2_4_4 = {
basename = ''mail'';
@ -498,16 +526,16 @@ longer happen.
requiredGems = [ ];
sha256 = ''035vs1knnnjsb8arfp8vx75warvwcdpiljjwv38lqljai9v8fq53'';
};
multi_json_1_2_0 = {
multi_json_1_3_4 = {
basename = ''multi_json'';
meta = {
description = ''A gem to provide swappable JSON backends.'';
homepage = ''http://github.com/intridea/multi_json'';
longDescription = ''A gem to provide easy switching between different JSON backends, including Oj, Yajl, the JSON gem (with C-extensions), the pure-Ruby JSON gem, and OkJson.'';
};
name = ''multi_json-1.2.0'';
name = ''multi_json-1.3.4'';
requiredGems = [ ];
sha256 = ''1pv5bzj2xniyr2lqh1a4ac5k4gj7k6dmwxp5z4kmyz46bbjkgpg2'';
sha256 = ''1w6zaswd6v30vjs4v8vzh638mlaybzwh15k74vmfr0jkb63amga0'';
};
net_sftp_2_0_4 = {
basename = ''net_sftp'';
@ -622,27 +650,27 @@ request helpers feature.'';
requiredGems = [ ];
sha256 = ''0hq5q8fjhbb7szzrj7k0l21z025c4qsxqzd5qmgivikhymw10ws0'';
};
rails_3_2_2 = {
rails_3_2_3 = {
basename = ''rails'';
meta = {
description = ''Full-stack web application framework.'';
homepage = ''http://www.rubyonrails.org'';
longDescription = ''Ruby on Rails is a full-stack web framework optimized for programmer happiness and sustainable productivity. It encourages beautiful code by favoring convention over configuration.'';
};
name = ''rails-3.2.2'';
requiredGems = [ g.activesupport_3_2_2 g.actionpack_3_2_2 g.activerecord_3_2_2 g.activeresource_3_2_2 g.actionmailer_3_2_2 g.railties_3_2_2 g.bundler_1_1_3 ];
sha256 = ''0kwh8142zxyvrva09m5g85cmwhby714q87j1mb8s6wikv4gvfmy9'';
name = ''rails-3.2.3'';
requiredGems = [ g.activesupport_3_2_3 g.actionpack_3_2_3 g.activerecord_3_2_3 g.activeresource_3_2_3 g.actionmailer_3_2_3 g.railties_3_2_3 g.bundler_1_1_3 ];
sha256 = ''08kwzxw3y4qfy10x1h8g699h1bcp5dls2h440zdgywq45lrybmmq'';
};
railties_3_2_2 = {
railties_3_2_3 = {
basename = ''railties'';
meta = {
description = ''Tools for creating, working with, and running Rails applications.'';
homepage = ''http://www.rubyonrails.org'';
longDescription = ''Rails internals: application bootup, plugins, generators, and rake tasks.'';
};
name = ''railties-3.2.2'';
name = ''railties-3.2.3'';
requiredGems = [ g.thor_0_14_6 g.rack_ssl_1_3_2 g.rdoc_3_12 ];
sha256 = ''1px41w2jrzjn7h8pm427dhliqn06yyj5md5iq5s3zmx1dps35cvf'';
sha256 = ''8715141b57dd5ad02dda101ea2812ece5e48bf6848d7586eb6c32f1d68ed7599'';
};
rake_0_8_7 = {
basename = ''rake'';
@ -666,16 +694,16 @@ request helpers feature.'';
requiredGems = [ ];
sha256 = ''19n4qp5gzbcqy9ajh56kgwqv9p9w2hnczhyvaqz0nlvk9diyng6q'';
};
rb_fsevent_0_9_0 = {
rb_fsevent_0_9_1 = {
basename = ''rb_fsevent'';
meta = {
description = ''Very simple & usable FSEvents API'';
homepage = ''http://rubygems.org/gems/rb-fsevent'';
longDescription = ''FSEvents API with Signals catching (without RubyCocoa)'';
};
name = ''rb-fsevent-0.9.0'';
name = ''rb-fsevent-0.9.1'';
requiredGems = [ ];
sha256 = ''1sk7y6bxq8p4vh2cv4zk320xlxrbs15n2knyyvdd1bj89wmmiryy'';
sha256 = ''d06bb8a10fe89e66a2e017152d9c40d5f728ad2561f8ddd305f56fedfe566f0b'';
};
rdoc_3_12 = {
basename = ''rdoc'';
@ -689,8 +717,8 @@ documentation.
See RDoc for a description of RDoc's markup and basic use.'';
};
name = ''rdoc-3.12'';
requiredGems = [ g.json_1_6_6 ];
sha256 = ''0cd4hrkba7zr675m62yb87l7hpf0sp2qw8ccc2s0y2fa2fxdxdkp'';
requiredGems = [ g.json_1_7_0 ];
sha256 = ''77b6deba13ca090fb4608c218ec5d5c05d78e841cb0b53cb31f91fb56686a431'';
};
rjb_1_3_3 = {
basename = ''rjb'';
@ -704,7 +732,7 @@ See RDoc for a description of RDoc's markup and basic use.'';
requiredGems = [ ];
sha256 = ''0jhj1y84yzdr11li784m255jvc191vs8d3zck21rfqv4z4zpifz6'';
};
rjb_1_3_9 = {
rjb_1_4_0 = {
basename = ''rjb'';
meta = {
description = ''Ruby Java bridge'';
@ -712,9 +740,9 @@ See RDoc for a description of RDoc's markup and basic use.'';
longDescription = ''RJB is a bridge program that connect between Ruby and Java with Java Native Interface.
'';
};
name = ''rjb-1.3.9'';
name = ''rjb-1.4.0'';
requiredGems = [ ];
sha256 = ''0iimwg22jacbidc43lngqndbnvgv4f9zppxzy008gi88pqgargsd'';
sha256 = ''03ildf1k04a430mqdfggld4wjvca3xd0d4qn0dwcfa2zxs3vnbz3'';
};
rspec_2_1_0 = {
basename = ''rspec'';
@ -775,7 +803,7 @@ See RDoc for a description of RDoc's markup and basic use.'';
* For all rubyforge upgrades, run 'rubyforge config' to ensure you have latest.'';
};
name = ''rubyforge-2.0.3'';
requiredGems = [ g.json_pure_1_6_6 ];
requiredGems = [ g.json_pure_1_7_0 ];
sha256 = ''1ck9hkad55dy25819v4gd1nmnpvcrb3i4np3hc03h1j6q8qpxg5p'';
};
rubyforge_2_0_4 = {
@ -806,17 +834,17 @@ See RDoc for a description of RDoc's markup and basic use.'';
requiredGems = [ ];
sha256 = ''1lc67ssqyz49rm1jms5sdvy6x41h070razxlmvj4j5q6w3qixx41'';
};
rubyzip_0_9_6_1 = {
rubyzip_0_9_8 = {
basename = ''rubyzip'';
meta = {
description = ''rubyzip is a ruby module for reading and writing zip files'';
homepage = ''http://github.com/aussiegeek/rubyzip'';
};
name = ''rubyzip-0.9.6.1'';
name = ''rubyzip-0.9.8'';
requiredGems = [ ];
sha256 = ''0azmbbv5j7xx45rn3502vb01n1b2zczi1jk84aw9qc3y9fvkwc3i'';
sha256 = ''0nq7dcs3fhidfnvy241ypp05hj4hvw8srp70v52b9amjhsmbgbfd'';
};
sass_3_1_15 = {
sass_3_1_17 = {
basename = ''sass'';
meta = {
description = ''A powerful but elegant CSS compiler that makes CSS fun again.'';
@ -827,31 +855,31 @@ See RDoc for a description of RDoc's markup and basic use.'';
command line tool or a web-framework plugin.
'';
};
name = ''sass-3.1.15'';
name = ''sass-3.1.17'';
requiredGems = [ ];
sha256 = ''1lsmqm84w03w8s54i53cf3mplklpasakff2ng6zqf75digg27fzs'';
sha256 = ''09ykjz5kam03cp6hbzmnch8g2ls3lhvnx1373bbpkvk6jckd26x7'';
};
selenium_webdriver_2_20_0 = {
selenium_webdriver_2_21_2 = {
basename = ''selenium_webdriver'';
meta = {
description = ''The next generation developer focused tool for automated testing of webapps'';
homepage = ''http://selenium.googlecode.com'';
longDescription = ''WebDriver is a tool for writing automated tests of websites. It aims to mimic the behaviour of a real user, and as such interacts with the HTML of the application.'';
};
name = ''selenium-webdriver-2.20.0'';
requiredGems = [ g.rubyzip_0_9_6_1 g.childprocess_0_3_1 ];
sha256 = ''1d37vmb7gry82bidmpnkq2nx20abi1dk55rydl9hyj94907jvc73'';
name = ''selenium-webdriver-2.21.2'';
requiredGems = [ g.rubyzip_0_9_8 g.childprocess_0_3_2 g.libwebsocket_0_1_3 ];
sha256 = ''07f291d7c1828ba22b2e50947199d766a53fff9ad0016e479b47b35bc5cc1161'';
};
sprockets_2_1_2 = {
sprockets_2_1_3 = {
basename = ''sprockets'';
meta = {
description = ''Rack-based asset packaging system'';
homepage = ''http://getsprockets.org/'';
longDescription = ''Sprockets is a Rack-based asset packaging system that concatenates and serves JavaScript, CoffeeScript, CSS, LESS, Sass, and SCSS.'';
};
name = ''sprockets-2.1.2'';
name = ''sprockets-2.1.3'';
requiredGems = [ g.hike_1_2_1 g.tilt_1_3_3 ];
sha256 = ''1zjxxvp8lz7hgf7mf1cc0gfca93iqx55nr1864rpwybivkay7s2r'';
sha256 = ''05q6qpskabl8v0vx1mwlzv5fhf48r9f4zvc7v3xdsygm2hbs3vzh'';
};
thor_0_14_6 = {
basename = ''thor'';
@ -862,7 +890,7 @@ See RDoc for a description of RDoc's markup and basic use.'';
};
name = ''thor-0.14.6'';
requiredGems = [ ];
sha256 = ''18qmgv38gfw9clhq6szyw5kcxkkk8xr7c0klp3pk3cyznzbapif7'';
sha256 = ''c7c5abd6b7dfb331efb8740276724773cece66e1fe6b83216589bb87c67e15a3'';
};
tilt_1_3_3 = {
basename = ''tilt'';
@ -885,16 +913,16 @@ See RDoc for a description of RDoc's markup and basic use.'';
requiredGems = [ g.polyglot_0_3_3 ];
sha256 = ''01f4w7fm6phhdbkx7bp0b58hrk3x4b0a63p2vvjbxm5gi2gv9ap2'';
};
tzinfo_0_3_32 = {
tzinfo_0_3_33 = {
basename = ''tzinfo'';
meta = {
description = ''Daylight-savings aware timezone library'';
homepage = ''http://tzinfo.rubyforge.org/'';
longDescription = ''TZInfo is a Ruby library that uses the standard tz (Olson) database to provide daylight savings aware transformations between times in different time zones.'';
};
name = ''tzinfo-0.3.32'';
name = ''tzinfo-0.3.33'';
requiredGems = [ ];
sha256 = ''1qn4dk9c9mpgdmmr9ih5rjh6n3wkdxkjkji9hbwan5rxg00ns77b'';
sha256 = ''0bgfbm2amclg6amf1g1pyw4bkpmavqzf2hq7w9466xz08z1zsv1p'';
};
xml_simple_1_0_12 = {
basename = ''xml_simple'';

4
pkgs/development/interpreters/sys-perl/builder.sh
View file

@ -1,4 +0,0 @@
source $stdenv/setup
mkdir $out
mkdir $out/bin
ln -s /usr/bin/perl $out/bin

6
pkgs/development/interpreters/sys-perl/default.nix
View file

@ -1,6 +0,0 @@
{stdenv}:
stdenv.mkDerivation {
name = "perl";
builder = ./builder.sh;
}

14
pkgs/development/libraries/haskell/IORefCAS/default.nix Normal file
View file

@ -0,0 +1,14 @@
{ cabal, bitsAtomic }:
cabal.mkDerivation (self: {
pname = "IORefCAS";
version = "0.2";
sha256 = "18hyy3jqr9yky5r873816fqnywrwba90sq6zx61i2vkqlfbll1k9";
buildDepends = [ bitsAtomic ];
meta = {
description = "Atomic compare and swap for IORefs and STRefs";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

7
pkgs/development/libraries/haskell/MemoTrie/default.nix
View file

@ -1,9 +1,10 @@
{ cabal }:
{ cabal, void }:
cabal.mkDerivation (self: {
pname = "MemoTrie";
version = "0.4.11";
sha256 = "0wlrsz9bsb7lkw1ja8x8jbm1v7558fg8npas1rnc5ikgfi0szzw4";
version = "0.4.12";
sha256 = "0wjpfy1vlk3fjbdj924viv1wji28kx3w9hsaz7hd0gfs77y9vjza";
buildDepends = [ void ];
meta = {
homepage = "http://haskell.org/haskellwiki/MemoTrie";
description = "Trie-based memo functions";

14
pkgs/development/libraries/haskell/abstract-deque/default.nix Normal file
View file

@ -0,0 +1,14 @@
{ cabal, HUnit, IORefCAS }:
cabal.mkDerivation (self: {
pname = "abstract-deque";
version = "0.1.5";
sha256 = "1zp19kq3m72nx7rr00yyq8iwia4abg4x9kw4d5s5k0srp5f9fn3q";
buildDepends = [ HUnit IORefCAS ];
meta = {
description = "Abstract, parameterized interface to mutable Deques";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

15
pkgs/development/libraries/haskell/abstract-par/default.nix Normal file
View file

@ -0,0 +1,15 @@
{ cabal, deepseq }:
cabal.mkDerivation (self: {
pname = "abstract-par";
version = "0.3.1";
sha256 = "0qzv520823b07hrr49rnpzayh96m6cjrmb1cn9l0dn80j6k9xayk";
buildDepends = [ deepseq ];
meta = {
homepage = "https://github.com/simonmar/monad-par";
description = "Type classes generalizing the functionality of the 'monad-par' library";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

4
pkgs/development/libraries/haskell/attoparsec-conduit/default.nix
View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "attoparsec-conduit";
version = "0.4.0";
sha256 = "1vlgpa90sgaym754w5wr3jjqjra9yrn3yn4fhi148v25y4ijrrc0";
version = "0.4.0.1";
sha256 = "1r01xaaw439qpbfnanv2yfw9fz6id8cy17yqdm6x6vk35hmv59kc";
buildDepends = [ attoparsec conduit text transformers ];
meta = {
homepage = "http://github.com/snoyberg/conduit";

15
pkgs/development/libraries/haskell/bits-atomic/default.nix Normal file
View file

@ -0,0 +1,15 @@
{ cabal }:
cabal.mkDerivation (self: {
pname = "bits-atomic";
version = "0.1.3";
sha256 = "13fbakkwcdk63dm7r0mcsanm5mijp73c7x1kxpay2f03rxb39b70";
isLibrary = true;
isExecutable = true;
meta = {
description = "Atomic bit operations on memory locations for low-level synchronization";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

4
pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix
View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "blaze-builder-conduit";
version = "0.4.0.1";
sha256 = "059i7k49vpwsd7dlm4di4k5xhiparq71h8qagssw8a4nsk9jglvp";
version = "0.4.0.2";
sha256 = "0wblkvh1v7275n1i66xmm3kg57i21s8m2sfwfnjarwbcjqbgrjih";
buildDepends = [ blazeBuilder conduit text transformers ];
meta = {
homepage = "http://github.com/snoyberg/conduit";

4
pkgs/development/libraries/haskell/conduit/default.nix
View file

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "conduit";
version = "0.4.1.1";
sha256 = "1y5bccjd3r1kakwiq0nlp3dk2jwrdsm3f8dncnfsmnlk093ajyxa";
version = "0.4.2";
sha256 = "1v8s80g8gyxb139dzqbbh4qv6ax08g5smrvx2zc5sd2773wwqwz0";
buildDepends = [
liftedBase monadControl resourcet text transformers
transformersBase void

6
pkgs/development/libraries/haskell/file-embed/default.nix
View file

@ -2,10 +2,10 @@
cabal.mkDerivation (self: {
pname = "file-embed";
version = "0.0.4.2";
sha256 = "1nismycqm8shh6zgjjfysc0yhn5yrcdvw23k6adzizawsvr92bkw";
version = "0.0.4.3";
sha256 = "0iagibsab18czvam36si88swzf5sijm4phwy4za6gnn4z71nb9s6";
meta = {
homepage = "http://github.com/snoyberg/file-embed/tree/master";
homepage = "https://github.com/snoyberg/file-embed";
description = "Use Template Haskell to embed file contents directly";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;

17
pkgs/development/libraries/haskell/monad-par-extras/default.nix Normal file
View file

@ -0,0 +1,17 @@
{ cabal, abstractPar, cereal, deepseq, mtl, random, transformers }:
cabal.mkDerivation (self: {
pname = "monad-par-extras";
version = "0.3";
sha256 = "1nrxzqswb265slxq4dhm6bav7zb4zglbrh99w5x6hwx6drgsw10d";
buildDepends = [
abstractPar cereal deepseq mtl random transformers
];
meta = {
homepage = "https://github.com/simonmar/monad-par";
description = "Combinators and extra features for Par monads";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

0
pkgs/development/libraries/haskell/monad-par/default.nix → pkgs/development/libraries/haskell/monad-par/0.1.0.3.nix
View file

20
pkgs/development/libraries/haskell/monad-par/0.3.nix Normal file
View file

@ -0,0 +1,20 @@
{ cabal, abstractDeque, abstractPar, deepseq, monadParExtras, mtl
, mwcRandom, parallel
}:
cabal.mkDerivation (self: {
pname = "monad-par";
version = "0.3";
sha256 = "19vzz8qhv8z84grcb4myivmmaj0sn7rm956nqxv5dh2l8c279zsd";
buildDepends = [
abstractDeque abstractPar deepseq monadParExtras mtl mwcRandom
parallel
];
meta = {
homepage = "https://github.com/simonmar/monad-par";
description = "A library for parallel programming based on a monad";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

4
pkgs/development/libraries/haskell/network-conduit/default.nix
View file

@ -3,8 +3,8 @@
cabal.mkDerivation (self: {
pname = "network-conduit";
version = "0.4.0";
sha256 = "0h0s33nxihd4zy9mvy2vpdrpvjapacbl69ndsw5zrbqhwbpz3mzs";
version = "0.4.0.1";
sha256 = "0xmfhar4knyn01xyigrp4lymb1vcsahd9v12i6rrqzi10mdcz6bl";
buildDepends = [
conduit liftedBase monadControl network transformers
];

4
pkgs/development/libraries/haskell/persistent-sqlite/default.nix
View file

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "persistent-sqlite";
version = "0.9.0.1";
sha256 = "19bwkaazg3c822n3308awy70ml40jvncr4c3rvidq72zzdvql9c2";
version = "0.9.0.2";
sha256 = "19wmz13k3qbpam2siykczgacgaj48yw4p7iz3y6v8a2z8wha73zb";
buildDepends = [
aeson conduit monadControl persistent text transformers
];

16
pkgs/development/libraries/haskell/persistent/default.nix
View file

@ -1,16 +1,16 @@
{ cabal, aeson, attoparsec, base64Bytestring, blazeHtml, conduit
, liftedBase, monadControl, pathPieces, poolConduit, resourcet
, sqlite, text, time, transformers, transformersBase
, unorderedContainers, vector
{ cabal, aeson, attoparsec, base64Bytestring, blazeHtml
, blazeMarkup, conduit, liftedBase, monadControl, pathPieces
, poolConduit, resourcet, sqlite, text, time, transformers
, transformersBase, unorderedContainers, vector
}:
cabal.mkDerivation (self: {
pname = "persistent";
version = "0.9.0.3";
sha256 = "07w2d5x4wlbs8smkq2mini4rkmdd38zmapwqcn59vna8cq9wslz6";
version = "0.9.0.4";
sha256 = "1igml2hmc8ga9871dfq4mxqvy639vvlgl3cs48j3b27ci3qwd9jr";
buildDepends = [
aeson attoparsec base64Bytestring blazeHtml conduit liftedBase
monadControl pathPieces poolConduit resourcet text time
aeson attoparsec base64Bytestring blazeHtml blazeMarkup conduit
liftedBase monadControl pathPieces poolConduit resourcet text time
transformers transformersBase unorderedContainers vector
];
extraLibraries = [ sqlite ];

4
pkgs/development/libraries/haskell/reactive-banana/default.nix
View file

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "reactive-banana";
version = "0.5.0.2";
sha256 = "10391b6vwgp5harzmiji66qs4zc5qipagak1mm2j8njhbqi8z0rb";
version = "0.5.0.3";
sha256 = "0j60g7k0xrq66m8g8fd9fdrpbnz2jbgqxnmbz1rfi5bvnrkhv10v";
buildDepends = [
fclabels hashable QuickCheck transformers unorderedContainers vault
];

4
pkgs/development/libraries/haskell/repa/default.nix
View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "repa";
version = "3.1.3.3";
sha256 = "108zifbgngwd5a3bkvkm4sh2nhds748wqk227mcsxcw9y085da0f";
version = "3.1.4.2";
sha256 = "08vrrhaqhk03mmc2zddj4mm9dci9q7wkxwc3ilrh1p9q4j6r53qs";
buildDepends = [ QuickCheck vector ];
meta = {
homepage = "http://repa.ouroborus.net";

4
pkgs/development/libraries/haskell/semigroups/default.nix
View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "semigroups";
version = "0.8.3";
sha256 = "179m5vvhf8rf01fnq8b2lg7v8i70yx6yq975jiazghm0qnsm32ji";
version = "0.8.3.1";
sha256 = "0gl2s6vd2cswb4qmkndfgnx9a747f4vhbx52lvixyq3sbgz1vain";
meta = {
homepage = "http://github.com/ekmett/semigroups/";
description = "Haskell 98 semigroups";

4
pkgs/development/libraries/haskell/texmath/default.nix
View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "texmath";
version = "0.6.0.5";
sha256 = "08zryp5y2llhzwbp93wbm37c1lykqgrbq8h23bv39ql8idpym0wq";
version = "0.6.0.6";
sha256 = "0wxpz9vsgi4lfgjz5w96pn2r2jdflkvb4yd06nxshimxdr51974k";
isLibrary = true;
isExecutable = true;
buildDepends = [ parsec syb xml ];

9
pkgs/development/libraries/haskell/vault/default.nix
View file

@ -1,12 +1,13 @@
{ cabal }:
{ cabal, hashable, unorderedContainers }:
cabal.mkDerivation (self: {
pname = "vault";
version = "0.1.0.0";
sha256 = "02gki0g9mwmvvizxhk6myfg3dmlqpcjjiz5c8693a060hkr0grqq";
version = "0.2.0.0";
sha256 = "1hv87kvi2bwf9ff8mhjzdf8rvqhk1xpschzs1x3swadj1kc9f1sv";
buildDepends = [ hashable unorderedContainers ];
meta = {
homepage = "https://github.com/HeinrichApfelmus/vault";
description = "a typed, persistent store for values of arbitrary types";
description = "a persistent store for values of arbitrary types";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];

4
pkgs/development/libraries/haskell/wai-app-static/default.nix
View file

@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "wai-app-static";
version = "1.2.0.2";
sha256 = "15rd2vlx3ag5bavrivscah7yqm9lv14v68wr3p9incg2ksf8h7d7";
version = "1.2.0.3";
sha256 = "1hn4k28aa15vwvvay62rvi796fma7p3j31z6bfa9im0dxdy7sf9l";
buildDepends = [
base64Bytestring blazeBuilder blazeHtml cryptohash fileEmbed
httpDate httpTypes text time transformers unixCompat wai

10
pkgs/development/libraries/haskell/wai-extra/default.nix
View file

@ -1,16 +1,16 @@
{ cabal, ansiTerminal, blazeBuilder, blazeBuilderConduit
, caseInsensitive, conduit, dataDefault, fastLogger, httpTypes
, network, text, time, transformers, wai, zlibConduit
, network, resourcet, text, time, transformers, wai, zlibConduit
}:
cabal.mkDerivation (self: {
pname = "wai-extra";
version = "1.2.0.3";
sha256 = "0iigswknh5w5zi6r99jks3bppylnw9hca9by2klwr2biw07nf09d";
version = "1.2.0.4";
sha256 = "10nd87bs6q1827ihwm13czflha2g8dhza443n55xpakba1sdgsaz";
buildDepends = [
ansiTerminal blazeBuilder blazeBuilderConduit caseInsensitive
conduit dataDefault fastLogger httpTypes network text time
transformers wai zlibConduit
conduit dataDefault fastLogger httpTypes network resourcet text
time transformers wai zlibConduit
];
meta = {
homepage = "http://github.com/yesodweb/wai";

4
pkgs/development/libraries/haskell/wai/default.nix
View file

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "wai";
version = "1.2.0.1";
sha256 = "00f95r1g2s689s1b0div28v7dnjiqz01d66acz77acp28cm0bnmc";
version = "1.2.0.2";
sha256 = "07h0znwlnfpikw9zxk7cxnyvsgqyix7lv8rylxzj259ylwfpk9fp";
buildDepends = [
blazeBuilder conduit httpTypes network text transformers vault
];

4
pkgs/development/libraries/haskell/warp/default.nix
View file

@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "warp";
version = "1.2.0.1";
sha256 = "0lbyi6xchjkf6fx3d7dh5hg8gfq041hb0yls6vq8svd75dr0x5nv";
version = "1.2.0.2";
sha256 = "08gd0xzx3j47adl2pgvcc0dj7vvfj2igbvrgnl8rifz8r5gj17lq";
buildDepends = [
blazeBuilder blazeBuilderConduit caseInsensitive conduit httpTypes
liftedBase network networkConduit simpleSendfile transformers

4
pkgs/development/libraries/haskell/xml-conduit/default.nix
View file

@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "xml-conduit";
version = "0.7.0.1";
sha256 = "0ikkdgzvvadz7787jii8hwx8rls95jwvk7p4g2lw3ib8372hz4ly";
version = "0.7.0.2";
sha256 = "0qrfl946db56p2bfjrnmkl816fncn598g5jg1s1q4xq4jp7mm70k";
buildDepends = [
attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit
conduit dataDefault failure monadControl resourcet systemFilepath

20
pkgs/development/libraries/libdc1394/default.nix Normal file
View file

@ -0,0 +1,20 @@
{ stdenv, fetchurl, libraw1394, libusb1 }:
stdenv.mkDerivation rec {
name = "libdc1394-2.2.0";
src = fetchurl {
url = "mirror://sourceforge/libdc1394/${name}.tar.gz";
sha256 = "0v7y8r8zxpkcw8fhwr6x08wkbpfzs5snw5s589fpqmn569f1grn6";
};
buildInputs = [ libraw1394 libusb1 ];
meta = {
homepage = http://sourceforge.net/projects/libdc1394/;
description = "Capture and control API for IIDC compliant cameras";
license = "LGPLv2.1+";
maintainers = [ stdenv.lib.maintainers.viric ];
platforms = stdenv.lib.platforms.linux;
};
}

28
pkgs/development/libraries/libdc1394avt/default.nix Normal file
View file

@ -0,0 +1,28 @@
{ stdenv, fetchurl, libraw1394, libusb1, pkgconfig }:
stdenv.mkDerivation rec {
name = "libdc1394avt-2.1.2";
src = fetchurl {
url = http://www.alliedvisiontec.com/fileadmin/content/PDF/Software/AVT_software/zip_files/AVTFire4Linux3v0.src.tar;
sha256 = "13fz3apxcv2rkb34hxd48lbhss6vagp9h96f55148l4mlf5iyyfv";
};
unpackPhase = ''
tar xf $src
BIGTAR=`echo *`
tar xf */libdc1394*.tar.gz
rm -R $BIGTAR
cd libd*
'';
buildInputs = [ libraw1394 libusb1 pkgconfig ];
meta = {
homepage = http://www.alliedvisiontec.com/us/products/software/linux/avt-fire4linux.html;
description = "Capture and control API for IIDC cameras with AVT extensions";
license = "LGPLv2.1+";
maintainers = [ stdenv.lib.maintainers.viric ];
platforms = stdenv.lib.platforms.linux;
};
}

4
pkgs/development/libraries/libraw1394/default.nix
View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "libraw1394-2.0.7";
name = "libraw1394-2.0.8";
src = fetchurl {
url = "mirror://kernel/linux/libs/ieee1394/${name}.tar.gz";
sha256 = "1mq9yy73q85lzk288lbdzvzrs5ajh84pzfh7xdhd3d8dy9v53xca";
sha256 = "0cwd8xn7wsm7nddbz7xgynxcjb1m4v2vjw1ky4dd6r5cv454hslk";
};
meta = {

1
pkgs/development/libraries/libvirt/default.nix
View file

@ -35,6 +35,7 @@ stdenv.mkDerivation {
'';
enableParallelBuilding = true;
NIX_CFLAGS_COMPILE = "-fno-stack-protector";
meta = {
homepage = http://libvirt.org/;

28
pkgs/development/python-modules/numpy/no_default_dirs.patch
View file

@ -1,28 +0,0 @@
diff -ur numpy-1.6.1-orig/numpy/distutils/system_info.py numpy-1.6.1/numpy/distutils/system_info.py
--- numpy-1.6.1-orig/numpy/distutils/system_info.py 2011-07-01 17:31:13.000000000 -0400
+++ numpy-1.6.1/numpy/distutils/system_info.py 2012-04-27 14:10:38.000000000 -0400
@@ -189,18 +189,12 @@
default_x11_lib_dirs = []
default_x11_include_dirs = []
else:
- default_lib_dirs = libpaths(['/usr/local/lib','/opt/lib','/usr/lib',
- '/opt/local/lib','/sw/lib'], platform_bits)
- default_include_dirs = ['/usr/local/include',
- '/opt/include', '/usr/include',
- '/opt/local/include', '/sw/include',
- '/usr/include/suitesparse']
- default_src_dirs = ['.','/usr/local/src', '/opt/src','/sw/src']
-
- default_x11_lib_dirs = libpaths(['/usr/X11R6/lib','/usr/X11/lib',
- '/usr/lib'], platform_bits)
- default_x11_include_dirs = ['/usr/X11R6/include','/usr/X11/include',
- '/usr/include']
+ default_lib_dirs = []
+ default_include_dirs = []
+ default_src_dirs = ['.']
+
+ default_x11_lib_dirs = []
+ default_x11_include_dirs = []
if os.path.join(sys.prefix, 'lib') not in default_lib_dirs:
default_lib_dirs.insert(0,os.path.join(sys.prefix, 'lib'))

4
pkgs/os-specific/linux/bbswitch/default.nix
View file

@ -1,7 +1,7 @@
{ stdenv, fetchurl, kernel }:
let
baseName = "bbswitch-0.4.1";
baseName = "bbswitch-0.4.2";
name = "${baseName}-${kernel.version}";
in
@ -11,7 +11,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://github.com/downloads/Bumblebee-Project/bbswitch/${baseName}.tar.gz";
sha256 = "d579c6efc5f6482f0cf0b2c1b1f1a127413218cdffdc8f2d5a946c11909bda23";
sha256 = "06j3cm1rk3lcbv54k0magrijykrzmkrna8n5cc274iz59842lga3";
};
preBuild = ''

18
pkgs/os-specific/linux/jujuutils/default.nix Normal file
View file

@ -0,0 +1,18 @@
{stdenv, fetchurl, linuxHeaders}:
stdenv.mkDerivation {
name = "jujuutils-0.2";
src = fetchurl {
url = http://jujuutils.googlecode.com/files/jujuutils-0.2.tar.gz;
sha256 = "1r74m7s7rs9d6y7cffi7mdap3jf96qwm1v6jcw53x5cikgmfxn4x";
};
buildInputs = [ linuxHeaders ];
meta = {
description = "Utilities around FireWire devices connected to a Linux computer";
license = "GPLv2";
homepage = http://code.google.com/p/jujuutils/;
};
}

62
pkgs/os-specific/linux/kernel-headers/3.3.5.nix Normal file
View file

@ -0,0 +1,62 @@
{ stdenv, fetchurl, perl, cross ? null }:
assert cross == null -> stdenv.isLinux;
let
version = "3.3.5";
kernelHeadersBaseConfig = if cross == null then
stdenv.platform.kernelHeadersBaseConfig
else
cross.platform.kernelHeadersBaseConfig;
in
stdenv.mkDerivation {
name = "linux-headers-${version}";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
sha256 = "0i74jn47f6vs5kcvk8abvz3k08z32c9bbqw0sdjkdxwvr4jbczpv";
};
targetConfig = if (cross != null) then cross.config else null;
platform =
if cross != null then cross.platform.kernelArch else
if stdenv.system == "i686-linux" then "i386" else
if stdenv.system == "x86_64-linux" then "x86_64" else
if stdenv.system == "powerpc-linux" then "powerpc" else
if stdenv.isArm then "arm" else
if stdenv.platform ? kernelArch then stdenv.platform.kernelArch else
abort "don't know what the kernel include directory is called for this platform";
buildInputs = [perl];
extraIncludeDirs =
if cross != null then
(if cross.arch == "powerpc" then ["ppc"] else [])
else if stdenv.system == "powerpc-linux" then ["ppc"] else [];
buildPhase = ''
if test -n "$targetConfig"; then
export ARCH=$platform
fi
make ${kernelHeadersBaseConfig}
make mrproper headers_check
'';
installPhase = ''
make INSTALL_HDR_PATH=$out headers_install
# Some builds (e.g. KVM) want a kernel.release.
mkdir -p $out/include/config
echo "${version}-default" > $out/include/config/kernel.release
'';
# !!! hacky
fixupPhase = ''
ln -s asm $out/include/asm-$platform
if test "$platform" = "i386" -o "$platform" = "x86_64"; then
ln -s asm $out/include/asm-x86
fi
'';
}

226
pkgs/os-specific/linux/kernel/efi-bootstub-config-3.3.patch
View file

@ -1,226 +0,0 @@
From 2c12b0f49831d2d96b6bdcef931794178312c288 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 18 Mar 2012 16:17:04 +0100
Subject: [PATCH 1/1] x86, efi: EFI boot stub config file support
When booting via the EFI boot stub, search for a file named 'linux.conf' in
the same directory as the bzImage and read the kernel command line from it
when no load options are passed.
The file search should only be triggered when the bzImage is loaded from the
firmware's boot process. When loaded via an EFI shell, the load options always
contain at least one character, even if no parameters were passed at the
prompt.
Signed-off-by: Shea Levy <shea@shealevy.com>
---
arch/x86/boot/compressed/eboot.c | 146 ++++++++++++++++++++++++++++++++++++--
arch/x86/boot/compressed/eboot.h | 2 +
2 files changed, 143 insertions(+), 5 deletions(-)
diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c
index fec216f..672ecfe 100644
--- a/arch/x86/boot/compressed/eboot.c
+++ b/arch/x86/boot/compressed/eboot.c
@@ -486,14 +486,14 @@ struct initrd {
* kernel image.
*/
static efi_status_t handle_ramdisks(efi_loaded_image_t *image,
- struct setup_header *hdr)
+ struct setup_header *hdr,
+ efi_file_handle_t *fh)
{
struct initrd *initrds;
unsigned long initrd_addr;
efi_guid_t fs_proto = EFI_FILE_SYSTEM_GUID;
u64 initrd_total;
efi_file_io_interface_t *io;
- efi_file_handle_t *fh;
efi_status_t status;
int nr_initrds;
char *str;
@@ -568,7 +568,7 @@ static efi_status_t handle_ramdisks(efi_loaded_image_t *image,
*p = '\0';
/* Only open the volume once. */
- if (!i) {
+ if (!fh) {
efi_boot_services_t *boottime;
boottime = sys_table->boottime;
@@ -712,6 +712,7 @@ static efi_status_t make_boot_params(struct boot_params *boot_params,
u16 *s2;
u8 *s1;
int i;
+ efi_file_handle_t *fh = NULL;
hdr->type_of_loader = 0x21;
@@ -743,14 +744,149 @@ static efi_status_t make_boot_params(struct boot_params *boot_params,
*s1 = '\0';
}
- }
+ } else {
+ efi_char16_t config_file_name[
+ sizeof CONFIG_FILE_NAME * sizeof(efi_char16_t)];
+ u16 *file_path = (u16 *)image->file_path;
+ efi_char16_t config_path[256], *config_path_position;
+ efi_boot_services_t *boottime;
+ efi_file_info_t *info;
+ unsigned long info_sz = 0;
+ u64 file_sz;
+ efi_guid_t info_guid = EFI_FILE_INFO_ID;
+ efi_guid_t fs_proto = EFI_FILE_SYSTEM_GUID;
+ efi_file_io_interface_t *io;
+ efi_file_handle_t *h;
+
+ boottime = sys_table->boottime;
+
+ config_path_position = config_path;
+
+ for (i = 0; i < sizeof CONFIG_FILE_NAME; i++)
+ config_file_name[i] = CONFIG_FILE_NAME[i];
+
+ while (*file_path == 0x404) {
+ u16 node_size = *(file_path + 1)/sizeof *file_path;
+
+ if (config_path_position - config_path) {
+ if (*(file_path + 2) == '\\' &&
+ *(file_path - 2) == '\\') {
+ config_path_position--;
+ } else if (*(file_path + 2) != '\\' &&
+ *(file_path - 2) != '\\') {
+ *config_path_position++ = '\\';
+ }
+ }
+
+ if ((config_path_position - config_path) + node_size - 3
+ + sizeof config_file_name
+ / sizeof *config_file_name
+ > sizeof config_path
+ / sizeof *config_path)
+ goto end;
+
+ memcpy((void *)config_path_position, file_path + 2,
+ (node_size - 3) * sizeof *config_path);
+ config_path_position += node_size - 3;
+ file_path += node_size;
+ }
+
+ while (*config_path_position != '\\' && config_path_position !=
+ config_path)
+ config_path_position--;
+
+ *config_path_position = '\\';
+
+ memcpy((void *)(config_path_position + 1),
+ config_file_name,
+ sizeof config_file_name);
+
+ status = efi_call_phys3(boottime->handle_protocol,
+ image->device_handle, &fs_proto, &io);
+
+ if (status != EFI_SUCCESS)
+ goto end;
+
+ status = efi_call_phys2(io->open_volume, io, &fh);
+
+ if (status != EFI_SUCCESS) {
+ fh = NULL;
+ goto end;
+ }
+
+ status = efi_call_phys5(fh->open,
+ fh,
+ &h,
+ config_path,
+ EFI_FILE_MODE_READ, (u64)0);
+
+ if (status != EFI_SUCCESS)
+ goto end;
+
+ status = efi_call_phys4(h->get_info, h, &info_guid,
+ &info_sz, NULL);
+
+ if (status != EFI_BUFFER_TOO_SMALL)
+ goto close_config_file;
+
+ while (status == EFI_BUFFER_TOO_SMALL) {
+ status = efi_call_phys3(boottime->allocate_pool,
+ EFI_LOADER_DATA, info_sz, &info);
+
+ if (status != EFI_SUCCESS)
+ goto close_config_file;
+
+ status = efi_call_phys4(h->get_info, h, &info_guid,
+ &info_sz, info);
+
+ if (status == EFI_BUFFER_TOO_SMALL)
+ efi_call_phys1(boottime->free_pool, info);
+ }
+
+ if (status != EFI_SUCCESS)
+ goto free_config_file_info;
+
+ file_sz = info->file_size;
+
+ if (file_sz > hdr->cmdline_size)
+ file_sz = hdr->cmdline_size;
+
+ options_size = file_sz + 1;
+
+ status = low_alloc(options_size, 1, &cmdline);
+
+ if (status != EFI_SUCCESS)
+ goto free_config_file_info;
+
+ status = efi_call_phys3(h->read, h, &file_sz, cmdline);
+
+ if (status != EFI_SUCCESS)
+ goto free_config_file_cmdline;
+
+ *((u8 *)cmdline + file_sz) = 0;
+
+ goto free_config_file_info;
+free_config_file_cmdline:
+ low_free(options_size, cmdline);
+ cmdline = 0;
+ options_size = 0;
+free_config_file_info:
+ efi_call_phys1(boottime->free_pool, info);
+close_config_file:
+ efi_call_phys1(h->close, h);
+ }
+end:
hdr->cmd_line_ptr = cmdline;
hdr->ramdisk_image = 0;
hdr->ramdisk_size = 0;
- status = handle_ramdisks(image, hdr);
+ status = handle_ramdisks(image, hdr, fh);
+
+ if (fh)
+ efi_call_phys1(fh->close, fh);
+
if (status != EFI_SUCCESS)
goto free_cmdline;
diff --git a/arch/x86/boot/compressed/eboot.h b/arch/x86/boot/compressed/eboot.h
index 3925166..186b4c6 100644
--- a/arch/x86/boot/compressed/eboot.h
+++ b/arch/x86/boot/compressed/eboot.h
@@ -20,6 +20,8 @@
#define PIXEL_BLT_ONLY 3
#define PIXEL_FORMAT_MAX 4
+#define CONFIG_FILE_NAME "linux.conf"
+
struct efi_pixel_bitmask {
u32 red_mask;
u32 green_mask;
--
1.7.9.4

4
pkgs/os-specific/linux/kernel/linux-3.3.nix
View file

@ -233,7 +233,7 @@ in
import ./generic.nix (
rec {
version = "3.3.4";
version = "3.3.5";
testing = false;
preConfigure = ''
@ -242,7 +242,7 @@ import ./generic.nix (
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
sha256 = "0c3bayhbvlrmfqqq43s4vp194wc97lss2vwng1dhslll7yady286";
sha256 = "0i74jn47f6vs5kcvk8abvz3k08z32c9bbqw0sdjkdxwvr4jbczpv";
};
config = configWithPlatform stdenv.platform;

5
pkgs/os-specific/linux/kernel/patches.nix
View file

@ -334,11 +334,6 @@ rec {
patch = ./sheevaplug_modules-2.6.35.patch;
};
efi_bootstub_config_3_3 =
{ name = "efi-config-3.3";
patch = ./efi-bootstub-config-3.3.patch;
};
mips_restart_2_6_36 =
{ name = "mips_restart_2_6_36";
patch = ./mips_restart.patch;

2
pkgs/servers/http/apache-modules/tomcat-connectors/default.nix
View file

@ -5,7 +5,7 @@ stdenv.mkDerivation {
builder = ./builder.sh;
src = fetchurl {
url = http://apache.xl-mirror.nl//tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.32-src.tar.gz;
url = http://archive.apache.org/dist/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.32-src.tar.gz;
sha256 = "1dim62warzy1hqvc7cvnqsbq475sr6vpgwd6gfmddmkgw155saji";
};

4
pkgs/tools/compression/lrzip/default.nix
View file

@ -1,11 +1,11 @@
{stdenv, fetchurl, zlib, lzo, bzip2, nasm, perl}:
stdenv.mkDerivation rec {
name = "lrzip-0.606";
name = "lrzip-0.612";
src = fetchurl {
url = "http://ck.kolivas.org/apps/lrzip/${name}.tar.bz2";
sha256 = "03qxqs7y868w2kfpa84xmhdnh3b4j9x29g4hkzyrg8f4cxgkcv8k";
sha256 = "15rfqpc4xj7wbv117mr2g9npxnrlmqqj97mhxqfpy8360ys9yc1c";
};
buildInputs = [ zlib lzo bzip2 nasm perl ];

4
pkgs/tools/networking/openssh/default.nix
View file

@ -13,11 +13,11 @@ let
in
stdenv.mkDerivation rec {
name = "openssh-5.9p1";
name = "openssh-6.0p1";
src = fetchurl {
url = "ftp://ftp.nl.uu.net/pub/OpenBSD/OpenSSH/portable/${name}.tar.gz";
sha256 = "1mbpfyq3kjc4p8pc631iqgvcqhwhm6vdwvzsdmd54jzhdxmqngld";
sha1 = "f691e53ef83417031a2854b8b1b661c9c08e4422";
};
prePatch = stdenv.lib.optionalString hpnSupport

4
pkgs/tools/text/wgetpaste/default.nix
View file

@ -1,10 +1,10 @@
{stdenv, fetchurl, wget, bash, coreutils}:
stdenv.mkDerivation rec {
version = "2.18";
version = "2.19";
name = "wgetpaste-${version}";
src = fetchurl {
url = "http://wgetpaste.zlin.dk/${name}.tar.bz2";
sha256 = "95ee46eac37ca74ce960c1726afc19f4a1dde4d1875ac860fdc5e45d3cb05d3e";
sha256 = "bb832557fca3be838838a87d790cb535974ea70bd2393818201676212f0f3b5a";
};
# currently zsh-autocompletion support is not installed

23
pkgs/top-level/all-packages.nix
View file

@ -2816,7 +2816,7 @@ let
spidermonkey_1_8_0rc1 = callPackage ../development/interpreters/spidermonkey/1.8.0-rc1.nix { };
spidermonkey_185 = callPackage ../development/interpreters/spidermonkey/185-1.0.0.nix { };
sysPerl = callPackage ../development/interpreters/sys-perl { };
sysPerl = callPackage ../development/interpreters/perl/sys-perl { };
tcl = callPackage ../development/interpreters/tcl { };
@ -3995,6 +3995,10 @@ let
libdbusmenu_qt = callPackage ../development/libraries/libdbusmenu-qt { };
libdc1394 = callPackage ../development/libraries/libdc1394 { };
libdc1394avt = callPackage ../development/libraries/libdc1394avt { };
libdevil = callPackage ../development/libraries/libdevil { };
libdiscid = callPackage ../development/libraries/libdiscid { };
@ -5535,6 +5539,10 @@ let
iwlwifi6000g2bucode = callPackage ../os-specific/linux/firmware/iwlwifi-6000g2b-ucode { };
jujuutils = callPackage ../os-specific/linux/jujuutils {
linuxHeaders = linuxHeaders33;
};
kbd = callPackage ../os-specific/linux/kbd { };
latencytop = callPackage ../os-specific/linux/latencytop { };
@ -5553,6 +5561,8 @@ let
linuxHeaders = callPackage ../os-specific/linux/kernel-headers { };
linuxHeaders33 = callPackage ../os-specific/linux/kernel-headers/3.3.5.nix { };
linuxHeaders26Cross = forceBuildDrv (import ../os-specific/linux/kernel-headers/2.6.32.nix {
inherit stdenv fetchurl perl;
cross = assert crossSystem != null; crossSystem;
@ -5743,7 +5753,6 @@ let
[ #kernelPatches.fbcondecor_2_6_38
kernelPatches.sec_perm_2_6_24
kernelPatches.aufs3_3
kernelPatches.efi_bootstub_config_3_3
];
};
@ -6435,6 +6444,8 @@ let
};
funpidgin = carrier;
cc1394 = callPackage ../applications/video/cc1394 { };
cddiscid = callPackage ../applications/audio/cd-discid { };
cdparanoia = cdparanoiaIII;
@ -6469,6 +6480,10 @@ let
compizconfig_python = callPackage ../applications/window-managers/compiz/config-python.nix { };
coriander = callPackage ../applications/video/coriander {
inherit (gnome) libgnomeui GConf;
};
libcompizconfig = callPackage ../applications/window-managers/compiz/libcompizconfig.nix { };
compiz_bcop = callPackage ../applications/window-managers/compiz/bcop.nix { };
@ -7114,7 +7129,7 @@ let
guiSupport = false; # use mercurialFull to get hgk GUI
};
mercurialFull = appendToName "full" (pkgs.mercurial.override { guiSupport = true; });
mercurialFull = lowPrio (appendToName "full" (pkgs.mercurial.override { guiSupport = true; }));
merkaartor = callPackage ../applications/misc/merkaartor { };
@ -7608,6 +7623,8 @@ let
};
virtviewer = callPackage ../applications/virtualization/virt-viewer {};
virtmanager = callPackage ../applications/virtualization/virt-manager {};
#virtinst = callPackage ../applications/virtualization/virtinst {};
virtualgl = callPackage ../tools/X11/virtualgl { };

20
pkgs/top-level/haskell-packages.nix
View file

@ -211,6 +211,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
mtl1 = self.mtl_1_1_1_1;
repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u
cabalInstall_0_14_0 = self.cabalInstall_0_14_0.override { Cabal = self.Cabal_1_14_0; };
monadPar = self.monadPar_0_1_0_3;
};
haskellPlatform_2011_4_0_0 =
@ -254,6 +255,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
mtl1 = self.mtl_1_1_1_1;
repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u
cabalInstall_0_14_0 = self.cabalInstall_0_14_0.override { Cabal = self.Cabal_1_14_0; zlib = self.zlib_0_5_3_3; };
monadPar = self.monadPar_0_1_0_3;
};
haskellPlatform_2011_2_0_1 =
@ -297,6 +299,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
mtl1 = self.mtl_1_1_1_1;
repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u
cabalInstall_0_14_0 = self.cabalInstall_0_14_0.override { Cabal = self.Cabal_1_14_0; zlib = self.zlib_0_5_3_3; };
monadPar = self.monadPar_0_1_0_3;
};
haskellPlatform_2011_2_0_0 =
@ -336,6 +339,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
haskellPlatform = self.haskellPlatform_2010_2_0_0;
repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u
cabalInstall_0_14_0 = self.cabalInstall_0_14_0.override { Cabal = self.Cabal_1_14_0; zlib = self.zlib_0_5_3_3; };
monadPar = self.monadPar_0_1_0_3;
deepseq = self.deepseq_1_1_0_2;
# deviating from Haskell platform here, to make some packages (notably statistics) compile
};
@ -376,6 +380,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
extensibleExceptions = self.extensibleExceptions_0_1_1_0;
repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u
deepseq = self.deepseq_1_1_0_2;
monadPar = self.monadPar_0_1_0_3;
# deviating from Haskell platform here, to make some packages (notably statistics) compile
};
@ -418,6 +423,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u
cabalInstall_0_14_0 = self.cabalInstall_0_14_0.override { Cabal = self.Cabal_1_14_0; zlib = self.zlib_0_5_3_3; };
deepseq = self.deepseq_1_1_0_2;
monadPar = self.monadPar_0_1_0_3;
# deviating from Haskell platform here, to make some packages (notably statistics) compile
};
@ -433,6 +439,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
ACVector = callPackage ../development/libraries/haskell/AC-Vector {};
abstractDeque = callPackage ../development/libraries/haskell/abstract-deque {};
abstractPar = callPackage ../development/libraries/haskell/abstract-par {};
aeson = callPackage ../development/libraries/haskell/aeson {};
alternativeIo = callPackage ../development/libraries/haskell/alternative-io {};
@ -482,6 +492,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
bitmap = callPackage ../development/libraries/haskell/bitmap {};
bitsAtomic = callPackage ../development/libraries/haskell/bits-atomic {};
bktrees = callPackage ../development/libraries/haskell/bktrees {};
blazeBuilder = callPackage ../development/libraries/haskell/blaze-builder {};
@ -934,6 +946,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
ioChoice = callPackage ../development/libraries/haskell/io-choice {};
IORefCAS = callPackage ../development/libraries/haskell/IORefCAS {};
ioStorage = callPackage ../development/libraries/haskell/io-storage {};
irc = callPackage ../development/libraries/haskell/irc {
@ -1003,7 +1017,11 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
monadLoops = callPackage ../development/libraries/haskell/monad-loops {};
monadPar = callPackage ../development/libraries/haskell/monad-par {};
monadPar_0_1_0_3 = callPackage ../development/libraries/haskell/monad-par/0.1.0.3.nix {};
monadPar_0_3 = callPackage ../development/libraries/haskell/monad-par/0.3.nix {};
monadPar = self.monadPar_0_3;
monadParExtras = callPackage ../development/libraries/haskell/monad-par-extras {};
monadPeel = callPackage ../development/libraries/haskell/monad-peel {};

11
pkgs/top-level/python-packages.nix
View file

@ -366,11 +366,11 @@ let pythonPackages = python.modules // rec {
});
cssutils = buildPythonPackage (rec {
name = "cssutils-0.9.7a6";
name = "cssutils-0.9.9";
src = fetchurl {
url = http://cssutils.googlecode.com/files/cssutils-0.9.7a6.zip;
sha256 = "1i5n97l20kn2w9v6x8ybcdnl323vy8lcc5qlxz5l89di36a2skgw";
url = http://pypi.python.org/packages/source/c/cssutils/cssutils-0.9.9.zip;
sha256 = "139yfm9yz9k33kgqw4khsljs10rkhhxyywbq9i82bh2r31cil1pp";
};
buildInputs = [ pkgs.unzip ];
@ -1179,10 +1179,9 @@ let pythonPackages = python.modules // rec {
sha256 = "1pawfmf7j7pd3mjzhmmw9hkglc2qdirrkvv29m5nsmpf2b3ip2vq";
};
patches = [ ../development/python-modules/numpy/no_default_dirs.patch ];
# TODO: add ATLAS=${pkgs.atlas}
installCommand = ''
export BLAS=${pkgs.blas} LAPACK=${pkgs.liblapack} ATLAS=${pkgs.atlas}
export BLAS=${pkgs.blas} LAPACK=${pkgs.liblapack}
python setup.py build --fcompiler="gnu95"
python setup.py install --prefix=$out
'';

1
pkgs/top-level/release.nix
View file

@ -188,6 +188,7 @@ with (import ./release-lib.nix);
mcron = linux;
mdadm = linux;
mercurial = allBut "i686-cygwin";
mercurialFull = allBut "i686-cygwin";
mesa = mesaPlatforms;
midori = linux;
mingetty = linux;