Merge remote-tracking branch 'origin/master' into stdenv-updates.

This commit is contained in:
Peter Simons
2013-02-24 19:27:08 +01:00
57 changed files with 474 additions and 224 deletions

View File

@@ -13,17 +13,17 @@ g: # Get dependencies from patched gems
arel = g.arel_3_0_2;
atoulme_Antwrap = g.atoulme_Antwrap_0_7_4;
autotest_rails = g.autotest_rails_4_1_2;
aws_sdk = g.aws_sdk_1_8_1_2;
aws_sdk = g.aws_sdk_1_8_3;
builder = g.builder_3_1_4;
buildr = g.buildr_1_4_9;
bundler = g.bundler_1_2_3;
buildr = g.buildr_1_4_10;
bundler = g.bundler_1_2_4;
childprocess = g.childprocess_0_3_8;
daemons = g.daemons_1_1_9;
diff_lcs = g.diff_lcs_1_1_3;
erubis = g.erubis_2_7_0;
eventmachine = g.eventmachine_1_0_0;
fakes3 = g.fakes3_0_1_5;
ffi = g.ffi_1_3_1;
ffi = g.ffi_1_4_0;
foreman = g.foreman_0_61_0;
highline = g.highline_1_6_2;
hike = g.hike_1_2_1;
@@ -31,17 +31,20 @@ g: # Get dependencies from patched gems
i18n = g.i18n_0_6_1;
journey = g.journey_1_0_4;
jruby_pageant = g.jruby_pageant_1_1_1;
jsduck = g.jsduck_4_6_1;
json = g.json_1_7_7;
json_pure = g.json_pure_1_7_7;
libv8 = g.libv8_3_3_10_4_x86_64_linux;
macaddr = g.macaddr_1_6_1;
mail = g.mail_2_4_4;
mime_types = g.mime_types_1_21;
minitar = g.minitar_0_5_3;
multi_json = g.multi_json_1_5_1;
multi_json = g.multi_json_1_6_1;
net_sftp = g.net_sftp_2_0_5;
net_ssh = g.net_ssh_2_6_5;
nix = g.nix_0_1_1;
nokogiri = g.nokogiri_1_5_6;
parallel = g.parallel_0_6_2;
polyglot = g.polyglot_0_3_3;
rack = g.rack_1_5_2;
rack_cache = g.rack_cache_1_2;
@@ -52,6 +55,7 @@ g: # Get dependencies from patched gems
railties = g.railties_3_2_12;
rake = g.rake_10_0_3;
rb_fsevent = g.rb_fsevent_0_9_3;
rdiscount = g.rdiscount_2_0_7;
rdoc = g.rdoc_3_12_1;
rjb = g.rjb_1_4_6;
rspec = g.rspec_2_11_0;
@@ -61,21 +65,22 @@ g: # Get dependencies from patched gems
rubyforge = g.rubyforge_2_0_4;
rubyzip = g.rubyzip_0_9_9;
sass = g.sass_3_2_5;
selenium_webdriver = g.selenium_webdriver_2_29_0;
selenium_webdriver = g.selenium_webdriver_2_30_0;
sinatra = g.sinatra_1_3_2;
sprockets = g.sprockets_2_2_2;
systemu = g.systemu_2_5_2;
therubyracer = g.therubyracer_0_10_2;
thin = g.thin_1_5_0;
thor = g.thor_0_17_0;
tilt = g.tilt_1_3_3;
treetop = g.treetop_1_4_12;
tzinfo = g.tzinfo_0_3_35;
uuid = g.uuid_2_3_6;
uuid = g.uuid_2_3_7;
uuidtools = g.uuidtools_2_1_3;
websocket = g.websocket_1_0_7;
xml_simple = g.xml_simple_1_1_1;
};
gem_nix_args = [ ''autotest-rails'' ''aws-sdk'' ''buildr'' ''fakes3'' ''foreman'' ''nix'' ''rails'' ''rake'' ''rb-fsevent'' ''sass'' ''selenium-webdriver'' ''sinatra-1.3.2'' ''thin'' ''uuid'' ];
gem_nix_args = [ ''autotest-rails'' ''aws-sdk'' ''buildr'' ''fakes3'' ''foreman'' ''jsduck'' ''nix'' ''rails'' ''rake'' ''rb-fsevent'' ''sass'' ''selenium-webdriver'' ''sinatra-1.3.2'' ''thin'' ''uuid'' ];
gems = {
ZenTest_4_9_0 = {
basename = ''ZenTest'';
@@ -171,7 +176,7 @@ installed versions.'';
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.12'';
requiredGems = [ g.i18n_0_6_1 g.multi_json_1_5_1 ];
requiredGems = [ g.i18n_0_6_1 g.multi_json_1_6_1 ];
sha256 = ''1giqkprxjf5gyfyhn5nz9q8a5gi3v8irxhkpqr00zc5fw1azllsg'';
};
arel_3_0_2 = {
@@ -226,16 +231,16 @@ rails support and extra plugins for migrations and fixtures.'';
requiredGems = [ g.ZenTest_4_9_0 ];
sha256 = ''1wkb5jayb39yx0i8ly7sibygf9f9c3w24jg2z1qgm135zlb070v4'';
};
aws_sdk_1_8_1_2 = {
aws_sdk_1_8_3 = {
basename = ''aws_sdk'';
meta = {
description = ''AWS SDK for Ruby'';
homepage = ''http://aws.amazon.com/sdkforruby'';
longDescription = ''AWS SDK for Ruby'';
};
name = ''aws-sdk-1.8.1.2'';
name = ''aws-sdk-1.8.3'';
requiredGems = [ g.uuidtools_2_1_3 g.nokogiri_1_5_6 g.json_1_7_7 ];
sha256 = ''0z3ins8rd8v3r40sn70kg21f5di58lqjfxppl19hi3pdjxgdrr7x'';
sha256 = ''0ggvwiya4swyjyswfgwhzw09hap2slz7djp0svq22y7j0xci1axy'';
};
builder_3_0_4 = {
basename = ''builder'';
@@ -285,7 +290,7 @@ simple to do. Currently the following builder objects are supported:
requiredGems = [ ];
sha256 = ''1p0bjy1vb0zbswd6bsh5qda0f0br53p8vak8cm7hls62094r405p'';
};
buildr_1_4_9 = {
buildr_1_4_10 = {
basename = ''buildr'';
meta = {
description = ''Build like you code'';
@@ -297,20 +302,20 @@ to do, and it takes care of the rest. But also something we can easily extend
for those one-off tasks, with a language that's a joy to use.
'';
};
name = ''buildr-1.4.9'';
requiredGems = [ g.rake_0_9_2_2 g.builder_3_1_3 g.net_ssh_2_6_0 g.net_sftp_2_0_5 g.rubyzip_0_9_9 g.highline_1_6_2 g.json_pure_1_7_5 g.rubyforge_2_0_4 g.hoe_3_1_0 g.rjb_1_4_2 g.atoulme_Antwrap_0_7_4 g.diff_lcs_1_1_3 g.rspec_expectations_2_11_3 g.rspec_mocks_2_11_3 g.rspec_core_2_11_1 g.rspec_2_11_0 g.xml_simple_1_1_1 g.minitar_0_5_3 ];
sha256 = ''1ws8cdc7ylfq0aqbcmgwj3d8jxh8lp8zgxx0w0a7ippvvjjxb7az'';
name = ''buildr-1.4.10'';
requiredGems = [ g.rake_0_9_2_2 g.builder_3_1_3 g.net_ssh_2_6_0 g.net_sftp_2_0_5 g.rubyzip_0_9_9 g.highline_1_6_2 g.json_pure_1_7_5 g.rubyforge_2_0_4 g.hoe_3_1_0 g.rjb_1_4_2 g.atoulme_Antwrap_0_7_4 g.diff_lcs_1_1_3 g.rspec_expectations_2_11_3 g.rspec_mocks_2_11_3 g.rspec_core_2_11_1 g.rspec_2_11_0 g.xml_simple_1_1_1 g.minitar_0_5_3 g.bundler_1_2_4 ];
sha256 = ''1x192r8ab5zr9rlp1i9b3pi3y74f9pj2w491wkgshgwj22akh6vn'';
};
bundler_1_2_3 = {
bundler_1_2_4 = {
basename = ''bundler'';
meta = {
description = ''The best way to manage your application's dependencies'';
homepage = ''http://gembundler.com'';
longDescription = ''Bundler manages an application's dependencies through its entire life, across many machines, systematically and repeatably'';
};
name = ''bundler-1.2.3'';
name = ''bundler-1.2.4'';
requiredGems = [ ];
sha256 = ''0bf6ync0901d9q4cg5ws4ra0qh9ssw2xgsip8dka34sbm59kav4w'';
sha256 = ''0p90abn29wvg6ic1230f4dj7zs55r9r772b0xq02fwqd0ry3pdgl'';
};
childprocess_0_3_8 = {
basename = ''childprocess'';
@@ -320,7 +325,7 @@ for those one-off tasks, with a language that's a joy to use.
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.8'';
requiredGems = [ g.ffi_1_3_1 ];
requiredGems = [ g.ffi_1_4_0 ];
sha256 = ''08rp4krw0g60567ih4w51ndlq2pg92al0dycy0bs0m3msq68nlq4'';
};
daemons_1_1_9 = {
@@ -412,16 +417,16 @@ using TCP/IP, especially if custom protocols are required.'';
requiredGems = [ g.thor_0_17_0 g.builder_3_1_4 ];
sha256 = ''1na5wrbarla6s414svqmr5spbpv6vmcgpswal444x4clcpmadhib'';
};
ffi_1_3_1 = {
ffi_1_4_0 = {
basename = ''ffi'';
meta = {
description = ''Ruby FFI'';
homepage = ''http://wiki.github.com/ffi/ffi'';
longDescription = ''Ruby FFI library'';
};
name = ''ffi-1.3.1'';
name = ''ffi-1.4.0'';
requiredGems = [ ];
sha256 = ''0hbrfwgaw3ilmb47lvg9gzdnnfs0q0dzp6dki7rphcvsgirhp0sb'';
sha256 = ''06a29qvg487yk9pyi7wzyj5700mf7s3mjdqc6dsrh0467mjj9768'';
};
foreman_0_61_0 = {
basename = ''foreman'';
@@ -513,6 +518,17 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf'';
requiredGems = [ ];
sha256 = ''1kgqsn0bagr41gf5kbqaxbs38a7s5bm85m0pdx4qz7d70v9nc9cl'';
};
jsduck_4_6_1 = {
basename = ''jsduck'';
meta = {
description = ''Simple JavaScript Duckumentation generator'';
homepage = ''https://github.com/senchalabs/jsduck'';
longDescription = ''Documentation generator for Sencha JS frameworks'';
};
name = ''jsduck-4.6.1'';
requiredGems = [ g.rdiscount_2_0_7 g.json_1_7_7 g.parallel_0_6_2 g.therubyracer_0_10_2 ];
sha256 = ''01bws3jfsym531znwsd6qjaymf1mrsss1bj8csvj3vhnv728qbyh'';
};
json_1_7_7 = {
basename = ''json'';
meta = {
@@ -546,6 +562,17 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf'';
requiredGems = [ ];
sha256 = ''0jxp0amx9xhka0ixnhvfgwc5ydr82hkxp81pvw32z31arx7jrwl6'';
};
libv8_3_3_10_4_x86_64_linux = {
basename = ''libv8'';
meta = {
description = ''Distribution of the V8 JavaScript engine'';
homepage = ''http://github.com/fractaloop/libv8'';
longDescription = ''Distributes the V8 JavaScript engine in binary and source forms in order to support fast builds of The Ruby Racer'';
};
name = ''libv8-3.3.10.4-x86_64-linux'';
requiredGems = [ ];
sha256 = ''13lnmkm9z3xqyi8rlsycfd7wybv044pxcisrkyq0cx7ig91a0dmc'';
};
macaddr_1_6_1 = {
basename = ''macaddr'';
meta = {
@@ -611,16 +638,16 @@ added from the the {LTSW collection}[http://www.ltsw.se/knbase/internet/mime.htp
requiredGems = [ ];
sha256 = ''035vs1knnnjsb8arfp8vx75warvwcdpiljjwv38lqljai9v8fq53'';
};
multi_json_1_5_1 = {
multi_json_1_6_1 = {
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.5.1'';
name = ''multi_json-1.6.1'';
requiredGems = [ ];
sha256 = ''0c2jxjg6lx811515s35vnyjl9m9rsb2adw6yj2fxgqkc7yx1fjsz'';
sha256 = ''0p33swcl9i97wvv0cq9jkdl8q7xbc3j07apy35vsgldnhw99krcg'';
};
net_sftp_2_0_5 = {
basename = ''net_sftp'';
@@ -681,6 +708,16 @@ enough of it.'';
requiredGems = [ ];
sha256 = ''1235h8k242f6yi5qgb8rfcx6gp7g99djwqgrz0vb6w12pbp9kar8'';
};
parallel_0_6_2 = {
basename = ''parallel'';
meta = {
description = ''Run any kind of code in parallel processes'';
homepage = ''http://github.com/grosser/parallel'';
};
name = ''parallel-0.6.2'';
requiredGems = [ ];
sha256 = ''05rdbb1jqv0179wjfj74a1739rsqv7ijf4jp1i5s6lzh878c6l6p'';
};
polyglot_0_3_3 = {
basename = ''polyglot'';
meta = {
@@ -787,7 +824,7 @@ request helpers feature.'';
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.12'';
requiredGems = [ g.activesupport_3_2_12 g.actionpack_3_2_12 g.activerecord_3_2_12 g.activeresource_3_2_12 g.actionmailer_3_2_12 g.railties_3_2_12 g.bundler_1_2_3 ];
requiredGems = [ g.activesupport_3_2_12 g.actionpack_3_2_12 g.activerecord_3_2_12 g.activeresource_3_2_12 g.actionmailer_3_2_12 g.railties_3_2_12 g.bundler_1_2_4 ];
sha256 = ''1jjnm74nzl5v3461c0mrbpa471yd6s8hnkmnxb64c2rm95c61wxz'';
};
railties_3_2_12 = {
@@ -845,6 +882,16 @@ request helpers feature.'';
requiredGems = [ ];
sha256 = ''0bdnxwdxj4r1kdxfi5nszbsb126njrr81p912g64xxs2bgxd1bp1'';
};
rdiscount_2_0_7 = {
basename = ''rdiscount'';
meta = {
description = ''Fast Implementation of Gruber's Markdown in C'';
homepage = ''http://github.com/rtomayko/rdiscount'';
};
name = ''rdiscount-2.0.7'';
requiredGems = [ ];
sha256 = ''1cj9dn59xqjaglvzvd1ninid62xmih74az0glqqb90n2p42s2zs1'';
};
rdoc_3_12_1 = {
basename = ''rdoc'';
meta = {
@@ -971,16 +1018,16 @@ See RDoc for a description of RDoc's markup and basic use.'';
requiredGems = [ ];
sha256 = ''1ys7pfadw61dm09yyk28zrssi8zsyj99fyq6bdf2xmi8yp1avs6k'';
};
selenium_webdriver_2_29_0 = {
selenium_webdriver_2_30_0 = {
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.29.0'';
requiredGems = [ g.multi_json_1_5_1 g.rubyzip_0_9_9 g.childprocess_0_3_8 g.websocket_1_0_7 ];
sha256 = ''0c5fybp19mawq07h59b16h736pz8sz017m1pwalb6mcyliqmlwcj'';
name = ''selenium-webdriver-2.30.0'';
requiredGems = [ g.multi_json_1_6_1 g.rubyzip_0_9_9 g.childprocess_0_3_8 g.websocket_1_0_7 ];
sha256 = ''1ybx8v9m5y8ykbdbldd1mglz0xhg30iv0708ig0vzjl2522sg6v1'';
};
sinatra_1_3_2 = {
basename = ''sinatra'';
@@ -1001,7 +1048,7 @@ See RDoc for a description of RDoc's markup and basic use.'';
longDescription = ''Sprockets is a Rack-based asset packaging system that concatenates and serves JavaScript, CoffeeScript, CSS, LESS, Sass, and SCSS.'';
};
name = ''sprockets-2.2.2'';
requiredGems = [ g.hike_1_2_1 g.multi_json_1_5_1 g.rack_1_5_2 g.tilt_1_3_3 ];
requiredGems = [ g.hike_1_2_1 g.multi_json_1_6_1 g.rack_1_5_2 g.tilt_1_3_3 ];
sha256 = ''15ngw3bjbyr31ygzmmdxxa30ylah6pdn8akgdy9w30vfx2vr7s7s'';
};
systemu_2_5_2 = {
@@ -1015,6 +1062,17 @@ See RDoc for a description of RDoc's markup and basic use.'';
requiredGems = [ ];
sha256 = ''0h834ajdg9w4xrijp31fn98pjfj08gi08xjvp5xh3i6hz9a25fhr'';
};
therubyracer_0_10_2 = {
basename = ''therubyracer'';
meta = {
description = ''Embed the V8 Javascript interpreter into Ruby'';
homepage = ''http://github.com/cowboyd/therubyracer'';
longDescription = ''Call javascript code and manipulate javascript objects from ruby. Call ruby code and manipulate ruby objects from javascript.'';
};
name = ''therubyracer-0.10.2'';
requiredGems = [ g.libv8_3_3_10_4_x86_64_linux ];
sha256 = ''111hm2l613v06sy7pzjzmnyi4x11rg3c2syhnpv8fn0wnn9rdiyb'';
};
thin_1_5_0 = {
basename = ''thin'';
meta = {
@@ -1069,7 +1127,7 @@ See RDoc for a description of RDoc's markup and basic use.'';
requiredGems = [ ];
sha256 = ''1c52ndjqcxpgxhlclbxf98clcpni216xk5zgrkcd4px84riyjbmp'';
};
uuid_2_3_6 = {
uuid_2_3_7 = {
basename = ''uuid'';
meta = {
description = ''UUID generator'';
@@ -1078,9 +1136,9 @@ See RDoc for a description of RDoc's markup and basic use.'';
(http://www.ietf.org/rfc/rfc4122.txt).
'';
};
name = ''uuid-2.3.6'';
name = ''uuid-2.3.7'';
requiredGems = [ g.macaddr_1_6_1 ];
sha256 = ''194xznnxncfgr0nx84l11gnafvkfzr1nj1swnwas75q0ld0ri2l8'';
sha256 = ''04q10an3v40zwjihvdwm23fw6vl39fbkhdiwfw78a51ym9airnlp'';
};
uuidtools_2_1_3 = {
basename = ''uuidtools'';

View File

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "lilv-${version}";
version = "0.14.2";
version = "0.16.0";
src = fetchurl {
url = "http://download.drobilla.net/${name}.tar.bz2";
sha256 = "0g9sg5f8xkkvsad0c6rh4j1k2b2hwsh83yg66f4qznxh43np7zlx";
sha256 = "1ddrcikypi7gfmj5cqn975axzrgv7mhzif4h0ni9w5b4v64rvcyg";
};
buildInputs = [ lv2 pkgconfig python serd sord sratom ];

View File

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "lv2-${version}";
version = "1.0.0";
version = "1.4.0";
src = fetchurl {
url = "http://lv2plug.in/spec/${name}.tar.bz2";
sha256 = "0lfp7679wwqd49k4mjxwqslpfx5fz2q7akxqayg400zqn70whzl5";
sha256 = "035hlfva2mij698nj3z1mz9g4mj4z5jx9axs6ww47jgyjcq38asz";
};
buildInputs = [ gtk libsndfile pkgconfig python ];

View File

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "sratom-${version}";
version = "0.2.0";
version = "0.4.2";
src = fetchurl {
url = "http://download.drobilla.net/${name}.tar.bz2";
sha256 = "12wi0ycjnn6mlddcp476wzr6k2bb4ig1489gg8h1k7v0w7d6ry1a";
sha256 = "16i5snknl9frz638mgr58lp11ap1xmkbrkb3l6f0ad8ddqpcjm3i";
};
buildInputs = [ lv2 pkgconfig python serd sord ];

View File

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "suil-${version}";
version = "0.6.4";
version = "0.6.10";
src = fetchurl {
url = "http://download.drobilla.net/${name}.tar.bz2";
sha256 = "12pz2w74rhhi6gsskfs6l71vw8qfz8906kbjf5w6jyy1x4kkdca2";
sha256 = "1y7zgfciphr3icamikdfv2gh8xwix5blpq4npl426399i8f4ya5y";
};
buildInputs = [ gtk lv2 pkgconfig python qt4 serd sord sratom ];

View File

@@ -1,24 +0,0 @@
{ stdenv, fetchurl, pkgconfig, glib, libsigcxx }:
stdenv.mkDerivation rec {
name = "glibmm-2.30.1";
src = fetchurl {
url = mirror://gnome/sources/glibmm/2.30/glibmm-2.30.1.tar.xz;
sha256 = "15zqgx6rashyhxk89qjqq05p6m40akpgzyjk8bfb3jk68rc2nn39";
};
nativeBuildInputs = [pkgconfig];
propagatedBuildInputs = [glib libsigcxx];
meta = {
description = "C++ interface to the GLib library";
homepage = http://gtkmm.org/;
license = "LGPLv2+";
maintainers = with stdenv.lib.maintainers; [urkud raskin];
platforms = stdenv.lib.platforms.linux;
};
}

View File

@@ -0,0 +1,24 @@
{ stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, libsigcxx }:
stdenv.mkDerivation rec {
name = "glibmm-2.34.1";
src = fetchurl {
url = "mirror://gnome/sources/glibmm/2.34/${name}.tar.xz";
sha256 = "1i4jsvahva2q0mig7kjnpsw0r3fnpybm8b6hzymfm2hpgqnaa9dl";
};
buildNativeInputs = [ pkgconfig ];
propagatedBuildInputs = [ glib gdk_pixbuf libsigcxx ];
meta = {
description = "C++ interface to the GLib library";
homepage = http://gtkmm.org/;
license = "LGPLv2+";
maintainers = with stdenv.lib.maintainers; [urkud raskin];
platforms = stdenv.lib.platforms.linux;
};
}

View File

@@ -18,6 +18,7 @@ cabal.mkDerivation (self: {
safe SHA syb tagsoup text time url utf8String xhtml xml xssSanitize
zlib
];
jailbreak = true;
meta = {
homepage = "http://gitit.net";
description = "Wiki using happstack, git or darcs, and pandoc";

View File

@@ -6,15 +6,14 @@
cabal.mkDerivation (self: {
pname = "happstack-server";
version = "7.1.5";
sha256 = "0w00y84arc8z92d1d3l6f7gh1hmkm4yrj70pnnrsaca3i603w11a";
version = "7.1.6";
sha256 = "0gifq625kclam6sgblwa8a1vhxmx8saanzlrikch0l9q0l95nfwd";
buildDepends = [
base64Bytestring blazeHtml extensibleExceptions filepath hslogger
html monadControl mtl network parsec sendfile syb systemFilepath
text threads time timeCompat transformers transformersBase
utf8String xhtml zlib
];
jailbreak = true;
meta = {
homepage = "http://happstack.com";
description = "Web related tools and services";

View File

@@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "hoogle";
version = "4.2.15";
sha256 = "0mhxdbbzq7hl5zxz3dhxyrs5q08y8hxwsm19ba0gx47qvg3znzki";
version = "4.2.16";
sha256 = "1hamwqhndrkajm4xvxxfhr2rnlmf3z2ysyfxx3y6d24jawjyqf8a";
isLibrary = true;
isExecutable = true;
buildDepends = [
@@ -14,7 +14,6 @@ cabal.mkDerivation (self: {
haskellSrcExts httpTypes parsec random safe tagsoup time
transformers uniplate wai warp
];
jailbreak = true;
meta = {
homepage = "http://www.haskell.org/hoogle/";
description = "Haskell API Search";

View File

@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "network";
version = "2.4.1.0";
sha256 = "0m44iqlcnpsaa3iqxb4wbx2l1k2ycxzq8v07bwz7br7yyikv16y3";
version = "2.4.1.2";
sha256 = "0f7ykdv7xbsr5m3h2ml0hw3nlbnq785m0gr624pwk2s289jwakdh";
buildDepends = [ parsec ];
meta = {
homepage = "https://github.com/haskell/network";

View File

@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "shakespeare-css";
version = "1.0.2.1";
sha256 = "1ik0128gwziv1dajz2g73rk1yac0ymd1w59q3g8c9g8ibwxn9hca";
version = "1.0.3";
sha256 = "0zk4nb4v9x04vkkgbzqanfpqgw9pqinf76l7d85fzclfgwacd0bz";
buildDepends = [ parsec shakespeare text transformers ];
meta = {
homepage = "http://www.yesodweb.com/book/shakespearean-templates";

View File

@@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "snap-server";
version = "0.9.3.1";
sha256 = "0wagx1zy52fi4fldbzpsvk5hpdrma9lwsip9zrrbszxf446amd53";
version = "0.9.3.3";
sha256 = "1n50xyhg4rva7ifv70825177606q87ip7f9p5kf94i9kci0kmlig";
buildDepends = [
attoparsec attoparsecEnumerator blazeBuilder blazeBuilderEnumerator
caseInsensitive enumerator MonadCatchIOTransformers mtl network

View File

@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "xmlhtml";
version = "0.2.0.4";
sha256 = "1z40hkq9l6nw3hcnz6d1x0han7ynjkvbvjy8bl5mq7zmhk1xhmr6";
version = "0.2.1";
sha256 = "1nqkjbhpzr7zxpjvlxy6pync6zyarvjblcxg8igq75dyzk7qhafg";
buildDepends = [
blazeBuilder blazeHtml blazeMarkup parsec text unorderedContainers
];

View File

@@ -1,13 +1,13 @@
{ stdenv, fetchurl }:
let version = "4.9.4"; in
let version = "4.9.5"; in
stdenv.mkDerivation {
name = "nspr-${version}";
src = fetchurl {
url = "http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${version}/src/nspr-${version}.tar.gz";
sha256 = "196l8123gg5knxp7pgksngfcwm9k7n3qilkl725jyzz1bg3ld43l";
sha1 = "03885e992607e2be975f6525c6764c2167fe2eff";
};
preConfigure = "cd mozilla/nsprpub";

View File

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "serd-${version}";
version = "0.14.0";
version = "0.18.2";
src = fetchurl {
url = "http://download.drobilla.net/${name}.tar.bz2";
sha256 = "023gsw0nwn2fh2vp7v2gwsmdwk6658zfl1ihdvr9xbayfcv88wlg";
sha256 = "1hgajhm4iar4n2kh71pv6yr0yhipj28kds9y5mbig8izqc188gcf";
};
buildInputs = [ pcre pkgconfig python ];

View File

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "sord-${version}";
version = "0.8.0";
version = "0.12.0";
src = fetchurl {
url = "http://download.drobilla.net/${name}.tar.bz2";
sha256 = "0ncaplfr3wal9h8h3lafw0bhx34w046r7md74djgrysrm2h77pwr";
sha256 = "1f0wz7ynnk72hyr4jfi0lgvj90ld2va1kig8fkw30s8b903alsqj";
};
buildInputs = [ pkgconfig python serd ];

View File

@@ -1,15 +1,19 @@
{ cabal, Cabal, cabalInstall, filepath, HTTP, mtl, network, tar
, transformers, zlib
{ cabal, fetchurl, Cabal, cabalInstall, filepath, HTTP, mtl, network, tar
, transformers, zlib, setenv
}:
cabal.mkDerivation (self: {
pname = "cabal-dev";
version = "0.9.1";
sha256 = "1brz0nw959jdyjrhjqy9sixsb316hjmw4pxxsybfl8vixsivdfh6";
version = "0.9.1-git";
src = fetchurl {
url = "https://github.com/creswick/cabal-dev/archive/54e7d93d5b309c56192c146c7a807ac3591bc464.tar.gz";
sha256 = "1isi02jik0vrg48l7r2mj4cf9ms6hpxxz1mmhl7s3kkxx775cxj9";
name = "${self.name}.tar.gz";
};
isLibrary = false;
isExecutable = true;
buildDepends = [
Cabal filepath HTTP mtl network tar transformers zlib
Cabal filepath HTTP mtl network tar transformers zlib setenv
];
buildTools = [ cabalInstall ];
meta = {

View File

@@ -0,0 +1,20 @@
{ cabal, Cabal, cmdargs, stylishHaskell, systemFileio
, systemFilepath, text, unorderedContainers, yaml
}:
cabal.mkDerivation (self: {
pname = "cabal2ghci";
version = "0.0.1.0";
sha256 = "0l5225gwm6j25694cp94d4z31i1p68pq6js3psbr7m204q409dr5";
isLibrary = false;
isExecutable = true;
buildDepends = [
Cabal cmdargs stylishHaskell systemFileio systemFilepath text
unorderedContainers yaml
];
meta = {
description = "A tool to generate .ghci file from .cabal";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

View File

@@ -1,14 +0,0 @@
{ cabal, filepath }:
cabal.mkDerivation (self: {
pname = "tar";
version = "0.3.2.0";
sha256 = "0yplrfai8bwihyn18whi0jiz1qzll9hgbc37xcy2jkr28480jba9";
buildDepends = [ filepath ];
meta = {
description = "Reading, writing and manipulating \".tar\" archive files.";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})