diff --git a/.gitignore b/.gitignore index b2d5a9aa5bd..165e92c7fc3 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,8 @@ ,* .*.swp .*.swo -cpan-info -cpan_tmp/ result +doc/NEWS.html +doc/NEWS.txt +doc/manual.html +doc/manual.pdf diff --git a/doc/language-support.xml b/doc/language-support.xml index 6cc028c0b0a..cb40be4bf57 100644 --- a/doc/language-support.xml +++ b/doc/language-support.xml @@ -21,7 +21,7 @@ standard Makefile.PL. It’s implemented in pkgs/development/perl-modules/generic. Perl packages from CPAN are defined in pkgs/perl-packages.nix, +xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/perl-packages.nix">pkgs/top-level/perl-packages.nix, rather than pkgs/all-packages.nix. Most Perl packages are so straight-forward to build that they are defined here directly, rather than having a separate function for each package @@ -151,6 +151,43 @@ ClassC3Componentised = buildPerlPackage rec { +
Generation from CPAN + +Nix expressions for Perl packages can be generated (almost) +automatically from CPAN. This is done by the program +nix-generate-from-cpan, which can be installed +as follows: + + +$ nix-env -i nix-generate-from-cpan + + +This program takes a Perl module name, looks it up on CPAN, +fetches and unpacks the corresponding package, and prints a Nix +expression on standard output. For example: + + +$ nix-generate-from-cpan XML::Simple + XMLSimple = buildPerlPackage { + name = "XML-Simple-2.20"; + src = fetchurl { + url = mirror://cpan/authors/id/G/GR/GRANTM/XML-Simple-2.20.tar.gz; + sha256 = "5cff13d0802792da1eb45895ce1be461903d98ec97c9c953bc8406af7294434a"; + }; + propagatedBuildInputs = [ XMLNamespaceSupport XMLSAX XMLSAXExpat ]; + meta = { + description = "Easily read/write XML (esp config files)"; + license = "perl"; + }; + }; + + +The output can be pasted into +pkgs/top-level/perl-packages.nix or wherever else +you need it. + +
+ diff --git a/maintainers/scripts/generate-cpan-package b/maintainers/scripts/generate-cpan-package deleted file mode 100755 index 2817e23e2fa..00000000000 --- a/maintainers/scripts/generate-cpan-package +++ /dev/null @@ -1,120 +0,0 @@ -#! /bin/sh -e - -name="$1" -[ -n "$name" ] || { echo "no name"; exit 1; } - -cpan -D "$name" > cpan-info - -url="$(echo $(cat cpan-info | sed '6!d'))" -[ -n "$url" ] || { echo "no URL"; exit 1; } -url="mirror://cpan/authors/id/$url" -echo "URL = $url" >&2 - -version=$(cat cpan-info | grep 'CPAN: ' | awk '{ print $2 }') -echo "VERSION = $version" - -declare -a xs=($(PRINT_PATH=1 nix-prefetch-url "$url")) -hash=${xs[0]} -path=${xs[1]} -echo "HASH = $hash" >&2 - -namedash="$(echo $name | sed s/::/-/g)-$version" - -attr=$(echo $name | sed s/:://g) - -rm -rf cpan_tmp -mkdir cpan_tmp -tar xf "$path" -C cpan_tmp - -shopt -s nullglob -meta=$(echo cpan_tmp/*/META.json) -if [ -z "$meta" ]; then - yaml=$(echo cpan_tmp/*/META.yml) - [ -n "$yaml" ] || { echo "no meta file"; exit 1; } - meta=$(echo $yaml | sed s/\.yml$/.json/) - perl -e ' - use YAML; - use JSON; - local $/; - $x = YAML::Load(<>); - print encode_json $x; - ' < $yaml > $meta -fi - -description="$(json abstract < $meta | perl -e '$x = <>; print uc(substr($x, 0, 1)), substr($x, 1);')" -homepage="$(json resources.homepage < $meta)" -if [ -z "$homepage" ]; then - #homepage="$(json meta-spec.url < $meta)" - true -fi - -license="$(json license < $meta | json -a 2> /dev/null || true)" -if [ -z "$license" ]; then - license="$(json -a license < $meta)" -fi -license="$(echo $license | sed s/perl_5/perl5/)" - -f() { - local type="$1" - perl -e ' - use JSON; - local $/; - $x = decode_json <>; - if (defined $x->{prereqs}) { - $x2 = $x->{prereqs}->{'$type'}->{requires}; - } elsif ("'$type'" eq "runtime") { - $x2 = $x->{requires}; - } elsif ("'$type'" eq "configure") { - $x2 = $x->{configure_requires}; - } elsif ("'$type'" eq "build") { - $x2 = $x->{build_requires}; - } - foreach my $y (keys %{$x2}) { - next if $y eq "perl"; - eval "use $y;"; - if (!$@) { - print STDERR "skipping Perl-builtin module $y\n"; - next; - } - print $y, "\n"; - }; - ' < $meta | sed s/:://g -} - -confdeps=$(f configure) -builddeps=$(f build) -testdeps=$(f test) -runtimedeps=$(f runtime) - -buildInputs=$(echo $(for i in $confdeps $builddeps $testdeps; do echo $i; done | sort | uniq)) -propagatedBuildInputs=$(echo $(for i in $runtimedeps; do echo $i; done | sort | uniq)) - -echo "===" >&2 - -cat <\n" unless defined $module_name; + +my $cb = CPANPLUS::Backend->new; + +my @modules = $cb->search(type => "name", allow => [$module_name]); +die "module $module_name not found\n" if scalar @modules == 0; +die "multiple packages that match module $module_name\n" if scalar @modules > 1; +my $module = $modules[0]; + +sub pkg_to_attr { + my ($pkg_name) = @_; + my $attr_name = $pkg_name; + $attr_name =~ s/-\d.*//; # strip version + return "LWP" if $attr_name eq "libwww-perl"; + $attr_name =~ s/-//g; + return $attr_name; +} + +sub get_pkg_name { + my ($module) = @_; + my $pkg_name = $module->package; + $pkg_name =~ s/\.tar.*//; + $pkg_name =~ s/\.zip//; + return $pkg_name; +} + +my $pkg_name = get_pkg_name $module; +my $attr_name = pkg_to_attr $pkg_name; + +print STDERR "attribute name: ", $attr_name, "\n"; +print STDERR "module: ", $module->module, "\n"; +print STDERR "version: ", $module->version, "\n"; +print STDERR "package: ", $module->package, , " (", $pkg_name, ", ", $attr_name, ")\n"; +print STDERR "path: ", $module->path, "\n"; + +my $tar_path = $module->fetch(); +print STDERR "downloaded to: $tar_path\n"; +print STDERR "sha-256: ", $module->status->checksum_value, "\n"; + +my $pkg_path = $module->extract(); +print STDERR "unpacked to: $pkg_path\n"; + +my $meta; +if (-e "$pkg_path/META.yml") { + eval { + $meta = YAML::XS::LoadFile("$pkg_path/META.yml"); + }; + if ($@) { + system("iconv -f windows-1252 -t utf-8 '$pkg_path/META.yml' > '$pkg_path/META.yml.tmp'"); + $meta = YAML::XS::LoadFile("$pkg_path/META.yml.tmp"); + } +} + +print STDERR "metadata: ", encode_json($meta), "\n"; + +# Map a module to the attribute corresponding to its package +# (e.g. HTML::HeadParser will be mapped to HTMLParser, because that +# module is in the HTML-Parser package). +sub module_to_pkg { + my ($module_name) = @_; + my @modules = $cb->search(type => "name", allow => [$module_name]); + if (scalar @modules == 0) { + # Fallback. + $module_name =~ s/:://g; + return $module_name; + } + my $module = $modules[0]; + my $attr_name = pkg_to_attr(get_pkg_name $module); + print STDERR "mapped dep $module_name to $attr_name\n"; + return $attr_name; +} + +sub get_deps { + my ($type) = @_; + my $deps; + if (defined $meta->{prereqs}) { + die "unimplemented"; + } elsif ($type eq "runtime") { + $deps = $meta->{requires}; + } elsif ($type eq "configure") { + $deps = $meta->{configure_requires}; + } elsif ($type eq "build") { + $deps = $meta->{build_requires}; + } + my @res; + foreach my $n (keys %{$deps}) { + next if $n eq "perl"; + # Hacky way to figure out if this module is part of Perl. + if ($n !~ /^JSON/ && $n !~ /^YAML/) { + eval "use $n;"; + if (!$@) { + print STDERR "skipping Perl-builtin module $n\n"; + next; + } + } + push @res, module_to_pkg($n); + } + return @res; +} + +sub uniq { + return keys %{{ map { $_ => 1 } @_ }}; +} + +my @build_deps = sort(uniq(get_deps("configure"), get_deps("build"), get_deps("test"))); +print STDERR "build deps: @build_deps\n"; + +my @runtime_deps = sort(uniq(get_deps("runtime"))); +print STDERR "runtime deps: @runtime_deps\n"; + +my $homepage = $meta->{resources}->{homepage}; +print STDERR "homepage: $homepage\n" if defined $homepage; + +my $description = $meta->{abstract}; +$description = uc(substr($description, 0, 1)) . substr($description, 1); # capitalise first letter +$description =~ s/\.$//; # remove period at the end +$description =~ s/\s*$//; +$description =~ s/^\s*//; +print STDERR "description: $description\n"; + +my $license = $meta->{license}; +if (defined $license) { + $license = "perl5" if $license eq "perl_5"; + print STDERR "license: $license\n"; +} + +my $build_fun = -e "$pkg_path/Build.PL" && ! -e "$pkg_path/Makefile.PL" ? "buildPerlModule" : "buildPerlPackage"; + +print STDERR "===\n"; + +print <path}/${\$module->package}; + sha256 = "${\$module->status->checksum_value}"; + }; +EOF +print < 0; + buildInputs = [ @build_deps ]; +EOF +print < 0; + propagatedBuildInputs = [ @runtime_deps ]; +EOF +print < $out/share/tessdata/${lang}.traineddata"; + "tar xfvz ${src} -C $out/share/ --strip=1"; extraLanguages = '' - ${f "cat" "1qndk8qygw9bq7nzn7kzgxkm3jhlq7jgvdqpj5id4rrcaavjvifw"} - ${f "rus" "0yjzks189bgcmi2vr4v0l0fla11qdrw3cb1nvpxl9mdis8qr9vcc"} - ${f "spa" "1q1hw3qi95q5ww3l02fbhjqacxm34cp65fkbx10wjdcg0s5p9q2x"} - ${f "nld" "0cbqfhl2rwb1mg4y1140nw2vhhcilc0nk7bfbnxw6bzj1y5n49i8"} + ${f "cat" "0d1smiv1b3k9ay2s05sl7q08mb3ln4w5iiiymv2cs8g8333z8jl9"} + ${f "rus" "059336mkhsj9m3hwfb818xjlxkcdpy7wfgr62qwz65cx914xl709"} + ${f "spa" "1c9iza5mbahd9pa7znnq8yv09v5kz3gbd2sarcgcgc1ps1jc437l"} + ${f "nld" "162acxp1yb6gyki2is3ay2msalmfcsnrlsd9wml2ja05k94m6bjy"} + ${f "eng" "1y5xf794n832s3lymzlsdm2s9nlrd2v27jjjp0fd9xp7c2ah4461"} + ${f "slv" "0rqng43435cly32idxm1lvxkcippvc3xpxbfizwq5j0155ym00dr"} ''; in -stdenv.mkDerivation { - name = "tesseract-3.0.1"; +stdenv.mkDerivation rec { + name = "tesseract-${version}"; src = fetchurl { - url = http://tesseract-ocr.googlecode.com/files/tesseract-3.01.tar.gz; - sha256 = "c24b0bd278291bc93ab242f93841c1d8743689c943bd804afbc5b898dc0a1c9b"; + url = "http://tesseract-ocr.googlecode.com/files/tesseract-ocr-${version}.tar.gz"; + sha256 = "0g81m9y4iydp7kgr56mlkvjdwpp3mb01q385yhdnyvra7z5kkk96"; }; buildInputs = [ autoconf automake libtool leptonica libpng libtiff ]; diff --git a/pkgs/applications/misc/cgminer/default.nix b/pkgs/applications/misc/cgminer/default.nix new file mode 100644 index 00000000000..4ae404a002f --- /dev/null +++ b/pkgs/applications/misc/cgminer/default.nix @@ -0,0 +1,44 @@ +{ fetchgit, stdenv, pkgconfig, libtool, autoconf, automake, + curl, ncurses, amdappsdk, amdadlsdk, xorg }: + +stdenv.mkDerivation rec { + version = "2.11.4"; + name = "cgminer-${version}"; + + src = fetchgit { + url = "https://github.com/ckolivas/cgminer.git"; + rev = "96c8ff5f10f2d8f0cf4d1bd889e8eeac2e4aa715"; + sha256 = "1vf9agy4vw50cap03qig2y65hdrsdy7cknkzyagv89w5xb230r9a"; + }; + + buildInputs = [ autoconf automake pkgconfig libtool curl ncurses amdappsdk amdadlsdk xorg.libX11 xorg.libXext xorg.libXinerama ]; + configureScript = "./autogen.sh"; + configureFlags = "--enable-scrypt"; + NIX_LDFLAGS = "-lgcc_s -lX11 -lXext -lXinerama"; + + preConfigure = '' + ln -s ${amdadlsdk}/include/* ADL_SDK/ + ''; + + postBuild = '' + gcc api-example.c -I compat/jansson -o cgminer-api + ''; + + postInstall = '' + cp cgminer-api $out/bin/ + chmod 444 $out/bin/*.cl + ''; + + meta = with stdenv.lib; { + description = "CPU/GPU miner in c for bitcoin"; + longDescription= '' + This is a multi-threaded multi-pool GPU, FPGA and ASIC miner with ATI GPU + monitoring, (over)clocking and fanspeed support for bitcoin and derivative + coins. Do not use on multiple block chains at the same time! + ''; + homepage = "https://github.com/ckolivas/cgminer"; + license = licenses.gpl3; + maintainers = [ maintainers.offline ]; + platforms = [ "i686-linux" "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/misc/keepass/default.nix b/pkgs/applications/misc/keepass/default.nix new file mode 100644 index 00000000000..0098e626b42 --- /dev/null +++ b/pkgs/applications/misc/keepass/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchurl, unzip, makeDesktopItem, mono }: + +stdenv.mkDerivation rec { + name = "keepass-${version}"; + version = "2.22"; + + src = fetchurl { + url = "mirror://sourceforge/keepass/KeePass-${version}.zip"; + sha256 = "0mman7r1jmirfwzix5qww0yn4rrgzcg7546basxjvvfc8flp43j0"; + }; + + sourceRoot = "."; + + phases = [ "unpackPhase" "installPhase" ]; + + desktopItem = makeDesktopItem { + name = "keepass"; + exec = "keepass"; + comment = "Password manager"; + desktopName = "Keepass"; + genericName = "Password manager"; + categories = "Application;Other;"; + }; + + + installPhase = '' + ensureDir "$out/bin" + echo "${mono}/bin/mono $out/KeePass.exe" > $out/bin/keepass + chmod +x $out/bin/keepass + echo $out + cp -r ./* $out/ + ensureDir "$out/share/applications" + cp ${desktopItem}/share/applications/* $out/share/applications + ''; + + buildInputs = [ unzip ]; + + meta = { + description = "GUI password manager with strong cryptography"; + homepage = http://www.keepass.info/; + maintainers = with stdenv.lib.maintainers; [amorsillo]; + platforms = with stdenv.lib.platforms; all; + license = stdenv.lib.licenses.gpl2; + }; +} diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix index 54d9f44f7fb..780c3b62a30 100644 --- a/pkgs/applications/networking/browsers/chromium/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/sources.nix @@ -1,14 +1,14 @@ # This file is autogenerated from update.sh in the same directory. { dev = { - version = "29.0.1516.3"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-29.0.1516.3.tar.xz"; - sha256 = "0pdn9c6v0v55d7g4amivxrv132bpj9sfqywk5b8l6kqfjq28mw5k"; + version = "29.0.1521.3"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-29.0.1521.3.tar.xz"; + sha256 = "0szc3g24jlhcp8cgijdv0q9rfn3mhp2kjyc85ml4snskkpasfrv3"; }; beta = { - version = "28.0.1500.36"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-28.0.1500.36.tar.xz"; - sha256 = "1bz9w46ps8gj056hfwbcj4myyxyr7y759nagz9idraia8116m3pp"; + version = "28.0.1500.45"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-28.0.1500.45.tar.xz"; + sha256 = "01sxqv6i7m5h0jsypg801w2ivbrir37wdi4ijd5yvprkyzbd90zi"; }; stable = { version = "27.0.1453.110"; diff --git a/pkgs/applications/networking/browsers/chromium/update.sh b/pkgs/applications/networking/browsers/chromium/update.sh index 0c21213a751..0c4881bb396 100755 --- a/pkgs/applications/networking/browsers/chromium/update.sh +++ b/pkgs/applications/networking/browsers/chromium/update.sh @@ -1,6 +1,7 @@ #!/bin/sh channels_url="http://omahaproxy.appspot.com/all?csv=1"; +history_url="http://omahaproxy.appspot.com/history"; bucket_url="http://commondatastorage.googleapis.com/chromium-browser-official/"; output_file="$(cd "$(dirname "$0")" && pwd)/sources.nix"; @@ -41,6 +42,17 @@ sha_insert() ver_sha_table="$ver_sha_table $version:$sha256"; } +get_newest_ver() +{ + versions="$(for v in $@; do echo "$v"; done)"; + if oldest="$(echo "$versions" | sort -V 2> /dev/null | tail -n1)"; + then + echo "$oldest"; + else + echo "$versions" | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n | tail -n1; + fi; +} + if [ -e "$output_file" ]; then get_sha256() @@ -53,38 +65,55 @@ then echo -n "Checking if $oldver ($channel) is up to date..." >&2; - if [ "x$version" != "x$oldver" ]; + if [ "x$(get_newest_ver "$version" "$oldver")" != "x$oldver" ]; then echo " no, getting sha256 for new version $version:" >&2; - sha256="$(nix-prefetch-url "$url")"; + sha256="$(nix-prefetch-url "$url")" || return 1; else echo " yes, keeping old sha256." >&2; - sha256="$(nix_getattr "$output_file" "$channel.sha256")"; + sha256="$(nix_getattr "$output_file" "$channel.sha256")" \ + || return 1; fi; sha_insert "$version" "$sha256"; echo "$sha256"; + return 0; } else get_sha256() { - nix-prefetch-url "$url"; + nix-prefetch-url "$3"; } fi; +fetch_filtered_history() +{ + curl -s "$history_url" | sed -nr 's/^'"linux,$1"',([^,]+).*$/\1/p'; +} + +get_prev_sha256() +{ + channel="$1"; + current_version="$2"; + + for version in $(fetch_filtered_history "$channel"); + do + [ "x$version" = "x$current_version" ] && continue; + url="${bucket_url%/}/chromium-$version.tar.xz"; + sha256="$(get_sha256 "$channel" "$version" "$url")" || continue; + echo "$sha256:$version:$url"; + return 0; + done; +} + get_channel_exprs() { - for chline in $(echo "$1" | cut -d, -f-2); + for chline in $1; do channel="${chline%%,*}"; version="${chline##*,}"; - # XXX: Remove case after version 26 is stable: - if [ "${version%%.*}" -ge 26 ]; then - url="${bucket_url%/}/chromium-$version.tar.xz"; - else - url="${bucket_url%/}/chromium-$version.tar.bz2"; - fi; + url="${bucket_url%/}/chromium-$version.tar.xz"; echo -n "Checking if sha256 of version $version is cached..." >&2; if sha256="$(sha_lookup "$version")"; @@ -93,6 +122,17 @@ get_channel_exprs() else echo " no." >&2; sha256="$(get_sha256 "$channel" "$version" "$url")"; + if [ $? -ne 0 ]; + then + echo "Whoops, failed to fetch $version, trying previous" \ + "versions:" >&2; + + sha_ver_url="$(get_prev_sha256 "$channel" "$version")"; + sha256="${sha_ver_url%%:*}"; + ver_url="${sha_ver_url#*:}"; + version="${ver_url%%:*}"; + url="${ver_url#*:}"; + fi; fi; sha_insert "$version" "$sha256"; @@ -108,7 +148,7 @@ get_channel_exprs() cd "$(dirname "$0")"; omaha="$(curl -s "$channels_url")"; -versions="$(echo "$omaha" | sed -n -e 's/^linux,\(\([^,]\+,\)\{2\}\).*$/\1/p')"; +versions="$(echo "$omaha" | sed -nr -e 's/^linux,([^,]+,[^,]+).*$/\1/p')"; channel_exprs="$(get_channel_exprs "$versions")"; cat > "$output_file" <<-EOF diff --git a/pkgs/applications/networking/irc/irssi/otr/default.nix b/pkgs/applications/networking/irc/irssi/otr/default.nix index ba3a56e642e..00a9aa1fc68 100644 --- a/pkgs/applications/networking/irc/irssi/otr/default.nix +++ b/pkgs/applications/networking/irc/irssi/otr/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl, libotr, automake, autoconf, libtool, glib, pkgconfig, irssi }: let - rev = "59ddcbe66a"; + rev = "cab3fc915c"; in with stdenv.lib; stdenv.mkDerivation rec { - name = "irssi-otr-20130315-${rev}"; + name = "irssi-otr-20130601-${rev}"; src = fetchurl { url = "https://github.com/cryptodotis/irssi-otr/tarball/${rev}"; name = "${name}.tar.gz"; - sha256 = "095dak0d10j6cpkwlqmk967p1wypwzvqr4wdqvb30w14dbn8dy0d"; + sha256 = "0kn9c562zfh36gpcrbpslwjjr78baagdwphczz2d608ndczm1vrk"; }; patchPhase = '' diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index e583551bcf1..a523089e0ed 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -3,12 +3,12 @@ , pythonPackages, cacert, cmake, makeWrapper }: stdenv.mkDerivation rec { - version = "0.4.0"; + version = "0.4.1"; name = "weechat-${version}"; src = fetchurl { url = "http://weechat.org/files/src/${name}.tar.gz"; - sha256 = "17jxknam1bbakmdfqy1b2cfc8l9ag90l3z1gcxdvwg358wasv9dc"; + sha256 = "0gsn0mp921j7jpvrxc74h0gs0bn0w808j2zqghm1w7xbjw9hl49w"; }; buildInputs = diff --git a/pkgs/applications/networking/mailreaders/sup/default.nix b/pkgs/applications/networking/mailreaders/sup/default.nix new file mode 100644 index 00000000000..d71b0ed1e95 --- /dev/null +++ b/pkgs/applications/networking/mailreaders/sup/default.nix @@ -0,0 +1,63 @@ +{ stdenv, fetchurl, ruby, rake, rubygems, makeWrapper, ncursesw_sup +, xapian_full_alaveteli, gpgme, libiconvOrEmpty, rmail, mime_types, chronic +, trollop, lockfile, gettext, iconv, locale, text }: + +stdenv.mkDerivation { + name = "sup-d21f027afcd6a4031de9619acd8dacbd2f2f4fd4"; + + meta = { + homepage = http://supmua.org; + description = "A curses threads-with-tags style email client"; + maintainers = with stdenv.lib.maintainers; [ lovek323 ]; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.unix; + }; + + dontStrip = true; + + src = fetchurl { + url = "https://github.com/sup-heliotrope/sup/archive/d21f027afcd6a4031de9619acd8dacbd2f2f4fd4.tar.gz"; + sha256 = "0syifva6pqrg3nyy7xx7nan9zswb4ls6bkk96vi9ki2ly1ymwcdp"; + }; + + buildInputs = + [ ruby rake rubygems makeWrapper gpgme ncursesw_sup xapian_full_alaveteli + libiconvOrEmpty ]; + + buildPhase = "rake gem"; + + # TODO: Move gem dependencies out + + installPhase = '' + export HOME=$TMP/home; mkdir -pv "$HOME" + + GEM_PATH="$GEM_PATH:$out/${ruby.gemPath}" + GEM_PATH="$GEM_PATH:${chronic}/${ruby.gemPath}" + GEM_PATH="$GEM_PATH:${gettext}/${ruby.gemPath}" + GEM_PATH="$GEM_PATH:${gpgme}/${ruby.gemPath}" + GEM_PATH="$GEM_PATH:${iconv}/${ruby.gemPath}" + GEM_PATH="$GEM_PATH:${locale}/${ruby.gemPath}" + GEM_PATH="$GEM_PATH:${lockfile}/${ruby.gemPath}" + GEM_PATH="$GEM_PATH:${mime_types}/${ruby.gemPath}" + GEM_PATH="$GEM_PATH:${ncursesw_sup}/${ruby.gemPath}" + GEM_PATH="$GEM_PATH:${rmail}/${ruby.gemPath}" + GEM_PATH="$GEM_PATH:${text}/${ruby.gemPath}" + GEM_PATH="$GEM_PATH:${trollop}/${ruby.gemPath}" + GEM_PATH="$GEM_PATH:${xapian_full_alaveteli}/${ruby.gemPath}" + + # Don't install some dependencies -- we have already installed + # the dependencies but gem doesn't acknowledge this + gem install --no-verbose --install-dir "$out/${ruby.gemPath}" \ + --bindir "$out/bin" --no-rdoc --no-ri pkg/sup-999.gem \ + --ignore-dependencies + + for prog in $out/bin/*; do + wrapProgram "$prog" --prefix GEM_PATH : "$GEM_PATH" + done + + for prog in $out/gems/*/bin/*; do + [[ -e "$out/bin/$(basename $prog)" ]] + done + ''; +} + diff --git a/pkgs/applications/networking/p2p/gnunet/svn.nix b/pkgs/applications/networking/p2p/gnunet/svn.nix index 4bff8239adf..eb05461ec85 100644 --- a/pkgs/applications/networking/p2p/gnunet/svn.nix +++ b/pkgs/applications/networking/p2p/gnunet/svn.nix @@ -4,15 +4,15 @@ , makeWrapper, autoconf, automake }: let - rev = "27317"; + rev = "27399"; in stdenv.mkDerivation rec { name = "gnunet-svn-${rev}"; src = fetchsvn { url = https://gnunet.org/svn/gnunet; - rev = "27317"; - sha256 = "1l7jypm57wjhzlwdj8xzhfppjdpy6wbph4nqgwxxb9q056wwf9zy"; + inherit rev; + sha256 = "0fn7ppfnc4v6lkxwww11s0h8mdvwyv7f40f6wrbfilqpn2ncrf8c"; }; buildInputs = [ diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index 26879a6f660..16f8fe0a1bd 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -9,11 +9,11 @@ */ stdenv.mkDerivation rec { - name = "gnucash-2.4.11"; + name = "gnucash-2.4.13"; src = fetchurl { url = "mirror://sourceforge/gnucash/${name}.tar.bz2"; - sha256 = "0qbpgd6spclkmwryi66cih0igi5a6pmsnk41mmnscpfpz1mddhwk"; + sha256 = "0j4m00a3r1hcrhkfjkx3sgi2r4id4wrc639i4s00j35rx80540pn"; }; buildInputs = [ diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 9596c30ee6a..85c69413bfb 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -3,7 +3,7 @@ {stdenv, fetchurl, pkgconfig, ocaml, findlib, camlp5, ncurses, lablgtk ? null}: let - version = "8.4"; + version = "8.4pl2"; buildIde = lablgtk != null; ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else ""; idePath = if buildIde then '' @@ -15,8 +15,8 @@ stdenv.mkDerivation { name = "coq-${version}"; src = fetchurl { - url = "http://pauillac.inria.fr/~herbelin/coq/distrib/V${version}/files/coq-${version}.tar.gz"; - sha256 = "0ka2lak9il4hlblk461awf0hbi3mxqhc1wz6kllxradyy2vfaspl"; + url = "http://coq.inria.fr/distrib/V${version}/files/coq-${version}.tar.gz"; + sha256 = "1n52pky7bb45irk2jw6f4rd3kvy8lm2yfldjwdhiic0kyqw9lwgv"; }; buildInputs = [ pkgconfig ocaml findlib camlp5 ncurses lablgtk ]; diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 9743b73345c..42503b97440 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -21,13 +21,13 @@ assert compressionSupport -> neon.compressionSupport; stdenv.mkDerivation rec { - version = "1.7.9"; + version = "1.7.10"; name = "subversion-${version}"; src = fetchurl { url = "mirror://apache/subversion//${name}.tar.bz2"; - sha1 = "453757bae78a800997559f2232483ab99238ec1e"; + sha1 = "a4f3de0a13b034b0eab4d35512c6c91a4abcf4f5"; }; buildInputs = [ zlib apr aprutil sqlite ] diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 3c96cd13418..7b74cfcdb11 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -10,13 +10,18 @@ stdenv.mkDerivation rec { name = "vlc-${version}"; - version = "2.0.6"; + version = "2.0.7"; src = fetchurl { url = "http://download.videolan.org/pub/videolan/vlc/${version}/${name}.tar.xz"; - sha256 = "0qqrpry41vawihhggcx00vibbn73hxdal1gim1qnrqrcbq1rik1i"; + sha256 = "052kfkpd0r2fwkyz97qhz2a368xqxa905qacrd1bkl2bkvahfc94"; }; + postPatch = /* flac 1.3.0 fix */ '' + sed -i -e 's:stream_decoder.h:FLAC/stream_decoder.h:' modules/codec/flac.c + sed -i -e 's:stream_encoder.h:FLAC/stream_encoder.h:' modules/codec/flac.c + ''; + buildInputs = [ xz bzip2 perl zlib a52dec libmad faad2 ffmpeg alsaLib libdvdnav libdvdnav.libdvdread libbluray dbus fribidi qt4 libvorbis libtheora speex lua5 libgcrypt diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix index 7fa12d495aa..3e45fc6d5e3 100644 --- a/pkgs/development/compilers/julia/default.nix +++ b/pkgs/development/compilers/julia/default.nix @@ -1,21 +1,21 @@ { stdenv, fetchgit, gfortran, perl, m4, llvm, gmp, pcre, zlib , readline, fftwSinglePrec, fftw, libunwind, suitesparse, glpk, fetchurl , ncurses, libunistring, lighttpd, patchelf, openblas, liblapack - , tcl, tk, xproto, libX11, git + , tcl, tk, xproto, libX11, git, mpfr } : let realGcc = stdenv.gcc.gcc; in stdenv.mkDerivation rec { pname = "julia"; - date = "20130205"; + date = "20130611"; name = "${pname}-git-${date}"; grisu_ver = "1.1.1"; dsfmt_ver = "2.2"; openblas_ver = "v0.2.2"; lapack_ver = "3.4.1"; - arpack_ver = "3.1.2"; + arpack_ver = "3.1.3"; clp_ver = "1.14.5"; lighttpd_ver = "1.4.29"; patchelf_ver = "0.6"; @@ -36,9 +36,9 @@ stdenv.mkDerivation rec { sha256 = "19ffec70f9678f5c159feadc036ca47720681b782910fbaa95aa3867e7e86d8e"; }; arpack_src = fetchurl { - url = "http://forge.scilab.org/index.php/p/arpack-ng/downloads/497/get/"; - name = "arpack-ng_${arpack_ver}.tar.gz"; - sha256 = "1wk06bdjgap4hshx0lswzi7vxy2lrdx353y1k7yvm97mpsjvsf4k"; + url = "http://forge.scilab.org/index.php/p/arpack-ng/downloads/607/get/"; + name = "arpack-ng-${arpack_ver}.tar.gz"; + sha256 = "039w7j3dr1xy35a3hp92zg2g92gmjq6xsv0g4awlb4cffy09nr2d"; }; lapack_src = fetchurl { url = "http://www.netlib.org/lapack/lapack-${lapack_ver}.tgz"; @@ -65,17 +65,17 @@ stdenv.mkDerivation rec { src = fetchgit { url = "git://github.com/JuliaLang/julia.git"; - rev = "efc696bf74eec7605b4da19f6f1605ba99959ed3"; - sha256 = "19if7aj3mrp84dg9g2d3zbhasrq0nz28djl9a01m0y4y9bfymp7s"; + rev = "60cc4e44bf415dcda90f2bbe22300f842fe44098"; + sha256 = "018s0zyvdkxjldbvcdv40q3v2gcjznyyql5pv3zhhy1iq11jddfz"; }; buildInputs = [ gfortran perl m4 gmp pcre llvm readline zlib fftw fftwSinglePrec libunwind suitesparse glpk ncurses libunistring patchelf - openblas liblapack tcl tk xproto libX11 git + openblas liblapack tcl tk xproto libX11 git mpfr ]; configurePhase = '' - for i in GMP LLVM PCRE LAPACK OPENBLAS BLAS READLINE FFTW LIBUNWIND SUITESPARSE GLPK LIGHTTPD ZLIB; + for i in GMP LLVM PCRE LAPACK OPENBLAS BLAS READLINE FFTW LIBUNWIND SUITESPARSE GLPK LIGHTTPD ZLIB MPFR; do makeFlags="$makeFlags USE_SYSTEM_$i=1 " done @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { copy_kill_hash "${dsfmt_src}" deps/random ${if realGcc ==null then "" else - ''export NIX_LDFLAGS="$NIX_LDFLAGS -L${realGcc}/lib -L${realGcc}/lib64 -lpcre -llapack -lm -lfftw3f -lfftw3 -lglpk -lunistring -lz "''} + ''export NIX_LDFLAGS="$NIX_LDFLAGS -L${realGcc}/lib -L${realGcc}/lib64 -lpcre -llapack -lm -lfftw3f -lfftw3 -lglpk -lunistring -lz -lgmp -lmpfr"''} export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -fPIC " export LDFLAGS="-L${suitesparse}/lib -L$out/lib/julia -Wl,-rpath,$out/lib/julia" @@ -110,6 +110,21 @@ stdenv.mkDerivation rec { preBuild = '' mkdir -p usr/lib + + echo "$out" + mkdir -p "$out/lib" + ( + cd "$(mktemp -d)" + for i in "${suitesparse}"/lib/lib*.a; do + ar -x $i + done + gcc *.o --shared -o "$out/lib/libsuitesparse.so" + ) + cp "$out/lib/libsuitesparse.so" usr/lib + for i in umfpack cholmod amd camd colamd spqr; do + ln -s libsuitesparse.so "$out"/lib/lib$i.so; + ln -s libsuitesparse.so "usr"/lib/lib$i.so; + done ''; preInstall = '' diff --git a/pkgs/development/compilers/mono/default.nix b/pkgs/development/compilers/mono/default.nix index 47b13700b8a..88bef618f74 100644 --- a/pkgs/development/compilers/mono/default.nix +++ b/pkgs/development/compilers/mono/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl, libgdiplus}: +{stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl, libgdiplus, libX11}: stdenv.mkDerivation rec { name = "mono-2.11.4"; @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { sha256 = "0wv8pnj02mq012sihx2scx0avyw51b5wb976wn7x86zda0vfcsnr"; }; - buildInputs = [bison pkgconfig glib gettext perl libgdiplus]; + buildInputs = [bison pkgconfig glib gettext perl libgdiplus libX11]; propagatedBuildInputs = [glib]; NIX_LDFLAGS = "-lgcc_s" ; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { # In fact I think this line does not help at all to what I # wanted to achieve: have mono to find libgdiplus automatically - configureFlags = "--with-libgdiplus=${libgdiplus}/lib/libgdiplus.so"; + configureFlags = "--x-includes=${libX11}/include --x-libraries=${libX11}/lib --with-libgdiplus=${libgdiplus}/lib/libgdiplus.so"; # Attempt to fix this error when running "mcs --version": # The file /nix/store/xxx-mono-2.4.2.1/lib/mscorlib.dll is an invalid CIL image @@ -31,6 +31,17 @@ stdenv.mkDerivation rec { patchShebangs ./ "; + #Fix mono DLLMap so it can find libX11 and gdiplus to run winforms apps + #Other items in the DLLMap may need to be pointed to their store locations, I don't think this is exhaustive + #http://www.mono-project.com/Config_DllMap + postBuild = '' + find . -name 'config' -type f | while read i; do + sed -i "s@libMonoPosixHelper.so@$out/lib/libMonoPosixHelper.so@g" $i + sed -i "s@libX11.so.6@${libX11}/lib/libX11.so.6@g" $i + sed -i '2 i\' $i + done + ''; + meta = { homepage = http://mono-project.com/; description = "Cross platform, open source .NET development framework"; diff --git a/pkgs/development/interpreters/php/5.3.nix b/pkgs/development/interpreters/php/5.3.nix index 35508230ebd..6a65cce0768 100644 --- a/pkgs/development/interpreters/php/5.3.nix +++ b/pkgs/development/interpreters/php/5.3.nix @@ -89,7 +89,12 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) }; gd = { - configureFlags = ["--with-gd=${gd} --with-freetype-dir=${freetype}"]; + configureFlags = [ + "--with-gd" + "--with-freetype-dir=${freetype}" + "--with-png-dir=${libpng}" + "--with-jpeg-dir=${libjpeg}" + ]; buildInputs = [gd libpng libjpeg freetype]; }; diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix index 3c200f9c5c1..35b1f82c246 100644 --- a/pkgs/development/interpreters/php/5.4.nix +++ b/pkgs/development/interpreters/php/5.4.nix @@ -90,7 +90,12 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) gd = { # FIXME: Our own gd package doesn't work, see https://bugs.php.net/bug.php?id=60108. - configureFlags = ["--with-gd --with-freetype-dir=${freetype} --with-png-dir=${libpng}"]; + configureFlags = [ + "--with-gd" + "--with-freetype-dir=${freetype}" + "--with-png-dir=${libpng}" + "--with-jpeg-dir=${libjpeg}" + ]; buildInputs = [ libpng libjpeg freetype ]; }; diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix index d4bb7fa4f2d..aa31bb34423 100644 --- a/pkgs/development/interpreters/ruby/generated.nix +++ b/pkgs/development/interpreters/ruby/generated.nix @@ -35,16 +35,20 @@ g: # Get dependencies from patched gems ffi = g.ffi_1_6_0; file_tail = g.file_tail_1_0_12; foreman = g.foreman_0_62_0; + gettext = g.gettext_2_3_9; highline = g.highline_1_6_16; hike = g.hike_1_2_1; hoe = g.hoe_3_1_0; i18n = g.i18n_0_6_4; + iconv = g.iconv_1_0_3; journey = g.journey_1_0_4; jruby_pageant = g.jruby_pageant_1_1_1; jsduck = g.jsduck_4_7_1; json = g.json_1_7_7; json_pure = g.json_pure_1_7_7; libv8 = g.libv8_3_3_10_4; + locale = g.locale_2_0_8; + lockfile = g.lockfile_2_1_0; macaddr = g.macaddr_1_6_1; mail = g.mail_2_5_3; mime_types = g.mime_types_1_21; @@ -74,6 +78,7 @@ g: # Get dependencies from patched gems right_aws = g.right_aws_3_0_5; right_http_connection = g.right_http_connection_1_3_0; rjb = g.rjb_1_4_6; + rmail = g.rmail_1_0_0; rspec = g.rspec_2_11_0; rspec_core = g.rspec_core_2_11_1; rspec_expectations = g.rspec_expectations_2_11_3; @@ -87,16 +92,19 @@ g: # Get dependencies from patched gems sprockets = g.sprockets_2_2_2; syslog_protocol = g.syslog_protocol_0_9_2; systemu = g.systemu_2_5_2; + text = g.text_1_2_1; therubyracer = g.therubyracer_0_10_2; thin = g.thin_1_5_1; thor = g.thor_0_18_0; tilt = g.tilt_1_3_6; tins = g.tins_0_7_2; treetop = g.treetop_1_4_12; + trollop = g.trollop_2_0; tzinfo = g.tzinfo_0_3_37; uuid = g.uuid_2_3_7; uuidtools = g.uuidtools_2_1_3; websocket = g.websocket_1_0_7; + xapian_full_alaveteli = g.xapian_full_alaveteli_1_2_9_5; xml_simple = g.xml_simple_1_1_1; yajl_ruby = g.yajl_ruby_1_1_0; }; @@ -570,6 +578,20 @@ using TCP/IP, especially if custom protocols are required.''; requiredGems = [ g.thor_0_18_0 ]; sha256 = ''08i34rgs3bydk52zwpps4p0y2fvcnibp9lvfdhr75ppin7wv7lmr''; }; + gettext_2_3_9 = { + basename = ''gettext''; + meta = { + description = ''Gettext is a pure Ruby libary and tools to localize messages.''; + homepage = ''http://ruby-gettext.github.com/''; + longDescription = ''Gettext is a GNU gettext-like program for Ruby. +The catalog file(po-file) is same format with GNU gettext. +So you can use GNU gettext tools for maintaining. +''; + }; + name = ''gettext-2.3.9''; + requiredGems = [ g.locale_2_0_8 g.text_1_2_1 ]; + sha256 = ''1i4kzkan7mnyr1ihphx0sqs3k4qj9i1ldg4a1cwf5h2fz657wvjj''; + }; highline_1_6_16 = { basename = ''highline''; meta = { @@ -653,6 +675,17 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf''; requiredGems = [ ]; sha256 = ''0wz1rnrs4n21j1rw9a120j2pfdkbikp1yvxaqi3mk30iw6mx4p0f''; }; + iconv_1_0_3 = { + basename = ''iconv''; + meta = { + description = ''iconv wrapper library''; + homepage = ''https://github.com/nurse/iconv''; + longDescription = ''iconv wrapper library''; + }; + name = ''iconv-1.0.3''; + requiredGems = [ ]; + sha256 = ''1nhjn07h2fqivdj6xqzi2x2kzh28vigx8z3q5fv2cqn9aqmbdacl''; + }; journey_1_0_4 = { basename = ''journey''; meta = { @@ -730,6 +763,29 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf''; requiredGems = [ ]; sha256 = ''0zy585rs1ihm8nsw525wgmbkcq7aqy1k9dbkk8s6953adl0bpz42''; }; + locale_2_0_8 = { + basename = ''locale''; + meta = { + description = ''Ruby-Locale is the pure ruby library which provides basic APIs for localization.''; + homepage = ''https://github.com/ruby-gettext/locale''; + longDescription = ''Ruby-Locale is the pure ruby library which provides basic APIs for localization. +''; + }; + name = ''locale-2.0.8''; + requiredGems = [ ]; + sha256 = ''1hmixxg4aigl3h1qmz4fdsrv81p0bblcjbks32nrcvcpwmlylf12''; + }; + lockfile_2_1_0 = { + basename = ''lockfile''; + meta = { + description = ''lockfile''; + homepage = ''https://github.com/ahoward/lockfile''; + longDescription = ''description: lockfile kicks the ass''; + }; + name = ''lockfile-2.1.0''; + requiredGems = [ ]; + sha256 = ''1yfpz9k0crb7q7y5bcaavf2jzbc170dj84hqz13qp75rj7bl3qhf''; + }; macaddr_1_6_1 = { basename = ''macaddr''; meta = { @@ -1199,6 +1255,17 @@ algorithm for low-level network errors. requiredGems = [ ]; sha256 = ''0q2czc3ghk32hnxf76xsf0jqcfrnx60aqarvdjhgsfdc9a5pmk20''; }; + rmail_1_0_0 = { + basename = ''rmail''; + meta = { + description = ''A MIME mail parsing and generation library.''; + homepage = ''http://www.rfc20.org/rubymail''; + longDescription = ''RMail is a lightweight mail library containing various utility classes and modules that allow ruby scripts to parse, modify, and generate MIME mail messages.''; + }; + name = ''rmail-1.0.0''; + requiredGems = [ ]; + sha256 = ''0nsg7yda1gdwa96j4hlrp2s0m06vrhcc4zy5mbq7gxmlmwf9yixp''; + }; rspec_2_11_0 = { basename = ''rspec''; meta = { @@ -1355,6 +1422,17 @@ interpreters.''; requiredGems = [ ]; sha256 = ''0h834ajdg9w4xrijp31fn98pjfj08gi08xjvp5xh3i6hz9a25fhr''; }; + text_1_2_1 = { + basename = ''text''; + meta = { + description = ''A collection of text algorithms''; + homepage = ''http://github.com/threedaymonk/text''; + longDescription = ''A collection of text algorithms: Levenshtein, Soundex, Metaphone, Double Metaphone, Porter Stemming''; + }; + name = ''text-1.2.1''; + requiredGems = [ ]; + sha256 = ''0s186kh125imdr7dahr10payc1gmxgk6wjy1v3agdyvl53yn5z3z''; + }; therubyracer_0_10_2 = { basename = ''therubyracer''; meta = { @@ -1420,6 +1498,21 @@ interpreters.''; requiredGems = [ g.polyglot_0_3_3 g.polyglot_0_3_3 ]; sha256 = ''1jlfjq67n933sm0px0s2j965v1kl1rj8fbx6xk8y4yppkv6ygxc8''; }; + trollop_2_0 = { + basename = ''trollop''; + meta = { + description = ''Trollop is a commandline option parser for Ruby that just gets out of your way.''; + homepage = ''http://trollop.rubyforge.org''; + longDescription = ''Trollop is a commandline option parser for Ruby that just +gets out of your way. One line of code per option is all you need to write. +For that, you get a nice automatically-generated help page, robust option +parsing, command subcompletion, and sensible defaults for everything you don't +specify.''; + }; + name = ''trollop-2.0''; + requiredGems = [ ]; + sha256 = ''0iz5k7ax7a5jm9x6p81k6f4mgp48wxxb0j55ypnwxnznih8fsghz''; + }; tzinfo_0_3_37 = { basename = ''tzinfo''; meta = { @@ -1467,6 +1560,16 @@ interpreters.''; requiredGems = [ ]; sha256 = ''1jrfz4295qbnjaxv37fw9jzxyxz61izp7c0683mnscacpx262zw0''; }; + xapian_full_alaveteli_1_2_9_5 = { + basename = ''xapian_full_alaveteli''; + meta = { + description = ''xapian-core + Ruby xapian-bindings''; + longDescription = ''Xapian bindings for Ruby without dependency on system Xapian library''; + }; + name = ''xapian-full-alaveteli-1.2.9.5''; + requiredGems = [ ]; + sha256 = ''0qg1jkx5lr4a5v7l3f9gq7f07al6qaxxzma230zrzs48bz3qnhxm''; + }; xml_simple_1_1_1 = { basename = ''xml_simple''; meta = { diff --git a/pkgs/development/interpreters/ruby/patches.nix b/pkgs/development/interpreters/ruby/patches.nix index c4da956b57c..e20cb81883f 100644 --- a/pkgs/development/interpreters/ruby/patches.nix +++ b/pkgs/development/interpreters/ruby/patches.nix @@ -1,5 +1,5 @@ { fetchurl, writeScript, ruby, ncurses, sqlite, libxml2, libxslt, libffi -, zlib, libuuid, gems, jdk, python, stdenv }: +, zlib, libuuid, gems, jdk, python, stdenv, libiconvOrEmpty }: let @@ -13,7 +13,7 @@ let in { - sup = { buildInputs = [ gems.ncursesw ]; }; + iconv = { buildInputs = [ libiconvOrEmpty ]; }; libv8 = { # This fix is needed to fool scons, which clears the environment by default. @@ -91,6 +91,10 @@ in gemFlags = "--no-rdoc --no-ri"; }; + xapian_full_alaveteli = { + buildInputs = [ zlib libuuid ]; + }; + rjb = { buildInputs = [ jdk ]; JAVA_HOME = jdk; diff --git a/pkgs/development/libraries/atk/2.6.x.nix b/pkgs/development/libraries/atk/2.6.x.nix index 4dd0ae1eeaf..cbfb034ebb7 100644 --- a/pkgs/development/libraries/atk/2.6.x.nix +++ b/pkgs/development/libraries/atk/2.6.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, perl, glib }: +{ stdenv, fetchurl, pkgconfig, perl, glib, libintlOrEmpty }: stdenv.mkDerivation rec { name = "atk-2.6.0"; @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "eff663f90847620bb68c9c2cbaaf7f45e2ff44163b9ab3f10d15be763680491f"; }; + buildInputs = libintlOrEmpty; + nativeBuildInputs = [ pkgconfig perl ]; propagatedBuildInputs = [ glib ]; diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 8c9f55426d5..359895312a6 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -33,6 +33,8 @@ stdenv.mkDerivation rec { stdenv.lib.optional postscriptSupport zlib ++ stdenv.lib.optional pngSupport libpng; + NIX_CFLAGS_COMPILE = "-I${pixman}/include/pixman-1"; + configureFlags = [ "--enable-tee" ] ++ stdenv.lib.optional xcbSupport "--enable-xcb" diff --git a/pkgs/development/libraries/gdk-pixbuf/2.26.x.nix b/pkgs/development/libraries/gdk-pixbuf/2.26.x.nix index 2876c9b9434..9ae4ce3be84 100644 --- a/pkgs/development/libraries/gdk-pixbuf/2.26.x.nix +++ b/pkgs/development/libraries/gdk-pixbuf/2.26.x.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, glib, libtiff, libjpeg, libpng, libX11, xz, jasper }: +{ stdenv, fetchurl, pkgconfig, glib, libtiff, libjpeg, libpng, libX11, xz +, jasper, libintlOrEmpty }: stdenv.mkDerivation rec { name = "gdk-pixbuf-2.26.1"; @@ -9,7 +10,7 @@ stdenv.mkDerivation rec { }; # !!! We might want to factor out the gdk-pixbuf-xlib subpackage. - buildInputs = [ libX11 ]; + buildInputs = [ libX11 libintlOrEmpty ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/gtk+/2.24.x.nix b/pkgs/development/libraries/gtk+/2.24.x.nix index c259f700573..e0c1a6201e2 100644 --- a/pkgs/development/libraries/gtk+/2.24.x.nix +++ b/pkgs/development/libraries/gtk+/2.24.x.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, glib, atk, pango, cairo, perl, xlibs -, gdk_pixbuf, xz +, gdk_pixbuf, xz, libintlOrEmpty , xineramaSupport ? true , cupsSupport ? true, cups ? null }: @@ -17,12 +17,14 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + NIX_CFLAGS_COMPILE = "-I${cairo}/include/cairo"; + nativeBuildInputs = [ perl pkgconfig ]; propagatedBuildInputs = [ xlibs.xlibs glib atk pango gdk_pixbuf cairo - xlibs.libXrandr xlibs.libXrender xlibs.libXcomposite xlibs.libXi - ] + xlibs.libXrandr xlibs.libXrender xlibs.libXcomposite xlibs.libXi ] + ++ libintlOrEmpty ++ stdenv.lib.optional xineramaSupport xlibs.libXinerama ++ stdenv.lib.optionals cupsSupport [ cups ]; diff --git a/pkgs/development/libraries/haskell/Agda/default.nix b/pkgs/development/libraries/haskell/Agda/default.nix index f6589dc53be..64c9d9d51e5 100644 --- a/pkgs/development/libraries/haskell/Agda/default.nix +++ b/pkgs/development/libraries/haskell/Agda/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "Agda"; - version = "2.3.2"; - sha256 = "1xp0qvag6wx6zjwhmb7nm13hp63vlh8h4a2rkc85rsh610m0nynl"; + version = "2.3.2.1"; + sha256 = "1dlf0cs913ma8wjvra8x6p0lwi1pk7ynbdq4lxgbdfgqkbnh43kr"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/Chart-gtk/default.nix b/pkgs/development/libraries/haskell/Chart-gtk/default.nix new file mode 100644 index 00000000000..dd6c54cf6b8 --- /dev/null +++ b/pkgs/development/libraries/haskell/Chart-gtk/default.nix @@ -0,0 +1,18 @@ +{ cabal, cairo, Chart, colour, dataAccessor, dataAccessorTemplate +, gtk, mtl, time +}: + +cabal.mkDerivation (self: { + pname = "Chart-gtk"; + version = "0.17"; + sha256 = "1i411kdpz75azyhfaryazr0bpij5xcl0y82m9a7k23w8mhybqwc7"; + buildDepends = [ + cairo Chart colour dataAccessor dataAccessorTemplate gtk mtl time + ]; + meta = { + homepage = "https://github.com/timbod7/haskell-chart/wiki"; + description = "Utility functions for using the chart library with GTK"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/Chart/default.nix b/pkgs/development/libraries/haskell/Chart/default.nix index a59e4ca7f42..dafa834e4d4 100644 --- a/pkgs/development/libraries/haskell/Chart/default.nix +++ b/pkgs/development/libraries/haskell/Chart/default.nix @@ -4,13 +4,13 @@ cabal.mkDerivation (self: { pname = "Chart"; - version = "0.16"; - sha256 = "1mb8hgxj0i5s7l061pfn49m5f6qdwvmgy6ni7jmg85vpy6b7jra3"; + version = "0.17"; + sha256 = "1ip1a61ryypwfzj6dc6n6pl92rflf7lqf1760ppjyg05q5pn6qxg"; buildDepends = [ cairo colour dataAccessor dataAccessorTemplate mtl time ]; meta = { - homepage = "http://www.dockerz.net/software/chart.html"; + homepage = "https://github.com/timbod7/haskell-chart/wiki"; description = "A library for generating 2D Charts and Plots"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/ListLike/default.nix b/pkgs/development/libraries/haskell/ListLike/default.nix index 2fa427b1f57..b24e81300b6 100644 --- a/pkgs/development/libraries/haskell/ListLike/default.nix +++ b/pkgs/development/libraries/haskell/ListLike/default.nix @@ -1,11 +1,11 @@ -{ cabal }: +{ cabal, HUnit, QuickCheck, random, text, vector }: cabal.mkDerivation (self: { pname = "ListLike"; - version = "3.1.7.1"; - sha256 = "1g3i8iz71x3j41ji9xsbh84v5hj3mxls0zqnx27sb31mx6bic4w1"; - isLibrary = true; - isExecutable = true; + version = "4.0.0"; + sha256 = "13dw8pkj8dwxb81gbcm7gn221zyr3ck9s9s1iv7v1b69chv0zyxk"; + buildDepends = [ text vector ]; + testDepends = [ HUnit QuickCheck random text vector ]; meta = { homepage = "http://software.complete.org/listlike"; description = "Generic support for list-like structures"; diff --git a/pkgs/development/libraries/haskell/accelerate-cuda/default.nix b/pkgs/development/libraries/haskell/accelerate-cuda/default.nix index ba8c9ece664..53f1514bcb6 100644 --- a/pkgs/development/libraries/haskell/accelerate-cuda/default.nix +++ b/pkgs/development/libraries/haskell/accelerate-cuda/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "accelerate-cuda"; - version = "0.13.0.2"; - sha256 = "1i8p6smj82k9nw0kz17247nzby8k8x0il8d2d3rbps5j03795dfk"; + version = "0.13.0.3"; + sha256 = "1y0v7w08pywb8qlw0b5aw4f8pkx4bjlfwxpqq2zfqmjsclnlifkb"; buildDepends = [ accelerate binary cryptohash cuda fclabels filepath hashable hashtables languageCQuote mainlandPretty mtl SafeSemaphore srcloc diff --git a/pkgs/development/libraries/haskell/accelerate-io/default.nix b/pkgs/development/libraries/haskell/accelerate-io/default.nix index 3daa16d87c9..48c2ea71e17 100644 --- a/pkgs/development/libraries/haskell/accelerate-io/default.nix +++ b/pkgs/development/libraries/haskell/accelerate-io/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "accelerate-io"; - version = "0.13.0.1"; - sha256 = "0wjprbhcddnjqbhmpxiwq73hazdnhafhjj7mpvpxhs9pz1dbv89h"; + version = "0.13.0.2"; + sha256 = "0lm1kkjs5gbd70k554vi9977v4bxxcxaw39r9wmwxf8nx2qxvshh"; buildDepends = [ accelerate bmp repa vector ]; meta = { homepage = "https://github.com/AccelerateHS/accelerate-io"; diff --git a/pkgs/development/libraries/haskell/accelerate/default.nix b/pkgs/development/libraries/haskell/accelerate/default.nix index 399140f7283..c2484116f46 100644 --- a/pkgs/development/libraries/haskell/accelerate/default.nix +++ b/pkgs/development/libraries/haskell/accelerate/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "accelerate"; - version = "0.13.0.4"; - sha256 = "1rhbvzgafw3cx2wi4zfil4nxcziqpbh20q3nafck30q2xvrwkmwm"; + version = "0.13.0.5"; + sha256 = "1vqkv3k0w1zy0111a786npf3hypbcg675lbdkv2cf3zx5hqcnn6j"; buildDepends = [ fclabels hashable hashtables ]; meta = { homepage = "https://github.com/AccelerateHS/accelerate/"; diff --git a/pkgs/development/libraries/haskell/acid-state/default.nix b/pkgs/development/libraries/haskell/acid-state/default.nix index 10f222cfe10..dcd6698a5a2 100644 --- a/pkgs/development/libraries/haskell/acid-state/default.nix +++ b/pkgs/development/libraries/haskell/acid-state/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "acid-state"; - version = "0.8.3"; - sha256 = "1n7vafw3jz7kmlp5jqn1wv0ip2rcbyfx0cdi2m1a2lvpi6dh97gc"; + version = "0.10.0"; + sha256 = "0jjjh8l6ka8kawgp1gm75is4ajavl7nd6b2l717wjs8sy93qnzsc"; buildDepends = [ cereal extensibleExceptions filepath mtl network safecopy stm ]; diff --git a/pkgs/development/libraries/haskell/binary/0.6.0.0.nix b/pkgs/development/libraries/haskell/binary/0.6.0.0.nix new file mode 100644 index 00000000000..01e909212e8 --- /dev/null +++ b/pkgs/development/libraries/haskell/binary/0.6.0.0.nix @@ -0,0 +1,13 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "binary"; + version = "0.6.0.0"; + sha256 = "0p72w7f9nn19g2wggsh8x4z7y9s174f3drz9a5ln4x7h554swcxv"; + meta = { + homepage = "https://github.com/kolmodin/binary"; + description = "Binary serialisation for Haskell values using lazy ByteStrings"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/binary/default.nix b/pkgs/development/libraries/haskell/binary/0.7.1.0.nix similarity index 100% rename from pkgs/development/libraries/haskell/binary/default.nix rename to pkgs/development/libraries/haskell/binary/0.7.1.0.nix diff --git a/pkgs/development/libraries/haskell/bytedump/default.nix b/pkgs/development/libraries/haskell/bytedump/default.nix new file mode 100644 index 00000000000..8290717fa4b --- /dev/null +++ b/pkgs/development/libraries/haskell/bytedump/default.nix @@ -0,0 +1,15 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "bytedump"; + version = "1.0"; + sha256 = "1pf01mna3isx3i7m50yz3pw5ygz5sg8i8pshjb3yw8q41w2ba5xf"; + isLibrary = true; + isExecutable = true; + meta = { + homepage = "http://github.com/vincenthz/hs-bytedump"; + description = "Flexible byte dump helpers for human readers"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/concurrent-extra/default.nix b/pkgs/development/libraries/haskell/concurrent-extra/default.nix index db380f03b5b..9f97f730472 100644 --- a/pkgs/development/libraries/haskell/concurrent-extra/default.nix +++ b/pkgs/development/libraries/haskell/concurrent-extra/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "concurrent-extra"; - version = "0.7.0.5"; - sha256 = "0g1ckrwgdyrlp1m352ivplajqzqhw5ymlkb4miiv7c5i9xyyyqnc"; + version = "0.7.0.6"; + sha256 = "12wq86hkgy22qydkj4fw6vb7crzv3010c2mkhsph4rdynr0v588i"; buildDepends = [ baseUnicodeSymbols stm unboundedDelays ]; testDepends = [ baseUnicodeSymbols HUnit stm testFramework testFrameworkHunit diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index 4f50ab44950..9575bc7b4bb 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -1,34 +1,31 @@ { cabal, binary, blazeHtml, blazeMarkup, citeprocHs, cmdargs -, cryptohash, dataDefault, deepseq, filepath, httpConduit +, cryptohash, dataDefault, deepseq, filepath, fsnotify, httpConduit , httpTypes, HUnit, lrucache, mtl, pandoc, parsec, QuickCheck -, random, regexBase, regexTdfa, snapCore, snapServer, tagsoup -, testFramework, testFrameworkHunit, testFrameworkQuickcheck2, text -, time +, random, regexBase, regexTdfa, snapCore, snapServer +, systemFilepath, tagsoup, testFramework, testFrameworkHunit +, testFrameworkQuickcheck2, text, time }: cabal.mkDerivation (self: { pname = "hakyll"; - version = "4.2.2.0"; - sha256 = "0kz8v2ip0hmvqnrxgv44g2863z1dql88razl7aa3fw01q56ihz0y"; + version = "4.3.0.0"; + sha256 = "188j3spdi2mivx5a10whpb09fm8yhg54ddfwc6x0k040c7q3aq0q"; isLibrary = true; isExecutable = true; buildDepends = [ binary blazeHtml blazeMarkup citeprocHs cmdargs cryptohash - dataDefault deepseq filepath httpConduit httpTypes lrucache mtl - pandoc parsec random regexBase regexTdfa snapCore snapServer - tagsoup text time + dataDefault deepseq filepath fsnotify httpConduit httpTypes + lrucache mtl pandoc parsec random regexBase regexTdfa snapCore + snapServer systemFilepath tagsoup text time ]; testDepends = [ binary blazeHtml blazeMarkup citeprocHs cmdargs cryptohash - dataDefault deepseq filepath httpConduit httpTypes HUnit lrucache - mtl pandoc parsec QuickCheck random regexBase regexTdfa snapCore - snapServer tagsoup testFramework testFrameworkHunit - testFrameworkQuickcheck2 text time + dataDefault deepseq filepath fsnotify httpConduit httpTypes HUnit + lrucache mtl pandoc parsec QuickCheck random regexBase regexTdfa + snapCore snapServer systemFilepath tagsoup testFramework + testFrameworkHunit testFrameworkQuickcheck2 text time ]; doCheck = false; - patchPhase = '' - sed -i -e 's|cryptohash .*,|cryptohash,|' hakyll.cabal - ''; meta = { homepage = "http://jaspervdj.be/hakyll"; description = "A static website compiler library"; diff --git a/pkgs/development/libraries/haskell/hashable/1.2.0.7.nix b/pkgs/development/libraries/haskell/hashable/1.2.0.10.nix similarity index 87% rename from pkgs/development/libraries/haskell/hashable/1.2.0.7.nix rename to pkgs/development/libraries/haskell/hashable/1.2.0.10.nix index e92f0c2c9d1..2bafe55f420 100644 --- a/pkgs/development/libraries/haskell/hashable/1.2.0.7.nix +++ b/pkgs/development/libraries/haskell/hashable/1.2.0.10.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hashable"; - version = "1.2.0.7"; - sha256 = "1v70b85g9kx0ikgxpiqpl8dp3w9hdxm75h73g69giyiy7swn9630"; + version = "1.2.0.10"; + sha256 = "155r7zqc0kisjdslr8d1c04yqwvzwqx4d99c0zla113dvsdjhp37"; buildDepends = [ text ]; testDepends = [ HUnit QuickCheck random testFramework testFrameworkHunit diff --git a/pkgs/development/libraries/haskell/hflags/default.nix b/pkgs/development/libraries/haskell/hflags/default.nix new file mode 100644 index 00000000000..17c01f9a659 --- /dev/null +++ b/pkgs/development/libraries/haskell/hflags/default.nix @@ -0,0 +1,14 @@ +{ cabal, text }: + +cabal.mkDerivation (self: { + pname = "hflags"; + version = "0.1.3"; + sha256 = "0nn08xqn0hvdlblnaad3nsdfkc0ssab6kvhi4qbrcq9jmjmspld3"; + buildDepends = [ text ]; + meta = { + homepage = "http://github.com/errge/hflags"; + description = "Command line flag parser, very similar to Google's gflags"; + license = "Apache-2.0"; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/hit/default.nix b/pkgs/development/libraries/haskell/hit/default.nix new file mode 100644 index 00000000000..9791478d3e8 --- /dev/null +++ b/pkgs/development/libraries/haskell/hit/default.nix @@ -0,0 +1,27 @@ +{ cabal, attoparsec, blazeBuilder, bytedump, cryptohash, HUnit, mtl +, parsec, QuickCheck, random, systemFileio, systemFilepath +, testFramework, testFrameworkQuickcheck2, time, vector, zlib +, zlibBindings +}: + +cabal.mkDerivation (self: { + pname = "hit"; + version = "0.5.0"; + sha256 = "05v49l3k8gwn922d5b5xrzdrakh6bw02bp8hd8yc8163jyazk2vx"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + attoparsec blazeBuilder cryptohash mtl parsec random systemFileio + systemFilepath time vector zlib zlibBindings + ]; + testDepends = [ + bytedump HUnit QuickCheck testFramework testFrameworkQuickcheck2 + time + ]; + meta = { + homepage = "http://github.com/vincenthz/hit"; + description = "Git operations in haskell"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/hsdns/default.nix b/pkgs/development/libraries/haskell/hsdns/default.nix index b72f4d947c4..464047d0c61 100644 --- a/pkgs/development/libraries/haskell/hsdns/default.nix +++ b/pkgs/development/libraries/haskell/hsdns/default.nix @@ -2,11 +2,10 @@ cabal.mkDerivation (self: { pname = "hsdns"; - version = "1.6"; - sha256 = "1vf3crkhs7z572bqdf7p2hfcqkjxvnyg0w0cf8b7kyfxzn8bj3fa"; + version = "1.6.1"; + sha256 = "0s63acjy1n75k7gjm4kam7v5d4a5kn0aw178mygkqwr5frflghb4"; buildDepends = [ network ]; extraLibraries = [ adns ]; - noHaddock = true; meta = { homepage = "http://github.com/peti/hsdns"; description = "Asynchronous DNS Resolver"; diff --git a/pkgs/development/libraries/haskell/iteratee/default.nix b/pkgs/development/libraries/haskell/iteratee/default.nix index ee9026bae49..c4438d97364 100644 --- a/pkgs/development/libraries/haskell/iteratee/default.nix +++ b/pkgs/development/libraries/haskell/iteratee/default.nix @@ -10,6 +10,7 @@ cabal.mkDerivation (self: { ListLike MonadCatchIOTransformers monadControl parallel transformers transformersBase ]; + jailbreak = true; meta = { homepage = "http://www.tiresiaspress.us/haskell/iteratee"; description = "Iteratee-based I/O"; diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix index 79fd1f6f781..57bb615800b 100644 --- a/pkgs/development/libraries/haskell/persistent/default.nix +++ b/pkgs/development/libraries/haskell/persistent/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "persistent"; - version = "1.2.0.1"; - sha256 = "1bs74g1fkwq4wvz18lp0ial6z58vpslgv0rqdn91ka6gw8k4fvlb"; + version = "1.2.0.2"; + sha256 = "026zdfccy57dbsacg8227jzcdyq50nb1bkcr56ryxi91ymlyf50k"; buildDepends = [ aeson attoparsec base64Bytestring blazeHtml blazeMarkup conduit liftedBase monadControl monadLogger pathPieces poolConduit diff --git a/pkgs/development/libraries/haskell/shake/default.nix b/pkgs/development/libraries/haskell/shake/default.nix index c5cc24cc8da..b7f605c2b7e 100644 --- a/pkgs/development/libraries/haskell/shake/default.nix +++ b/pkgs/development/libraries/haskell/shake/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "shake"; - version = "0.10.3"; - sha256 = "0dvpjswiiw2s4zh5sjx7qs4xp41bw2wqny0k61pkg5wvgw3b7jmh"; + version = "0.10.5"; + sha256 = "1abbls2rmpyxpj41c0afvfjh1bw6j6rz1n0w4jhqrmq0d32kpg7a"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/snap/core.nix b/pkgs/development/libraries/haskell/snap/core.nix index a20ec8e7ca5..f2440ef250f 100644 --- a/pkgs/development/libraries/haskell/snap/core.nix +++ b/pkgs/development/libraries/haskell/snap/core.nix @@ -1,19 +1,19 @@ { cabal, attoparsec, attoparsecEnumerator, blazeBuilder , blazeBuilderEnumerator, bytestringMmap, caseInsensitive, deepseq -, enumerator, filepath, HUnit, MonadCatchIOTransformers, mtl -, random, regexPosix, text, time, unixCompat, unorderedContainers -, vector, zlibEnum +, enumerator, filepath, hashable, HUnit, MonadCatchIOTransformers +, mtl, random, regexPosix, text, time, unixCompat +, unorderedContainers, vector, zlibEnum }: cabal.mkDerivation (self: { pname = "snap-core"; - version = "0.9.3.1"; - sha256 = "1q2lk70l0hk4l6ksjnal1bfkby0i08gdzvj9cscvxs4njxmgdapq"; + version = "0.9.4.0"; + sha256 = "08afaj4ln4nl7ymdixijzjx8hc7nnr70gz7avpzaanq5nrw0k054"; buildDepends = [ attoparsec attoparsecEnumerator blazeBuilder blazeBuilderEnumerator - bytestringMmap caseInsensitive deepseq enumerator filepath HUnit - MonadCatchIOTransformers mtl random regexPosix text time unixCompat - unorderedContainers vector zlibEnum + bytestringMmap caseInsensitive deepseq enumerator filepath hashable + HUnit MonadCatchIOTransformers mtl random regexPosix text time + unixCompat unorderedContainers vector zlibEnum ]; meta = { homepage = "http://snapframework.com/"; diff --git a/pkgs/development/libraries/haskell/template-default/default.nix b/pkgs/development/libraries/haskell/template-default/default.nix new file mode 100644 index 00000000000..a450b09b551 --- /dev/null +++ b/pkgs/development/libraries/haskell/template-default/default.nix @@ -0,0 +1,14 @@ +{ cabal, dataDefault }: + +cabal.mkDerivation (self: { + pname = "template-default"; + version = "0.1.1"; + sha256 = "07b8j11v0247fwaf3mv72m7aaq3crbsyrxmxa352vn9h2g6l1jsd"; + buildDepends = [ dataDefault ]; + meta = { + homepage = "https://github.com/haskell-pkg-janitors/template-default"; + description = "declaring Default instances just got even easier"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/vector-th-unbox/default.nix b/pkgs/development/libraries/haskell/vector-th-unbox/default.nix new file mode 100644 index 00000000000..8f5ec4b52bf --- /dev/null +++ b/pkgs/development/libraries/haskell/vector-th-unbox/default.nix @@ -0,0 +1,13 @@ +{ cabal, vector }: + +cabal.mkDerivation (self: { + pname = "vector-th-unbox"; + version = "0.2.0.1"; + sha256 = "1q01yk6cyjxbdnmq31d5mfac09hbql43d7xiw1snc96nmkklfpjv"; + buildDepends = [ vector ]; + meta = { + description = "Deriver for Data.Vector.Unboxed using Template Haskell"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/xtest/default.nix b/pkgs/development/libraries/haskell/xtest/default.nix new file mode 100644 index 00000000000..d9ce47647ca --- /dev/null +++ b/pkgs/development/libraries/haskell/xtest/default.nix @@ -0,0 +1,14 @@ +{ cabal, libXtst, X11 }: + +cabal.mkDerivation (self: { + pname = "xtest"; + version = "0.2"; + sha256 = "118xxx7sydpsvdqz0x107ngb85fggn630ysw6d2ckky75fmhmxk7"; + buildDepends = [ X11 ]; + extraLibraries = [ libXtst ]; + meta = { + description = "Thin FFI bindings to X11 XTest library"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/javascript/jquery-ui/default.nix b/pkgs/development/libraries/javascript/jquery-ui/default.nix index e2d48f25bb5..24217657b10 100644 --- a/pkgs/development/libraries/javascript/jquery-ui/default.nix +++ b/pkgs/development/libraries/javascript/jquery-ui/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - name = "jquery-ui-1.10.2"; + name = "jquery-ui-1.10.3"; src = fetchurl { url = "http://jqueryui.com/resources/download/${name}.custom.zip"; - sha256 = "0r1fmqpym7bjqhjay9br4h3izky781bsda7v7552yjwkgiv391hl"; + sha256 = "1nqh3fmjgy73cbwb5sj775242i6jhz3f5b9fxgrkq00dfvkls779"; }; buildInputs = [ unzip ]; @@ -17,9 +17,13 @@ stdenv.mkDerivation rec { # For convenience, provide symlinks "jquery.min.js" etc. (i.e., # without the version number). - ln -s $out/js/jquery-ui-*.custom.min.js $out/js/jquery-ui.min.js - ln -s $out/js/jquery-1.*.min.js $out/js/jquery.min.js - ln -s $out/css/smoothness/jquery-ui-*.custom.css $out/css/smoothness/jquery-ui.css + pushd $out/js + ln -s jquery-ui-*.custom.js jquery-ui.js + ln -s jquery-ui-*.custom.min.js jquery-ui.min.js + ln -s jquery-1.*.js jquery.js + popd + pushd $out/css/smoothness + ln -s jquery-ui-*.custom.css jquery-ui.css ''; meta = { diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index 0438816b1b4..0d4081f1619 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, libgpgerror }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { name = "libgcrypt-1.5.2"; src = fetchurl { @@ -34,4 +34,8 @@ stdenv.mkDerivation rec { homepage = http://gnupg.org/; platforms = stdenv.lib.platforms.all; }; -} +} # old "as" problem, see #616 and http://gnupg.10057.n7.nabble.com/Fail-to-build-on-freebsd-7-3-td30245.html + // stdenv.lib.optionalAttrs (stdenv.isFreeBSD && stdenv.isi686) + { configureFlags = [ "--disable-aesni-support" ]; } +) + diff --git a/pkgs/development/libraries/mpfr/3.1.2.nix b/pkgs/development/libraries/mpfr/3.1.2.nix new file mode 100644 index 00000000000..fd164cf9105 --- /dev/null +++ b/pkgs/development/libraries/mpfr/3.1.2.nix @@ -0,0 +1,51 @@ + +{stdenv, fetchurl, gmp}: + +stdenv.mkDerivation (rec { + name = "mpfr-3.1.2"; + + src = fetchurl { + url = "mirror://gnu/mpfr/${name}.tar.bz2"; + sha256 = "0sqvpfkzamxdr87anzakf9dhkfh15lfmm5bsqajk02h1mxh3zivr"; + }; + + buildInputs = [ gmp ]; + + doCheck = true; + + enableParallelBuilding = true; + + meta = { + homepage = http://www.mpfr.org/; + description = "GNU MPFR, a library for multiple-precision floating-point arithmetic"; + + longDescription = '' + The GNU MPFR library is a C library for multiple-precision + floating-point computations with correct rounding. MPFR is + based on the GMP multiple-precision library. + + The main goal of MPFR is to provide a library for + multiple-precision floating-point computation which is both + efficient and has a well-defined semantics. It copies the good + ideas from the ANSI/IEEE-754 standard for double-precision + floating-point arithmetic (53-bit mantissa). + ''; + + license = "LGPLv2+"; + + maintainers = [ stdenv.lib.maintainers.ludo ]; + platforms = stdenv.lib.platforms.all; + }; +} + +// + +(stdenv.lib.optionalAttrs stdenv.isFreeBSD { + /* Work around a FreeBSD bug that otherwise leads to segfaults in + the test suite: + http://hydra.bordeaux.inria.fr/build/34862 + http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00015.html + http://www.freebsd.org/cgi/query-pr.cgi?pr=161344 + */ + configureFlags = [ "--disable-thread-safe" ]; + })) diff --git a/pkgs/development/libraries/pango/1.30.x.nix b/pkgs/development/libraries/pango/1.30.x.nix index c32891b95cf..f0b8297c996 100644 --- a/pkgs/development/libraries/pango/1.30.x.nix +++ b/pkgs/development/libraries/pango/1.30.x.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "3a8c061e143c272ddcd5467b3567e970cfbb64d1d1600a8f8e62435556220cbe"; }; + NIX_CFLAGS_COMPILE = "-I${cairo}/include/cairo"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ gettext fontconfig ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/ruby_gpgme/default.nix b/pkgs/development/libraries/ruby_gpgme/default.nix new file mode 100644 index 00000000000..c5f2366bfa1 --- /dev/null +++ b/pkgs/development/libraries/ruby_gpgme/default.nix @@ -0,0 +1,64 @@ +{ stdenv, fetchurl, gpgme, ruby, rubygems, hoe }: + +stdenv.mkDerivation { + name = "ruby-gpgme-1.0.8"; + + src = fetchurl { + url = "https://github.com/ueno/ruby-gpgme/archive/1.0.8.tar.gz"; + sha256 = "1j7jkl9s8iqcmxf3x6c9kljm19hw1jg6yvwbndmkw43qacdr9nxb"; + }; + + meta = { + description = '' + Ruby-GPGME is a Ruby language binding of GPGME (GnuPG Made + Easy) + ''; + homepage = "http://rubyforge.org/projects/ruby-gpgme/"; + longDescription = '' + Ruby-GPGME is a Ruby language binding of GPGME (GnuPG Made Easy). + + GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG + easier for applications. It provides a High-Level Crypto API for + encryption, decryption, signing, signature verification and key + management. + ''; + }; + + buildInputs = [ gpgme rubygems hoe ruby ]; + + buildPhase = '' + ${ruby}/bin/ruby extconf.rb + rake gem + ''; + + installPhase = '' + export HOME=$TMP/home; mkdir -pv "$HOME" + + # For some reason, the installation phase doesn't work with the default + # make install command run by gem (we'll fix it and do it ourselves later) + gem install --no-verbose --install-dir "$out/${ruby.gemPath}" \ + --bindir "$out/bin" --no-rdoc --no-ri pkg/gpgme-1.0.8.gem || true + + # Create a bare-bones gemspec file so that ruby will recognise the gem + cat <"$out/${ruby.gemPath}/specifications/gpgme.gemspec" + Gem::Specification.new do |s| + s.name = 'gpgme' + s.version = '1.0.8' + s.files = Dir['{lib,examples}/**/*'] + s.rubyforge_project = 'ruby-gpgme' + s.require_paths = ['lib'] + end + EOF + + cd "$out/${ruby.gemPath}/gems/gpgme-1.0.8" + mkdir src + mv lib src + sed -i "s/srcdir = ./srcdir = src/" Makefile + make install + + mv lib lib.bak + mv src/lib lib + rmdir src + ''; +} + diff --git a/pkgs/development/libraries/ruby_ncursesw_sup/default.nix b/pkgs/development/libraries/ruby_ncursesw_sup/default.nix new file mode 100644 index 00000000000..67041ad0607 --- /dev/null +++ b/pkgs/development/libraries/ruby_ncursesw_sup/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchurl, ncurses, ruby, rubygems }: + +stdenv.mkDerivation rec { + name = ''ncursesw-sup-afd962b9c06108ff0643e98593c5605314d76917''; + + src = fetchurl { + url = "https://github.com/sup-heliotrope/ncursesw-ruby/archive/afd962b9c06108ff0643e98593c5605314d76917.tar.gz"; + sha256 = "13i286p4bm8zqg9xh96a1dg7wkywj9m6975gbh3w43d3rmfc1h6a"; + }; + + meta = { + description = '' + Hacked up version of ncurses gem that supports wide characters for + supmua.org + ''; + homepage = ''http://github.com/sup-heliotrope/ncursesw-ruby''; + longDescription = '' + This wrapper provides access to the functions, macros, global variables + and constants of the ncurses library. These are mapped to a Ruby Module + named "Ncurses": Functions and external variables are implemented as + singleton functions of the Module Ncurses. + ''; + }; + + buildInputs = [ ncurses rubygems ]; + + buildPhase = "gem build ncursesw.gemspec"; + + installPhase = '' + export HOME=$TMP/home; mkdir -pv "$HOME" + + # For some reason, the installation phase doesn't work with the default + # make install command run by gem (we'll fix it and do it ourselves later) + gem install --no-verbose --install-dir "$out/${ruby.gemPath}" \ + --bindir "$out/bin" --no-rdoc --no-ri ncursesw-sup-1.3.1.2.gem || true + + # Needed for ruby to recognise the gem + cp ncursesw.gemspec "$out/${ruby.gemPath}/specifications" + + cd "$out/${ruby.gemPath}/gems/ncursesw-sup-1.3.1.2" + mkdir src + mv lib src + sed -i "s/srcdir = ./srcdir = src/" Makefile + make install + ''; +} + diff --git a/pkgs/development/libraries/suitesparse/default.nix b/pkgs/development/libraries/suitesparse/default.nix index e3a7fbb5a08..01762083934 100644 --- a/pkgs/development/libraries/suitesparse/default.nix +++ b/pkgs/development/libraries/suitesparse/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, blas, liblapack, gfortran } : stdenv.mkDerivation rec { - version = "4.0.0"; + version = "4.2.0"; name = "suitesparse-${version}"; src = fetchurl { url = "http://www.cise.ufl.edu/research/sparse/SuiteSparse/SuiteSparse-${version}.tar.gz" ; - sha256 = "1nvbdw10wa6654k8sa2vhr607q6fflcywyji5xd767cqpwag4v5j"; + sha256 = "0i0ivsc5sr3jdz6nqq4wz5lwxc8rpnkqgddyhqqgfhwzgrcqh9v6"; }; buildInputs = [blas liblapack gfortran] ; patches = [./disable-metis.patch]; diff --git a/pkgs/development/misc/amdadl-sdk/default.nix b/pkgs/development/misc/amdadl-sdk/default.nix new file mode 100644 index 00000000000..d311b6b722a --- /dev/null +++ b/pkgs/development/misc/amdadl-sdk/default.nix @@ -0,0 +1,44 @@ +{ fetchurl, stdenv, unzip }: + +stdenv.mkDerivation rec { + version = "4.0"; + name = "amdadl-sdk-${version}"; + + src = fetchurl { + url = "http://download2-developer.amd.com/amd/GPU/zip/ADL_SDK_${version}.zip"; + sha256 = "4265ee2f265b69cc39b61e10f79741c1d799f4edb71dce14a7d88509fbec0efa"; + }; + + buildInputs = [ unzip ]; + + doCheck = false; + + unpackPhase = '' + unzip $src + ''; + + buildPhase = '' + #Build adlutil + cd adlutil + gcc main.c -o adlutil -DLINUX -ldl -I ../include/ + cd .. + ''; + + installPhase = '' + #Install SDK + mkdir -p $out/bin + cp -r include "$out/" + cp "adlutil/adlutil" "$out/bin/adlutil" + + #Fix modes + chmod -R 755 "$out/bin/" + ''; + + meta = with stdenv.lib; { + description = "API to access display driver functionality for ATI graphics cards"; + homepage = http://developer.amd.com/tools/graphics-development/display-library-adl-sdk/; + license = licenses.amdadl; + maintainers = [ maintainers.offline ]; + platforms = [ "i686-linux" "x86_64-linux" ]; + }; +} diff --git a/pkgs/development/misc/amdapp-sdk/01-remove-aparapi-samples.patch b/pkgs/development/misc/amdapp-sdk/01-remove-aparapi-samples.patch new file mode 100644 index 00000000000..f474f76f01e --- /dev/null +++ b/pkgs/development/misc/amdapp-sdk/01-remove-aparapi-samples.patch @@ -0,0 +1,10 @@ +--- samples/Makefile 2012-11-29 05:58:48.000000000 +0100 ++++ samples/Makefile 2012-12-30 20:13:30.926576277 +0100 +@@ -3,7 +3,6 @@ + include $(DEPTH)/make/openclsdkdefs.mk + + SUBDIRS = opencl +-SUBDIRS += aparapi + ifneq ($(OS), lnx) + SUBDIRS += C++Amp + ifeq ($(BITS), 64) diff --git a/pkgs/development/misc/amdapp-sdk/default.nix b/pkgs/development/misc/amdapp-sdk/default.nix new file mode 100644 index 00000000000..355afb9587b --- /dev/null +++ b/pkgs/development/misc/amdapp-sdk/default.nix @@ -0,0 +1,105 @@ +{ stdenv, fetchurl, makeWrapper, perl, mesa, xorg, + version? "2.8", # What version + samples? false # Should samples be installed +}: + +let + + src_hashes = { + "2.6" = { + x86 = "99610737f21b2f035e0eac4c9e776446cc4378a614c7667de03a82904ab2d356"; + x86_64 = "1fj55358s4blxq9bp77k07gqi22n5nfkzwjkbdc62gmy1zxxlhih"; + }; + + "2.7" = { + x86 = "99610737f21b2f035e0eac4c9e776446cc4378a614c7667de03a82904ab2d356"; + x86_64 = "08bi43bgnsxb47vbirh09qy02w7zxymqlqr8iikk9aavfxjlmch1"; + }; + + "2.8" = { + x86 = "99610737f21b2f035e0eac4c9e776446cc4378a614c7667de03a82904ab2d356"; + x86_64 = "d9c120367225bb1cd21abbcf77cb0a69cfb4bb6932d0572990104c566aab9681"; + }; + }; + + bits = if stdenv.system == "x86_64-linux" then "64" + else "32"; + + arch = if stdenv.system == "x86_64-linux" then "x86_64" + else "x86"; + +in stdenv.mkDerivation rec { + name = "amdapp-sdk-${version}"; + + src = if stdenv.system == "x86_64-linux" then fetchurl { + url = "http://developer.amd.com/wordpress/media/2012/11/AMD-APP-SDK-v${version}-lnx64.tgz"; + sha256 = (builtins.getAttr version src_hashes).x86_64; + } else if stdenv.system == "i686-linux" then fetchurl { + url = "http://developer.amd.com/wordpress/media/2012/11/AMD-APP-SDK-v${version}-lnx32.tgz"; + sha256 = (builtins.getAttr version src_hashes).x86; + } else + throw "System not supported"; + + # TODO: Add support for aparapi, java parallel api + patches = [ ./01-remove-aparapi-samples.patch ]; + + patchFlags = "-p0"; + buildInputs = [ makeWrapper perl mesa xorg.libX11 xorg.libXext xorg.libXaw xorg.libXi xorg.libXxf86vm ]; + propagatedBuildInputs = [ stdenv.gcc ]; + NIX_LDFLAGS = "-lX11 -lXext -lXmu -lXi -lXxf86vm"; + doCheck = false; + + unpackPhase = '' + tar xvzf $src + tar xf AMD-APP-SDK-v${version}-RC-lnx${bits}.tgz + cd AMD-APP-SDK-v${version}-RC-lnx${bits} + ''; + + buildPhase = if !samples then ''echo "nothing to build"'' else null; + + installPhase = '' + # Install SDK + mkdir -p $out + cp -r {docs,include} "$out/" + mkdir -p "$out/"{bin,lib,samples/opencl/bin} + cp -r "./bin/${arch}/clinfo" "$out/bin/clinfo" + cp -r "./lib/${arch}/"* "$out/lib/" + + # Register ICD + mkdir -p "$out/etc/OpenCL/vendors" + echo "$out/lib/libamdocl${bits}.so" > "$out/etc/OpenCL/vendors/amd.icd" + # The OpenCL ICD specifications: http://www.khronos.org/registry/cl/extensions/khr/cl_khr_icd.txt + + # Install includes + mkdir -p "$out/usr/include/"{CAL,OpenVideo} + install -m644 './include/OpenVideo/'{OVDecode.h,OVDecodeTypes.h} "$out/usr/include/OpenVideo/" + + ${ if samples then '' + # Install samples + find ./samples/opencl/ -mindepth 1 -maxdepth 1 -type d -not -name bin -exec cp -r {} "$out/samples/opencl" \; + cp -r "./samples/opencl/bin/${arch}/"* "$out/samples/opencl/bin" + for f in $(find "$out/samples/opencl/bin/" -type f -not -name "*.*"); + do + wrapProgram "$f" --prefix PATH ":" "${stdenv.gcc}/bin" + done'' else "" + } + + # Create wrappers + patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" $out/bin/clinfo + patchelf --set-rpath ${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib $out/bin/clinfo + + # Fix modes + find "$out/" -type f -exec chmod 644 {} \; + chmod -R 755 "$out/bin/" + find "$out/samples/opencl/bin/" -type f -name ".*" -exec chmod 755 {} \; + find "$out/samples/opencl/bin/" -type f -not -name "*.*" -exec chmod 755 {} \; + ''; + + meta = with stdenv.lib; { + description = "AMD Accelerated Parallel Processing (APP) SDK, with OpenCL 1.2 support"; + homepage = http://developer.amd.com/tools/heterogeneous-computing/amd-accelerated-parallel-processing-app-sdk/; + license = licenses.amd; + maintainers = [ maintainers.offline ]; + platforms = [ "i686-linux" "x86_64-linux" ]; + }; +} diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk.nix index edae828bd08..46227e5f14d 100644 --- a/pkgs/development/mobile/titaniumenv/titaniumsdk.nix +++ b/pkgs/development/mobile/titaniumenv/titaniumsdk.nix @@ -1,14 +1,14 @@ {stdenv, fetchurl, unzip, makeWrapper, python, jdk}: stdenv.mkDerivation { - name = "titanium-mobilesdk-3.1.0.v20130415184552"; + name = "titanium-mobilesdk-3.1.1.v20130612114553"; src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { - url = http://builds.appcelerator.com.s3.amazonaws.com/mobile/3_1_X/mobilesdk-3.1.0.v20130415184552-linux.zip; - sha1 = "7a8b34b92f6c3eff33eefb9a1b6b0d2e3670001d"; + url = http://builds.appcelerator.com.s3.amazonaws.com/mobile/3_1_X/mobilesdk-3.1.1.v20130612114553-linux.zip; + sha1 = "410ba7e8171a887b6a4b3173116430657c3d84aa"; } else if stdenv.system == "x86_64-darwin" then fetchurl { - url = http://builds.appcelerator.com.s3.amazonaws.com/mobile/3_1_X/mobilesdk-3.1.0.v20130415184552-osx.zip; - sha1 = "e0ed7e399a104e0838e245550197bf787a66bf98"; + url = http://builds.appcelerator.com.s3.amazonaws.com/mobile/3_1_X/mobilesdk-3.1.1.v20130612114553-osx.zip; + sha1 = "0893a1560ac6fb63369fc9f6ea9550b6649438fa"; } else throw "Platform: ${stdenv.system} not supported!"; diff --git a/pkgs/development/ocaml-modules/camlimages/default.nix b/pkgs/development/ocaml-modules/camlimages/default.nix new file mode 100644 index 00000000000..00168d46c3f --- /dev/null +++ b/pkgs/development/ocaml-modules/camlimages/default.nix @@ -0,0 +1,43 @@ +{stdenv, fetchurl, omake, ocaml, omake_rc1, libtiff, libjpeg, libpng_apng, giflib, findlib, libXpm, freetype, graphicsmagick, ghostscript }: + +let + ocaml_version = (builtins.parseDrvName ocaml.name).version; + pname = "camlimages"; + version = "4.0.1"; +in + +stdenv.mkDerivation { + name = "${pname}-${version}"; + + src = fetchurl { + url = "https://bitbucket.org/camlspotter/camlimages/get/v4.0.1.tar.gz"; + sha256 = "b40237c1505487049799a7af296eb3996b3fa08eab94415546f46d61355747c4"; + }; + + buildInputs = [ocaml omake_rc1 findlib graphicsmagick ghostscript ]; + + propagatedbuildInputs = [libtiff libjpeg libpng_apng giflib freetype libXpm ]; + + createFindlibDestdir = true; + + preConfigure = '' + rm ./configure + ''; + + buildPhase = '' + omake + ''; + + installPhase = '' + omake install + ''; + + #makeFlags = "BINDIR=$(out)/bin MANDIR=$(out)/usr/share/man/man1 DYPGENLIBDIR=$(out)/lib/ocaml/${ocaml_version}/site-lib"; + + meta = { + homepage = http://cristal.inria.fr/camlimages; + description = "Image manipulation library"; + license = "GnuGPLV2"; +# maintainers = [ stdenv.lib.maintainers.roconnor ]; + }; +} diff --git a/pkgs/development/ocaml-modules/camlzip/default.nix b/pkgs/development/ocaml-modules/camlzip/default.nix index 03a6dbef23e..2024f5a5ab8 100644 --- a/pkgs/development/ocaml-modules/camlzip/default.nix +++ b/pkgs/development/ocaml-modules/camlzip/default.nix @@ -2,16 +2,16 @@ let ocaml_version = (builtins.parseDrvName ocaml.name).version; - version = "1.04"; + version = "1.05"; in stdenv.mkDerivation { name = "camlzip-${version}"; src = fetchurl { - url = "http://forge.ocamlcore.org/frs/download.php/328/" + + url = "http://forge.ocamlcore.org/frs/download.php/1037/" + "camlzip-${version}.tar.gz"; - sha256 = "1zpchmp199x7f4mzmapvfywgy7f6wy9yynd9nd8yh8l78s5gixbn"; + sha256 = "930b70c736ab5a7ed1b05220102310a0a2241564786657abe418e834a538d06b"; }; buildInputs = [zlib ocaml findlib]; diff --git a/pkgs/development/ocaml-modules/cryptokit/default.nix b/pkgs/development/ocaml-modules/cryptokit/default.nix index 48e86ed9a68..94b36fb6651 100644 --- a/pkgs/development/ocaml-modules/cryptokit/default.nix +++ b/pkgs/development/ocaml-modules/cryptokit/default.nix @@ -2,16 +2,16 @@ let ocaml_version = (builtins.parseDrvName ocaml.name).version; - version = "1.5"; + version = "1.7"; in stdenv.mkDerivation { name = "cryptokit-${version}"; src = fetchurl { - url = "http://forge.ocamlcore.org/frs/download.php/639/" + + url = "http://forge.ocamlcore.org/frs/download.php/1166/" + "cryptokit-${version}.tar.gz"; - sha256 = "1r5kbsbsicrbpdrdim7h8xg2b1a8qg8sxig9q6cywzm57r33lj72"; + sha256 = "56a8c0339c47ca3cf43c8881d5b519d3bff68bc8a53267e9c5c9cbc9239600ca"; }; buildInputs = [zlib ocaml findlib ncurses]; diff --git a/pkgs/development/ocaml-modules/dypgen/default.nix b/pkgs/development/ocaml-modules/dypgen/default.nix new file mode 100644 index 00000000000..73f543f5b62 --- /dev/null +++ b/pkgs/development/ocaml-modules/dypgen/default.nix @@ -0,0 +1,33 @@ +{stdenv, fetchurl, ocaml, findlib}: + +let + ocaml_version = (builtins.parseDrvName ocaml.name).version; + pname = "dypgen"; + version = "20120619-1"; +in + +stdenv.mkDerivation { + name = "${pname}-${version}"; + + src = fetchurl { + url = "http://dypgen.free.fr/dypgen-20120619-1.tar.bz2"; + sha256 = "ecb53d6e469e9ec4d57ee6323ff498d45b78883ae13618492488e7c5151fdd97"; + }; + + buildInputs = [ocaml findlib]; + + createFindlibDestdir = true; + + buildPhase = '' + make + ''; + + makeFlags = "BINDIR=$(out)/bin MANDIR=$(out)/usr/share/man/man1 DYPGENLIBDIR=$(out)/lib/ocaml/${ocaml_version}/site-lib"; + + meta = { + homepage = http://dypgen.free.fr; + description = "Dypgen GLR self extensible parser generator"; + license = "CeCILL-B_V1"; +# maintainers = [ stdenv.lib.maintainers.roconnor ]; + }; +} diff --git a/pkgs/development/ocaml-modules/lablgl/Makefile.config.patch b/pkgs/development/ocaml-modules/lablgl/Makefile.config.patch new file mode 100644 index 00000000000..c896978f57e --- /dev/null +++ b/pkgs/development/ocaml-modules/lablgl/Makefile.config.patch @@ -0,0 +1,117 @@ +diff -Naur lablGL.ori/Makefile.config lablGL/Makefile.config +--- lablGL.ori/Makefile.config 1970-01-01 01:00:00.000000000 +0100 ++++ lablGL/Makefile.config 2013-06-02 08:13:10.000000000 +0200 +@@ -0,0 +1,63 @@ ++# LablGL and Togl configuration file ++# ++# Please have a look at the config/Makefile in the Objective Caml distribution, ++# or at the labltklink script to get the information needed here ++# ++ ++##### Adjust these always ++ ++# Uncomment if you have the fast ".opt" compilers ++#CAMLC = ocamlc.opt ++#CAMLOPT = ocamlopt.opt ++ ++# Where to put the lablgl script ++BINDIR = @BINDIR@ ++ ++# Where to find X headers ++XINCLUDES = @XINCLUDES@ ++# X libs (for broken RTLD_GLOBAL: e.g. FreeBSD 4.0) ++#XLIBS = -L/usr/X11R6/lib -lXext -lXmu -lX11 -lXi ++ ++# Where to find Tcl/Tk headers ++# This must the same version as for LablTk ++TKINCLUDES = @TKINCLUDES@ ++# Tcl/Tk libs (for broken RTLD_GLOBAL: e.g. FreeBSD 4.0) ++#TKLIBS = -L/usr/local/lib -ltk84 -ltcl84 ++ ++# Where to find OpenGL/Mesa/Glut headers and libraries ++GLINCLUDES = ++GLLIBS = -lGL -lGLU ++GLUTLIBS = -lglut ++# The following libraries may be required (try to add them one at a time) ++#GLLIBS = -lGL -lGLU -lXmu -lXext -lXi -lcipher -lpthread ++ ++# How to index a library after installing (ranlib required on MacOSX) ++RANLIB = : ++#RANLIB = ranlib ++ ++##### Uncomment these for windows ++#TKLIBS = tk83.lib tcl83.lib gdi32.lib user32.lib ++#GLLIBS = opengl32.lib glu32.lib ++#TOOLCHAIN = msvc ++#XA = .lib ++#XB = .bat ++#XE = .exe ++#XO = .obj ++#XS = .dll ++ ++##### Adjust these if non standard ++ ++# The Objective Caml library directory ++#LIBDIR = `ocamlc -where` ++ ++# Where to put dlls (if dynamic loading available) ++DLLDIR = @DLLDIR@ ++ ++# Where to put LablGL (standard) ++INSTALLDIR = @INSTALLDIR@ ++ ++# Where is Togl (default) ++#TOGLDIR = Togl ++ ++# C Compiler options ++#COPTS = -c -O +diff -Naur lablGL.ori/META lablGL/META +--- lablGL.ori/META 1970-01-01 01:00:00.000000000 +0100 ++++ lablGL/META 2013-06-02 22:00:59.000000000 +0200 +@@ -0,0 +1,21 @@ ++description = "Bindings for OpenGL graphics engines" ++version = "1.04-1" ++archive(byte) = "lablgl.cma" ++archive(native) = "lablgl.cmxa" ++ ++#package "togl" ( ++# description = "OpenGL widget for labltk" ++# version = "1.01" ++# requires = "lablgl, labltk" ++# archive(byte) = "togl.cma" ++# archive(native) = "togl.cmxa" ++#) ++ ++package "glut" ( ++ description = "Platform-independent OpenGL window" ++ version = "1.01" ++ requires = "lablgl" ++ archive(byte) = "lablglut.cma" ++ archive(native) = "lablglut.cmxa" ++) ++ +diff -Naur lablGL.ori/META~ lablGL/META~ +--- lablGL.ori/META~ 1970-01-01 01:00:00.000000000 +0100 ++++ lablGL/META~ 2013-06-02 21:59:17.000000000 +0200 +@@ -0,0 +1,21 @@ ++description = "Bindings for OpenGL graphics engines" ++version = "1.04-1" ++archive(byte) = "lablgl.cma" ++archive(native) = "lablgl.cmxa" ++ ++#package "togl" ( ++# description = "OpenGL widget for labltk" ++# version = "1.01" ++# requires = "lablGL, labltk" ++# archive(byte) = "togl.cma" ++# archive(native) = "togl.cmxa" ++#) ++ ++package "glut" ( ++ description = "Platform-independent OpenGL window" ++ version = "1.01" ++ requires = "lablGL" ++ archive(byte) = "lablglut.cma" ++ archive(native) = "lablglut.cmxa" ++) ++ diff --git a/pkgs/development/ocaml-modules/lablgl/default.nix b/pkgs/development/ocaml-modules/lablgl/default.nix new file mode 100644 index 00000000000..a739e4a7146 --- /dev/null +++ b/pkgs/development/ocaml-modules/lablgl/default.nix @@ -0,0 +1,45 @@ +{stdenv, fetchurl, ocaml, lablgtk, findlib, mesa, freeglut } : + +let + ocaml_version = (builtins.parseDrvName ocaml.name).version; + pname = "lablgl"; + version = "1.04-1"; +in + +stdenv.mkDerivation { + name = "${pname}-${version}"; + + src = fetchurl { + url = "http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/dist/lablgl-20120306.tar.gz"; + sha256 = "1w5di2n38h7fkrf668zphnramygwl7ybjhrmww3pi9jcf9apa09r"; + }; + + buildInputs = [ocaml findlib lablgtk mesa freeglut ]; + + patches = [ ./Makefile.config.patch ]; + + preConfigure = '' + substituteInPlace Makefile.config \ + --subst-var-by BINDIR $out/bin \ + --subst-var-by INSTALLDIR $out/lib/ocaml/${ocaml_version}/site-lib/lablgl \ + --subst-var-by DLLDIR $out/lib/ocaml/${ocaml_version}/site-lib/lablgl/stublibs \ + --subst-var-by TKINCLUDES "" \ + --subst-var-by XINCLUDES "" + ''; + + createFindlibDestdir = true; + + #makeFlags = "BINDIR=$(out)/bin MANDIR=$(out)/usr/share/man/man1 DYPGENLIBDIR=$(out)/lib/ocaml/${ocaml_version}/site-lib"; + buildFlags = "lib libopt glut glutopt"; + + postInstall = '' + cp ./META $out/lib/ocaml/${ocaml_version}/site-lib/lablgl + ''; + + meta = { + homepage = http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgl.html; + description = "OpenGL bindings for ocaml"; + license = "GnuGPLV2"; +# maintainers = [ stdenv.lib.maintainers.roconnor ]; + }; +} diff --git a/pkgs/development/ocaml-modules/lablgtk/default.nix b/pkgs/development/ocaml-modules/lablgtk/default.nix index 8a51c216ab4..a62f4ab9ae9 100644 --- a/pkgs/development/ocaml-modules/lablgtk/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk/default.nix @@ -3,25 +3,26 @@ let ocaml_version = (builtins.parseDrvName ocaml.name).version; pname = "lablgtk"; - version = "2.14.2"; + version = "2.16.0"; in stdenv.mkDerivation (rec { name = "${pname}-${version}"; src = fetchurl { - url = "http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/${name}.tar.gz"; - sha256 = "1fnh0amm7lwgyjdhmlqgsp62gwlar1140425yc1j6inwmgnsp0a9"; + url = "https://forge.ocamlcore.org/frs/download.php/979/${name}.tar.gz"; + sha256 = "a0ea9752eb257dadcfc2914408fff339d4c34357802f02c63329dd41b777de2f"; }; buildInputs = [ocaml findlib pkgconfig gtk libgnomecanvas libglade gtksourceview]; - patches = [ ./META.patch ]; + # patches = [ ./META.patch ]; configureFlags = "--with-libdir=$(out)/lib/ocaml/${ocaml_version}/site-lib"; buildFlags = "world"; - postInstall = '' - ocamlfind install lablgtk2 META + preInstall = '' + mkdir -p $out/lib/ocaml/${ocaml_version}/site-lib + export OCAMLPATH=$out/lib/ocaml/${ocaml_version}/site-lib/:$OCAMLPATH ''; meta = { diff --git a/pkgs/development/ocaml-modules/ocaml-cairo/META.patch b/pkgs/development/ocaml-modules/ocaml-cairo/META.patch new file mode 100644 index 00000000000..ba6e5927b00 --- /dev/null +++ b/pkgs/development/ocaml-modules/ocaml-cairo/META.patch @@ -0,0 +1,16 @@ +diff -Naur cairo-ocaml-1.2.0.ori/META cairo-ocaml-1.2.0/META +--- cairo-ocaml-1.2.0.ori/META 1970-01-01 01:00:00.000000000 +0100 ++++ cairo-ocaml-1.2.0/META 2013-06-04 03:31:32.000000000 +0200 +@@ -0,0 +1,12 @@ ++name = "cairo-ocaml" ++description = "Bindings to the cairo library." ++version = "@VERSION@" ++archive(byte) = "cairo.cma" ++archive(native) = "cairo.cmxa" ++requires = "bigarray" ++ ++package "lablgtk2" ( ++ requires = "cairo lablgtk2" ++ archive(byte) = "cairo_lablgtk.cma" ++ archive(native) = "cairo_lablgtk.cmxa" ++) diff --git a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix new file mode 100644 index 00000000000..8f19847680b --- /dev/null +++ b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix @@ -0,0 +1,44 @@ +{stdenv, fetchurl, automake, ocaml, autoconf, gnum4, pkgconfig, freetype, lablgtk, unzip, cairo, findlib, gdk_pixbuf, glib, gtk, pango }: + +let + ocaml_version = (builtins.parseDrvName ocaml.name).version; + pname = "ocaml-cairo"; + version = "1.2.0"; +in + +stdenv.mkDerivation { + name = "${pname}-${version}"; + + src = fetchurl { + url = "http://cgit.freedesktop.org/cairo-ocaml/snapshot/cairo-ocaml-${version}.zip"; + sha256 = "2d59678e322c331e3f4bc02a77240fce4a0917acb0d3ae75953a6ac62d70a125"; + }; + + patches = [ ./META.patch ]; + + buildInputs = [ocaml automake gnum4 autoconf unzip pkgconfig findlib freetype lablgtk cairo gdk_pixbuf gtk pango ]; + + createFindlibDestdir = true; + + preConfigure = '' + aclocal -I support + autoconf + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE `pkg-config --cflags cairo gdk-pixbuf glib gtk+ pango`" + export LABLGTKDIR=${lablgtk}/lib/ocaml/${ocaml_version}/site-lib/lablgtk2 + cp ${lablgtk}/lib/ocaml/${ocaml_version}/site-lib/lablgtk2/pango.ml ./src + cp ${lablgtk}/lib/ocaml/${ocaml_version}/site-lib/lablgtk2/gaux.ml ./src + ''; + + postInstall = '' + cp META $out/lib/ocaml/${ocaml_version}/site-lib/cairo/ + ''; + + makeFlags = "INSTALLDIR=$(out)/lib/ocaml/${ocaml_version}/site-lib/cairo"; + + meta = { + homepage = http://cairographics.org/cairo-ocaml; + description = "ocaml bindings for cairo library"; + license = "GnuGPLV2"; +# maintainers = [ stdenv.lib.maintainers.roconnor ]; + }; +} diff --git a/pkgs/development/ocaml-modules/ocamlnet/configure.patch b/pkgs/development/ocaml-modules/ocamlnet/configure.patch new file mode 100644 index 00000000000..38b240f3c2c --- /dev/null +++ b/pkgs/development/ocaml-modules/ocamlnet/configure.patch @@ -0,0 +1,63 @@ +diff -Naur ocamlnet-3.6.3.ori/configure ocamlnet-3.6.3/configure +--- ocamlnet-3.6.3.ori/configure 2013-01-14 00:04:59.000000000 +0000 ++++ ocamlnet-3.6.3/configure 2013-06-02 21:33:08.000000000 +0000 +@@ -642,59 +642,6 @@ + exit 1 + fi + +- printf "%s" "Checking whether lablgtk2 has GMain.Io.remove... " +- mkdir -p tmp +- cat <tmp/gtk.ml +-let _ = GMain.Io.remove;; +-EOF +- +- if ocamlfind ocamlc -package lablgtk2 -c tmp/gtk.ml >/dev/null 2>/dev/null; +- then +- echo "yes" +- else +- echo "no" +- echo "Your version of lablgtk2 is too old!" +- exit 1 +- fi +- +- printf "%s" "Checking whether lablgtk2 has GMain.Io.add_watch with list support... " +- mkdir -p tmp +- cat <<'EOF' >tmp/gtk.ml +-open GMain.Io +-let _ = (add_watch : cond:condition list -> callback:(condition list -> bool) -> ?prio:int -> channel -> id);; +-exit 0 +-EOF +- # Note: this newer API is never broken in the sense checked below, i.e. +- # such lablgtk2 versions do not exist. +- if ocamlfind ocamlc -package unix,lablgtk2 -linkpkg -o tmp/gtk tmp/gtk.ml >/dev/null 2>/dev/null && tmp/gtk; then +- echo "yes" +- gtk2_io_add_watch_supports_lists="-ppopt -DGTK2_IO_ADD_WATCH_SUPPORTS_LISTS" +- else +- echo "no" +- printf "%s" "Checking whether lablgtk2's GMain.Io.add_watch is broken... " +- mkdir -p tmp +- cat <<'EOF' >tmp/gtk.ml +-GMain.Main.init();; +-let ch = GMain.Io.channel_of_descr (Unix.stdout) in +-let w = GMain.Io.add_watch +- ~cond:`OUT ~callback:(fun () -> true) ch in +-(* add_watch is broken when it just returns Val_unit, and ok when it +- * returns a positive int +- *) +-if (Obj.magic w : int) > 0 then +- exit 0 +-else +- exit 1 +-EOF +- if ocamlfind ocamlc -package unix,lablgtk2 -linkpkg -o tmp/gtk tmp/gtk.ml >/dev/null 2>/dev/null && tmp/gtk; then +- echo "no" +- else +- echo "yes" +- echo "You should apply the patch-ab-ml_glib.c to lablgtk2 to fix this!" +- exit 1 +- fi +- fi +- + for f in Makefile uq_gtk.ml uq_gtk.mli uq_gtk_helper.ml; do + rm -f src/equeue-gtk2/$f + ln -s ../equeue-gtk1/$f src/equeue-gtk2 diff --git a/pkgs/development/ocaml-modules/ocamlnet/default.nix b/pkgs/development/ocaml-modules/ocamlnet/default.nix index 4d9e934b628..c1960d4706e 100644 --- a/pkgs/development/ocaml-modules/ocamlnet/default.nix +++ b/pkgs/development/ocaml-modules/ocamlnet/default.nix @@ -1,18 +1,22 @@ -{stdenv, fetchurl, ncurses, ocaml, findlib, ocaml_pcre, camlzip, openssl, ocaml_ssl}: +{stdenv, fetchurl, ncurses, ocaml, findlib, ocaml_pcre, camlzip, openssl, ocaml_ssl, lablgtk, cryptokit }: let ocaml_version = (builtins.parseDrvName ocaml.name).version; in stdenv.mkDerivation { - name = "ocamlnet-3.6"; + name = "ocamlnet-3.6.3"; src = fetchurl { - url = http://download.camlcity.org/download/ocamlnet-3.6.tar.gz; - sha256 = "306c20aee6512be3564c0f39872b70f929c06e1e893cfcf528ac47ae35cf7a69"; + url = http://download.camlcity.org/download/ocamlnet-3.6.3.tar.gz; + sha256 = "c62fe0a4db6c63c04e24c8d76bcb504054f0b59a7a41c1abcbb8dd504afc9f29"; }; - buildInputs = [ncurses ocaml findlib ocaml_pcre camlzip openssl ocaml_ssl]; + buildInputs = [ncurses ocaml findlib ocaml_pcre camlzip openssl ocaml_ssl lablgtk cryptokit]; + + propagatedbuildInputs = [ncurses ocaml_pcre camlzip openssl ocaml_ssl lablgtk cryptokit]; + + patches = [ ./configure.patch ]; createFindlibDestdir = true; @@ -23,6 +27,10 @@ stdenv.mkDerivation { -bindir $out/bin -enable-ssl -enable-zip + -enable-pcre + -enable-crypto + -disable-gtk2 + -with-nethttpd -datadir $out/lib/ocaml/${ocaml_version}/ocamlnet ) ''; diff --git a/pkgs/development/ocaml-modules/sqlite3/default.nix b/pkgs/development/ocaml-modules/sqlite3/default.nix index a01660216bb..63dc06634d7 100644 --- a/pkgs/development/ocaml-modules/sqlite3/default.nix +++ b/pkgs/development/ocaml-modules/sqlite3/default.nix @@ -1,18 +1,19 @@ -{stdenv, fetchurl, sqlite, ocaml, findlib}: +{stdenv, fetchurl, sqlite, ocaml, findlib, pkgconfig}: stdenv.mkDerivation { - name = "ocaml-sqlite3-1.6.3"; + name = "ocaml-sqlite3-2.0.4"; src = fetchurl { - url = https://bitbucket.org/mmottl/sqlite3-ocaml/downloads/sqlite3-ocaml-1.6.3.tar.gz; - sha256 = "004wysf80bmb8r4yaa648v0bqrh2ry3kzy763gdksw4n15blghv5"; + url = https://bitbucket.org/mmottl/sqlite3-ocaml/downloads/sqlite3-ocaml-2.0.4.tar.gz; + sha256 = "51ccb4c7a240eb40652c59e1770cfe1827dfa1eb926c969d19ff414aef4e80a1"; }; - buildInputs = [ocaml findlib]; + buildInputs = [ocaml findlib pkgconfig ]; - configureFlags = "--with-sqlite3=${sqlite}"; + #configureFlags = "--with-sqlite3=${sqlite}"; preConfigure = '' + export PKG_CONFIG_PATH=${sqlite}/lib/pkgconfig/ export OCAMLPATH=$OCAMLPATH:$OCAMLFIND_DESTDIR mkdir -p $out/bin ''; diff --git a/pkgs/development/tools/documentation/haddock/2.13.2.1.nix b/pkgs/development/tools/documentation/haddock/2.13.2.1.nix new file mode 100644 index 00000000000..3cac6e13323 --- /dev/null +++ b/pkgs/development/tools/documentation/haddock/2.13.2.1.nix @@ -0,0 +1,20 @@ +{ cabal, alex, Cabal, deepseq, filepath, ghcPaths, happy, xhtml }: + +cabal.mkDerivation (self: { + pname = "haddock"; + version = "2.13.2.1"; + sha256 = "0kpk3bmlyd7cb6s39ix8s0ak65xhrln9mg481y3h24lf5syy5ky9"; + isLibrary = true; + isExecutable = true; + buildDepends = [ Cabal deepseq filepath ghcPaths xhtml ]; + testDepends = [ Cabal deepseq filepath ]; + buildTools = [ alex happy ]; + doCheck = false; + meta = { + homepage = "http://www.haskell.org/haddock/"; + description = "A documentation-generation tool for Haskell libraries"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix index 96803e139ba..05dcb2aa119 100644 --- a/pkgs/development/tools/haskell/cabal2nix/default.nix +++ b/pkgs/development/tools/haskell/cabal2nix/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self: { pname = "cabal2nix"; - version = "1.51"; - sha256 = "0la1bhdxrzn1phjyca7h54vimwf4jy5ryclwrnivbcxkncrk9lig"; + version = "1.52"; + sha256 = "1w38qxwbwaq37c7vypydwjjhgrn9vbaqnnk7b2y0pm8n2fh78z1s"; isLibrary = false; isExecutable = true; buildDepends = [ Cabal filepath hackageDb HTTP mtl regexPosix ]; diff --git a/pkgs/development/tools/haskell/timeplot/default.nix b/pkgs/development/tools/haskell/timeplot/default.nix index 62a03cae14e..b2f6316dd99 100644 --- a/pkgs/development/tools/haskell/timeplot/default.nix +++ b/pkgs/development/tools/haskell/timeplot/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "timeplot"; - version = "1.0.20"; - sha256 = "0zlpqfd1l1ss9jjjb967a7jnn1h560ygv8zfiikcx6iagsjmysh2"; + version = "1.0.21"; + sha256 = "0x9f95w235yijp98xx9nry0ibsxr0iyshk6cd89n51xrk1zpk41l"; isLibrary = false; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix b/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix new file mode 100644 index 00000000000..48a6b3c1f64 --- /dev/null +++ b/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix @@ -0,0 +1,37 @@ +{stdenv, fetchurl, makeWrapper, ocaml, ncurses}: +let + pname = "omake"; + version = "0.9.8.6-0.rc1"; + webpage = "http://omake.metaprl.org"; +in +stdenv.mkDerivation { + + name = "${pname}-${version}"; + + src = fetchurl { + url = "${webpage}/downloads/${pname}-${version}.tar.gz"; + sha256 = "1sas02pbj56m7wi5vf3vqrrpr4ynxymw2a8ybvfj2dkjf7q9ii13"; + }; + patchFlags = "-p0"; + patches = [ ./warn.patch ]; + + buildInputs = [ ocaml makeWrapper ncurses ]; + + phases = "unpackPhase patchPhase buildPhase"; + buildPhase = '' + make bootstrap + make PREFIX=$out all + make PREFIX=$out install + ''; +# prefixKey = "-prefix "; +# +# configureFlags = if transitional then "--transitional" else "--strict"; +# +# buildFlags = "world.opt"; + + meta = { + description = "Omake build system"; + homepage = "${webpage}"; + license = "GPL"; + }; +} diff --git a/pkgs/development/tools/ocaml/omake/warn.patch b/pkgs/development/tools/ocaml/omake/warn.patch new file mode 100644 index 00000000000..4459e89d7f9 --- /dev/null +++ b/pkgs/development/tools/ocaml/omake/warn.patch @@ -0,0 +1,10 @@ +diff -p1 -aur ../omake-0.9.8.6.ori/lib/build/OCaml.om ./lib/build/OCaml.om +--- ../omake-0.9.8.6.ori/lib/build/OCaml.om 2008-03-05 01:07:25.000000000 +0000 ++++ ./lib/build/OCaml.om 2013-06-01 15:52:37.000000000 +0000 +@@ -178,3 +178,3 @@ declare OCAMLDEPFLAGS + public.OCAMLPPFLAGS = +-public.OCAMLFLAGS = -warn-error A ++public.OCAMLFLAGS = + public.OCAMLCFLAGS = -g +Seulement dans ./lib/build: OCaml.om~ +Seulement dans .: warn.patch diff --git a/pkgs/lib/licenses.nix b/pkgs/lib/licenses.nix index 89edcd738f4..0669bc3f5c3 100644 --- a/pkgs/lib/licenses.nix +++ b/pkgs/lib/licenses.nix @@ -16,6 +16,18 @@ url = https://www.gnu.org/licenses/agpl.html; }; + amd = { + shortName = "amd"; + fullName = "AMD License Agreement"; + url = "http://developer.amd.com/amd-license-agreement/"; + }; + + amdadl = { + shortName = "amd-adl"; + fullName = "amd-adl license"; + url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/licenses/AMD-ADL?revision=1.1"; + }; + asl20 = { shortName = "ASL2.0"; fullName = "Apache Software License 2.0"; diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix index e861203fb15..5e506ce25c2 100644 --- a/pkgs/lib/maintainers.nix +++ b/pkgs/lib/maintainers.nix @@ -8,6 +8,7 @@ all = "Nix Committers "; amiddelk = "Arie Middelkoop "; andres = "Andres Loeh "; + amorsillo = "Andrew Morsillo "; antono = "Antono Vasiljev "; astsmtl = "Alexander Tsamutali "; aszlig = "aszlig "; @@ -22,6 +23,7 @@ goibhniu = "Cillian de Róiste "; guibert = "David Guibert "; iElectric = "Domen Kozar "; + lovek323 = "Jason O'Conal "; jcumming = "Jack Cummings "; kkallio = "Karn Kallio "; ludo = "Ludovic Courtès "; diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index ac171b2ff81..2117aaa82a7 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, libjpeg, libpng, libtiff, zlib, pkgconfig, fontconfig, openssl, lcms, freetype +{ stdenv, fetchurl, libjpeg, libpng, libtiff, zlib, pkgconfig, fontconfig +, openssl, lcms, freetype, libiconvOrEmpty , x11Support, x11 ? null , cupsSupport ? false, cups ? null , gnuFork ? true @@ -74,7 +75,9 @@ stdenv.mkDerivation rec { # ... add other fonts here ]; - buildInputs = [libjpeg libpng libtiff zlib pkgconfig fontconfig openssl lcms] + buildInputs + = [ libjpeg libpng libtiff zlib pkgconfig fontconfig openssl lcms ] + ++ libiconvOrEmpty ++ stdenv.lib.optionals x11Support [x11 freetype] ++ stdenv.lib.optional cupsSupport cups; diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index b0c70d95821..3a24bee43de 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -126,4 +126,23 @@ in }; }; + syntastic = stdenv.mkDerivation { + name = "vim-syntastic-3.0.0"; + + src = fetchurl { + url = "https://github.com/scrooloose/syntastic/archive/3.0.0.tar.gz"; + sha256 = "0nf69wpa8qa7xcfvywy2khmazs4dn1i2nal9qwjh2bzrbwbbkdyl"; + }; + + buildPhase = ""; + + installPhase = '' + mkdir -p "$out/vim-plugins" + cp -R autoload "$out/vim-plugins" + cp -R doc "$out/vim-plugins" + cp -R plugin "$out/vim-plugins" + cp -R syntax_checkers "$out/vim-plugins" + ''; + }; } + diff --git a/pkgs/os-specific/linux/kernel/linux-3.9.nix b/pkgs/os-specific/linux/kernel/linux-3.9.nix index e87d3c3198f..ed7451dfe5d 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.9.nix @@ -253,7 +253,7 @@ in import ./generic.nix ( rec { - version = "3.9.5"; + version = "3.9.6"; testing = false; preConfigure = '' @@ -262,7 +262,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "05y3wrvady60p8ksjwwa5c2jia2ax9q0p7lhr62yafywh5piyfbw"; + sha256 = "0spba7qkf56j233r84y23xl7d44ndvw5ja7h3pfhsq861dypcc0i"; }; config = configWithPlatform stdenv.platform; diff --git a/pkgs/os-specific/linux/psmouse-alps/default.nix b/pkgs/os-specific/linux/psmouse-alps/default.nix new file mode 100644 index 00000000000..834acd72ef2 --- /dev/null +++ b/pkgs/os-specific/linux/psmouse-alps/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, kernelDev, zlib }: + +/* Only useful for kernels 3.2 to 3.5. + Fails to build in 3.8. + 3.9 upstream already includes a proper alps driver for this */ + +let + ver = "1.3"; + bname = "psmouse-alps-${ver}"; +in +stdenv.mkDerivation { + name = "psmouse-alps-${kernelDev.version}-${ver}"; + + src = fetchurl { + url = http://www.dahetral.com/public-download/alps-psmouse-dlkm-for-3-2-and-3-5/at_download/file; + name = "${bname}-alt.tar.bz2"; + sha256 = "1ghr8xcyidz31isxbwrbcr9rvxi4ad2idwmb3byar9n2ig116cxp"; + }; + + buildPhase = '' + cd src/${bname}/src + make -C ${kernelDev}/lib/modules/${kernelDev.modDirVersion}/build \ + SUBDIRS=`pwd` INSTALL_PATH=$out + ''; + + installPhase = '' + make -C ${kernelDev}/lib/modules/${kernelDev.modDirVersion}/build \ + INSTALL_MOD_PATH=$out SUBDIRS=`pwd` modules_install + ''; + + meta = { + description = "ALPS dlkm driver with all known touchpads"; + homepage = http://www.dahetral.com/public-download/alps-psmouse-dlkm-for-3-2-and-3-5/view; + license = "GPLv2"; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [viric]; + }; +} diff --git a/pkgs/servers/monitoring/zabbix/2.0.nix b/pkgs/servers/monitoring/zabbix/2.0.nix index 6b0a22962a3..5131e8a2e42 100644 --- a/pkgs/servers/monitoring/zabbix/2.0.nix +++ b/pkgs/servers/monitoring/zabbix/2.0.nix @@ -2,11 +2,11 @@ let - version = "2.0.4"; + version = "2.0.6"; src = fetchurl { url = "mirror://sourceforge/zabbix/zabbix-${version}.tar.gz"; - sha256 = "0l8038j6ldsv0ywrs2j69ybjl2zv4qw42791glqvcabjj8x24m3m"; + sha256 = "1y7dp9rqxkn8ik7bvk2qysz3zp3r07kmax5avlf9jf1x7pkagps6"; }; preConfigure = diff --git a/pkgs/servers/nosql/riak/1.3.1.nix b/pkgs/servers/nosql/riak/1.3.1.nix index 0275cb452de..c71283570e0 100644 --- a/pkgs/servers/nosql/riak/1.3.1.nix +++ b/pkgs/servers/nosql/riak/1.3.1.nix @@ -7,8 +7,8 @@ let sha256 = "a69093fc5df1b79f58645048b9571c755e00c3ca14dfd27f9f1cae2c6e628f01"; }; leveldb = fetchurl { - url = "https://github.com/basho/leveldb/zipball/1.3.1"; - sha256 = "10glzfsxs1167n7hmzl106xkfmn1qdjcqvillga2r5dsmn6vvi8a"; + url = "https://github.com/basho/leveldb/archive/1.3.1.zip"; + sha256 = "dc48ba2b44fca11888ea90695d385c494e1a3abd84a6b266b07fdc160ab2ef64"; }; }; in @@ -25,13 +25,14 @@ stdenv.mkDerivation rec { ln -sv ${srcs.leveldb} $sourceRoot/deps/eleveldb/c_src/leveldb.zip pushd $sourceRoot/deps/eleveldb/c_src/ unzip leveldb.zip - mv basho-leveldb-* leveldb + mv leveldb-* leveldb cd ../../ mkdir riaknostic/deps cp -R lager riaknostic/deps cp -R getopt riaknostic/deps cp -R meck riaknostic/deps popd + patchShebangs . ''; buildPhase = '' diff --git a/pkgs/tools/filesystems/ntfs-3g/default.nix b/pkgs/tools/filesystems/ntfs-3g/default.nix index 50ebb1b068a..f6177fd8976 100644 --- a/pkgs/tools/filesystems/ntfs-3g/default.nix +++ b/pkgs/tools/filesystems/ntfs-3g/default.nix @@ -38,5 +38,6 @@ stdenv.mkDerivation rec { homepage = http://www.tuxera.com/community/; description = "FUSE-base NTFS driver with full write support"; maintainers = [ stdenv.lib.maintainers.urkud ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/filesystems/unionfs-fuse/default.nix b/pkgs/tools/filesystems/unionfs-fuse/default.nix index 5b681ab170c..4da1a84e937 100644 --- a/pkgs/tools/filesystems/unionfs-fuse/default.nix +++ b/pkgs/tools/filesystems/unionfs-fuse/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { homepage = http://podgorny.cz/moin/UnionFsFuse; license = stdenv.lib.licenses.bsd3; maintainers = [ stdenv.lib.maintainers.shlevy ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index d66a156c33e..73bed52654f 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "nix-1.5.2pre3091_772b709"; + name = "nix-1.5.3pre3141_1b6ee8f"; src = fetchurl { - url = "http://hydra.nixos.org/build/4796316/download/5/${name}.tar.xz"; - sha256 = "f1acf131842d9604d886d5f98aaa4739bea63536023d7287ce48613c38d49fbd"; + url = "http://hydra.nixos.org/build/5305802/download/5/${name}.tar.xz"; + sha256 = "834a0d23456331ac06b6117078f0b9bbeecbc8620d5f844b61455e3daac6ceb0"; }; nativeBuildInputs = [ perl pkgconfig ]; diff --git a/pkgs/tools/security/gnupg/default.nix b/pkgs/tools/security/gnupg/default.nix index b94e2e50a40..2cac2819c16 100644 --- a/pkgs/tools/security/gnupg/default.nix +++ b/pkgs/tools/security/gnupg/default.nix @@ -2,9 +2,9 @@ # 'echo "pinentry-program `which pinentry-gtk-2`" >> ~/.gnupg/gpg-agent.conf'. { fetchurl, stdenv, readline, zlib, libgpgerror, pth, libgcrypt, libassuan -, libksba, coreutils, useLdap ? true, openldap ? null -, useBzip2 ? true, bzip2 ? null, useUsb ? true, libusb ? null -, useCurl ? true, curl ? null +, libksba, coreutils, libiconvOrEmpty +, useLdap ? true, openldap ? null, useBzip2 ? true, bzip2 ? null +, useUsb ? true, libusb ? null, useCurl ? true, curl ? null }: assert useLdap -> (openldap != null); @@ -20,7 +20,9 @@ stdenv.mkDerivation rec { sha256 = "16mp0j5inrcqcb3fxbn0b3aamascy3n923wiy0y8marc0rzrp53f"; }; - buildInputs = [ readline zlib libgpgerror libgcrypt libassuan libksba pth ] + buildInputs + = [ readline zlib libgpgerror libgcrypt libassuan libksba pth ] + ++ libiconvOrEmpty ++ stdenv.lib.optional useLdap openldap ++ stdenv.lib.optional useBzip2 bzip2 ++ stdenv.lib.optional useUsb libusb @@ -28,6 +30,7 @@ stdenv.mkDerivation rec { patchPhase = '' find tests -type f | xargs sed -e 's@/bin/pwd@${coreutils}&@g' -i + find . -name pcsc-wrapper.c | xargs sed -i 's/typedef unsinged int pcsc_dword_t/typedef unsigned int pcsc_dword_t/' ''; checkPhase="GNUPGHOME=`pwd` ./agent/gpg-agent --daemon make check"; diff --git a/pkgs/tools/typesetting/patoline/default.nix b/pkgs/tools/typesetting/patoline/default.nix new file mode 100644 index 00000000000..a39105c8314 --- /dev/null +++ b/pkgs/tools/typesetting/patoline/default.nix @@ -0,0 +1,51 @@ + +{ stdenv, fetchurl, ncurses, mesa, freeglut, libzip, + ocaml, findlib, camomile, + dypgen, ocaml_sqlite3, camlzip, + lablgtk, camlimages, ocaml_cairo, + lablgl, ocamlnet, cryptokit, + ocaml_pcre }: + +let + ocaml_version = (builtins.parseDrvName ocaml.name).version; +in + +stdenv.mkDerivation { + name = "patoline-0.1"; + + src = fetchurl { + url = "http://lama.univ-savoie.fr/patoline/patoline-0.1.tar.bz"; + sha256 = "c5ac8dcb87ceecaf11876bd0dd425bd0f04d43265adc2cbcb1f1e82a78846d49"; + }; + + createFindlibDestdir = true; + + buildInputs = [ ocaml findlib dypgen camomile ocaml_sqlite3 camlzip + lablgtk camlimages ocaml_cairo + lablgl ocamlnet cryptokit + ocaml_pcre ncurses mesa freeglut libzip ]; + + propagatedbuildInputs = [ camomile + dypgen ocaml_sqlite3 camlzip + lablgtk camlimages ocaml_cairo + lablgl ocamlnet cryptokit + ocaml_pcre ncurses mesa freeglut libzip ]; + + buildPhase = '' + ocaml configure.ml \ + --prefix $out \ + --ocaml-libs $out/lib/ocaml/${ocaml_version}/site-lib \ + --ocamlfind-dir $out/lib/ocaml/${ocaml_version}/site-lib \ + --fonts-dir $out/share/patoline/fonts \ + --grammars-dir $out/share/patoline/grammars \ + --hyphen-dir $out/share/patoline/hyphen + + make + ''; + + + meta = { + homepage = http://patoline.com; + description = "Patoline ocaml based typesetting system"; + }; +} diff --git a/pkgs/tools/typesetting/tex/texlive/moderncv.nix b/pkgs/tools/typesetting/tex/texlive/moderncv.nix index e490d55bc5f..28329cff916 100644 --- a/pkgs/tools/typesetting/tex/texlive/moderncv.nix +++ b/pkgs/tools/typesetting/tex/texlive/moderncv.nix @@ -1,10 +1,10 @@ args: with args; rec { - version = "1.3.0"; + version = "1.5.1"; name = "moderncv-${version}"; src = fetchurl { url = "https://launchpad.net/moderncv/trunk/${version}/+download/moderncv-${version}.zip"; - sha256 = "0wdj90shi04v97b2d6chhvm9qrp0bcvsm46441730ils1y74wisq"; + sha256 = "0k26s0z8hmw3h09vnpndim7gigwh8q6n9nbbihb5qbrw5qg2yqck"; }; buildInputs = [texLive unzip]; diff --git a/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix b/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix new file mode 100644 index 00000000000..6139911623f --- /dev/null +++ b/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix @@ -0,0 +1,26 @@ +args: with args; +rec { + version = "0.7"; + name = "moderntimeline-${version}"; + src = fetchurl { + url = "http://www.ctan.org/tex-archive/macros/latex/contrib/moderntimeline.zip"; + sha256 = "0dxwybanj7qvbr69wgsllha1brq6qjsnjfff6nw4r3nijzvvh876"; + }; + + buildInputs = [texLive unzip]; + phaseNames = ["doCopy"]; + doCopy = fullDepEntry ('' + mkdir -p $out/texmf/tex/latex/moderntimeline $out/texmf/doc/moderntimeline $out/share + mv *.dtx *.ins $out/texmf/tex/latex/moderntimeline/ + mv *.pdf $out/texmf/doc/moderntimeline/ + ln -s $out/texmf* $out/share/ + '') ["minInit" "addInputs" "doUnpack" "defEnsureDir"]; + + meta = { + description = "the moderntimeline extensions for moderncv"; + maintainers = [ args.lib.maintainers.simons ]; + + # Actually, arch-independent.. + platforms = [] ; + }; +} diff --git a/pkgs/tools/typesetting/tex/texlive/pgf.nix b/pkgs/tools/typesetting/tex/texlive/pgf.nix index 61e2eb26c68..1f7abc126c3 100644 --- a/pkgs/tools/typesetting/tex/texlive/pgf.nix +++ b/pkgs/tools/typesetting/tex/texlive/pgf.nix @@ -1,11 +1,12 @@ args: with args; + rec { - name = "texlive-pgf-2007"; + name = "texlive-pgf-2010"; src = fetchurl { - url = "mirror://sourceforge/pgf/pgf-2.00.tar.gz"; - sha256 = "0j57niag4jb2k0iyrvjsannxljc3vkx0iag7zd35ilhiy4dh6264"; + url = "mirror://debian/pool/main/p/pgf/pgf_2.10.orig.tar.gz"; + sha256 = "642092e6b49df9e33bd901ac7eb7024ff235a29f43d27e78e5827ca3bc03f120"; }; propagatedBuildInputs = [texLiveLatexXColor texLive]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b63590e1096..db0f1281167 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -183,7 +183,6 @@ let ### Helper functions. - inherit lib config stdenvAdapters; inherit (lib) lowPrio hiPrio appendToName makeOverridable; @@ -203,6 +202,11 @@ let stringsWithDeps = lib.stringsWithDeps; + ### Nixpkgs maintainer tools + + nix-generate-from-cpan = callPackage ../../maintainers/scripts/nix-generate-from-cpan.nix { }; + + ### STANDARD ENVIRONMENT @@ -2001,7 +2005,6 @@ let ### SHELLS - bash = lowPrio (callPackage ../shells/bash { texinfo = null; }); @@ -2025,7 +2028,6 @@ let ### DEVELOPMENT / COMPILERS - abc = abcPatchable []; @@ -2637,6 +2639,7 @@ let julia = callPackage ../development/compilers/julia { liblapack = liblapack.override {shared = true;}; + mpfr = mpfr_3_1_2; fftw = fftw.override {pthreads = true;}; fftwSinglePrec = fftwSinglePrec.override {pthreads = true;}; }; @@ -2661,7 +2664,9 @@ let mlton = callPackage ../development/compilers/mlton { }; - mono = callPackage ../development/compilers/mono { }; + mono = callPackage ../development/compilers/mono { + inherit (xlibs) libX11; + }; monoDLLFixer = callPackage ../build-support/mono-dll-fixer { }; @@ -2715,12 +2720,22 @@ let camomile_0_8_2 = callPackage ../development/ocaml-modules/camomile/0.8.2.nix { }; camomile = callPackage ../development/ocaml-modules/camomile { }; + camlimages = callPackage ../development/ocaml-modules/camlimages { }; + + ocaml_cairo = callPackage ../development/ocaml-modules/ocaml-cairo { }; + cryptokit = callPackage ../development/ocaml-modules/cryptokit { }; findlib = callPackage ../development/tools/ocaml/findlib { }; + dypgen = callPackage ../development/ocaml-modules/dypgen { }; + + patoline = callPackage ../tools/typesetting/patoline { }; + gmetadom = callPackage ../development/ocaml-modules/gmetadom { }; + lablgl = callPackage ../development/ocaml-modules/lablgl { }; + lablgtk = callPackage ../development/ocaml-modules/lablgtk { inherit (gnome) libgnomecanvas libglade gtksourceview; }; @@ -2898,6 +2913,7 @@ let yasm = callPackage ../development/compilers/yasm { }; + ### DEVELOPMENT / INTERPRETERS acl2 = builderDefsPackage ../development/interpreters/acl2 { @@ -3090,6 +3106,27 @@ let ### DEVELOPMENT / MISC + amdadlsdk = callPackage ../development/misc/amdadl-sdk { }; + + amdappsdk26 = callPackage ../development/misc/amdapp-sdk { + version = "2.6"; + }; + + amdappsdk27 = callPackage ../development/misc/amdapp-sdk { + version = "2.7"; + }; + + amdappsdk28 = callPackage ../development/misc/amdapp-sdk { + version = "2.8"; + }; + + amdappsdk = amdappsdk28; + + amdappsdkFull = callPackage ../development/misc/amdapp-sdk { + version = "2.8"; + samples = true; + }; + avrgcclibc = callPackage ../development/misc/avr-gcc-with-avr-libc {}; avr8burnomat = callPackage ../development/misc/avr8-burn-omat { }; @@ -3123,7 +3160,6 @@ let ### DEVELOPMENT / TOOLS - antlr = callPackage ../development/tools/parsing/antlr/2.7.7.nix { }; antlr3 = callPackage ../development/tools/parsing/antlr { }; @@ -3406,6 +3442,7 @@ let noweb = callPackage ../development/tools/literate-programming/noweb { }; omake = callPackage ../development/tools/ocaml/omake { }; + omake_rc1 = callPackage ../development/tools/ocaml/omake/0.9.8.6-rc1.nix { }; openocd = callPackage ../development/tools/misc/openocd { }; @@ -3531,7 +3568,6 @@ let ### DEVELOPMENT / LIBRARIES - a52dec = callPackage ../development/libraries/a52dec { }; aacskeys = callPackage ../development/libraries/aacskeys { }; @@ -4010,6 +4046,7 @@ let #GMP ex-satellite, so better keep it near gmp mpfr = callPackage ../development/libraries/mpfr { }; + mpfr_3_1_2 = callPackage ../development/libraries/mpfr/3.1.2.nix { }; gst_all = { inherit (pkgs) gstreamer gnonlin gst_python qt_gstreamer; @@ -4099,7 +4136,9 @@ let gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf/2.26.x.nix { }; - gtk2 = callPackage ../development/libraries/gtk+/2.24.x.nix { }; + gtk2 = callPackage ../development/libraries/gtk+/2.24.x.nix { + cupsSupport = config.gtk2.cups or true; + }; gtk3 = lowPrio (callPackage ../development/libraries/gtk+/3.2.x.nix { }); gtk = pkgs.gtk2; @@ -4650,7 +4689,11 @@ let libunique = callPackage ../development/libraries/libunique/default.nix { }; - libusb = callPackage ../development/libraries/libusb { }; + libusb = callPackage ../development/libraries/libusb { + stdenv = if stdenv.isDarwin + then overrideGCC stdenv gccApple + else stdenv; + }; libusb1 = callPackage ../development/libraries/libusb1 { }; @@ -6248,6 +6291,8 @@ let perf = callPackage ../os-specific/linux/kernel/perf.nix { }; + psmouse_alps = callPackage ../os-specific/linux/psmouse-alps { }; + spl = callPackage ../os-specific/linux/spl/default.nix { }; sysprof = callPackage ../development/tools/profiling/sysprof { @@ -6627,6 +6672,7 @@ let zd1211fw = callPackage ../os-specific/linux/firmware/zd1211 { }; + ### DATA andagii = callPackage ../data/fonts/andagii {}; @@ -6907,6 +6953,10 @@ let cgit = callPackage ../applications/version-management/git-and-tools/cgit { }; + cgminer = callPackage ../applications/misc/cgminer { + amdappsdk = amdappsdk28; + }; + chatzilla = callPackage ../applications/networking/irc/chatzilla { xulrunner = firefox36Pkgs.xulrunner; }; @@ -7092,6 +7142,8 @@ let emms = callPackage ../applications/editors/emacs-modes/emms { }; + ess = callPackage ../applications/editors/emacs-modes/ess { }; + flymakeCursor = callPackage ../applications/editors/emacs-modes/flymake-cursor { }; gh = callPackage ../applications/editors/emacs-modes/gh { }; @@ -7182,6 +7234,8 @@ let keepassx = callPackage ../applications/misc/keepassx { }; + keepass = callPackage ../applications/misc/keepass { }; + # FIXME: Evince and other GNOME/GTK+ apps (e.g., Viking) provide # `share/icons/hicolor/icon-theme.cache'. Arbitrarily give this one a # higher priority. @@ -7786,6 +7840,31 @@ let mutt = callPackage ../applications/networking/mailreaders/mutt { }; + ruby_gpgme = callPackage ../development/libraries/ruby_gpgme { + ruby = ruby19; + hoe = rubyLibs.hoe; + }; + + ruby_ncursesw_sup = callPackage ../development/libraries/ruby_ncursesw_sup { }; + + sup = callPackage ../applications/networking/mailreaders/sup { + ruby = ruby19; + + chronic = rubyLibs.chronic; + gettext = rubyLibs.gettext; + gpgme = ruby_gpgme; + iconv = rubyLibs.iconv; + locale = rubyLibs.locale; + lockfile = rubyLibs.lockfile; + mime_types = rubyLibs.mime_types; + ncursesw_sup = ruby_ncursesw_sup; + rake = rubyLibs.rake_10_0_4; + rmail = rubyLibs.rmail; + text = rubyLibs.text; + trollop = rubyLibs.trollop; + xapian_full_alaveteli = rubyLibs.xapian_full_alaveteli_1_2_9_5; + }; + msmtp = callPackage ../applications/networking/msmtp { }; imapfilter = callPackage ../applications/networking/mailreaders/imapfilter.nix { @@ -8223,18 +8302,21 @@ let vimHugeX = vim_configurable; - vim_configurable = callPackage (import ../applications/editors/vim/configurable.nix) { - inherit (pkgs) fetchurl stdenv ncurses pkgconfig gettext composableDerivation lib config; - inherit (pkgs.xlibs) libX11 libXext libSM libXpm libXt libXaw libXau libXmu libICE; - inherit (pkgs) glib gtk; + vim_configurable = callPackage ../applications/editors/vim/configurable.nix { + inherit (pkgs) fetchurl stdenv ncurses pkgconfig gettext + composableDerivation lib config glib gtk python perl tcl ruby; + inherit (pkgs.xlibs) libX11 libXext libSM libXpm libXt libXaw libXau libXmu + libICE; + features = "huge"; # one of tiny, small, normal, big or huge - # optional features by passing - # python - # TODO mzschemeinterp perlinterp - inherit (pkgs) python perl tcl ruby /*x11*/; lua = pkgs.lua5; + gui = config.vim.gui or "auto"; + # optional features by flags flags = [ "python" "X11" ]; # only flag "X11" by now + + # so that we can use gccApple if we're building on darwin + inherit stdenvAdapters gccApple; }; vimLatest = vim_configurable.override { source = "latest"; }; vimNox = vim_configurable.override { source = "vim-nox"; }; @@ -8446,6 +8528,7 @@ let zynaddsubfx = callPackage ../applications/audio/zynaddsubfx { }; + ### GAMES alienarena = callPackage ../games/alienarena { }; @@ -8741,7 +8824,6 @@ let ### DESKTOP ENVIRONMENTS - enlightenment = callPackage ../desktops/enlightenment { }; e17 = recurseIntoAttrs ( @@ -8907,6 +8989,7 @@ let xfce = xfce4_10; xfce4_10 = recurseIntoAttrs (import ../desktops/xfce { inherit pkgs newScope; }); + ### SCIENCE celestia = callPackage ../applications/science/astronomy/celestia { @@ -8926,6 +9009,7 @@ let stellarium = callPackage ../applications/science/astronomy/stellarium { }; + ### SCIENCE/GEOMETRY drgeo = builderDefsPackage (import ../applications/science/geometry/drgeo) { @@ -9008,6 +9092,7 @@ let cmake = cmakeCurses; }); + ### SCIENCE/LOGIC coq = callPackage ../applications/science/logic/coq { @@ -9084,6 +9169,7 @@ let tptp = callPackage ../applications/science/logic/tptp {}; + ### SCIENCE / ELECTRONICS eagle = callPackage_i686 ../applications/science/electronics/eagle { }; @@ -9136,6 +9222,7 @@ let yacas = callPackage ../applications/science/math/yacas { }; + ### SCIENCE / MISC boinc = callPackage ../applications/science/misc/boinc { }; @@ -9148,6 +9235,7 @@ let vite = callPackage ../applications/science/misc/vite { }; + ### MISC atari800 = callPackage ../misc/emulators/atari800 { }; @@ -9241,13 +9329,10 @@ let stateDir = config.nix.stateDir or "/nix/var"; }; - nixUnstable = nixStable; - /* nixUnstable = callPackage ../tools/package-management/nix/unstable.nix { storeDir = config.nix.storeDir or "/nix/store"; stateDir = config.nix.stateDir or "/nix/var"; }; - */ nut = callPackage ../applications/misc/nut { }; @@ -9356,7 +9441,8 @@ let texLiveFull = lib.setName "texlive-full" (texLiveAggregationFun { paths = [ texLive texLiveExtra lmodern texLiveCMSuper texLiveLatexXColor - texLivePGF texLiveBeamer texLiveModerncv tipa tex4ht texinfo5 ]; + texLivePGF texLiveBeamer texLiveModerncv tipa tex4ht texinfo5 + texLiveModerntimeline ]; }); /* Look in configurations/misc/raskin.nix for usage example (around revisions @@ -9404,6 +9490,10 @@ let inherit texLive unzip; }; + texLiveModerntimeline = builderDefsPackage (import ../tools/typesetting/tex/texlive/moderntimeline.nix) { + inherit texLive unzip; + }; + thinkfan = callPackage ../tools/system/thinkfan { }; vice = callPackage ../misc/emulators/vice { }; @@ -9450,6 +9540,28 @@ let inherit (stdenv) mkDerivation; }; + # patoline requires a rather large ocaml compilation environment. + # this is why it is build as an environment and not just a normal package. + # remark : the emacs mode is also installed, but you have to adjust your load-path. + PatolineEnv = pack: myEnvFun { + name = "patoline"; + buildInputs = [ stdenv ncurses mesa freeglut libzip gcc + pack.ocaml pack.findlib pack.camomile + pack.dypgen pack.ocaml_sqlite3 pack.camlzip + pack.lablgtk pack.camlimages pack.ocaml_cairo + pack.lablgl pack.ocamlnet pack.cryptokit + pack.ocaml_pcre pack.patoline + ]; + # this is to circumvent the bug with libgcc_s.so.1 which is + # not found when using thread + extraCmds = '' + LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${gcc.gcc}/lib + export LD_LIBRARY_PATH + ''; + }; + + patoline = PatolineEnv ocamlPackages_4_00_1; + znc = callPackage ../applications/networking/znc { }; zsnes = callPackage_i686 ../misc/emulators/zsnes { diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 23573478e39..d2cfbf38f98 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -98,6 +98,11 @@ jailbreakCabal = self.jailbreakCabal.override { Cabal = self.disableTest self.Cabal_1_14_0; }; cabal2nix = self.cabal2nix.override { Cabal = self.Cabal_1_16_0_3; hackageDb = self.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; }; bmp = self.bmp_1_2_2_1; + cabalInstall_1_16_0_2 = self.cabalInstall_1_16_0_2.override { + Cabal = self.Cabal_1_16_0_3; zlib = self.zlib_0_5_3_3; + mtl = self.mtl_2_1_2; + HTTP = self.HTTP_4000_1_1.override { mtl = self.mtl_2_1_2; }; + }; }; ghc6121Prefs = @@ -111,6 +116,12 @@ jailbreakCabal = self.jailbreakCabal.override { Cabal = self.disableTest self.Cabal_1_14_0; }; cabal2nix = self.cabal2nix.override { Cabal = self.Cabal_1_16_0_3; hackageDb = self.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; }; bmp = self.bmp_1_2_2_1; + cabalInstall_1_16_0_2 = self.cabalInstall_1_16_0_2.override { + Cabal = self.Cabal_1_16_0_3; + zlib = self.zlib_0_5_3_3; + mtl = self.mtl_2_1_2; + HTTP = self.HTTP_4000_1_1.override { mtl = self.mtl_2_1_2; }; + }; }; ghc6104Prefs = @@ -125,6 +136,13 @@ # deviating from Haskell platform here, to make some packages (notably statistics) compile jailbreakCabal = self.jailbreakCabal.override { Cabal = self.disableTest self.Cabal_1_14_0; }; bmp = self.bmp_1_2_2_1; + binary = self.binary_0_6_0_0; + cabalInstall_1_16_0_2 = self.cabalInstall_1_16_0_2.override { + Cabal = self.Cabal_1_16_0_3; + zlib = self.zlib_0_5_3_3; + mtl = self.mtl_2_1_2; + HTTP = self.HTTP_4000_1_1.override { mtl = self.mtl_2_1_2; }; + }; }; # Abstraction for Haskell packages collections diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 37ab8576548..6364b0ebd8e 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -129,42 +129,42 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); haskellPlatformArgs_future = self : { inherit (self) cabal ghc; - async = self.async_2_0_1_4; # 7.6 ok - attoparsec = self.attoparsec_0_10_4_0; # 7.6 ok + async = self.async_2_0_1_4; + attoparsec = self.attoparsec_0_10_4_0; caseInsensitive = self.caseInsensitive_1_0_0_1; - cgi = self.cgi_3001_1_7_5; # 7.6 ok - fgl = self.fgl_5_4_2_4; # 7.6 ok - GLUT = self.GLUT_2_4_0_0; # 7.6 ok - GLURaw = self.GLURaw_1_3_0_0; # 7.6 ok - haskellSrc = self.haskellSrc_1_0_1_5; # 7.6 ok - hashable = self.hashable_1_1_2_5; # 7.6 ok - html = self.html_1_0_1_2; # 7.6 ok - HTTP = self.HTTP_4000_2_8; # 7.6 ok - HUnit = self.HUnit_1_2_5_2; # 7.6 ok - mtl = self.mtl_2_1_2; # 7.6 ok - network = self.network_2_4_1_2; # 7.6 ok - OpenGL = self.OpenGL_2_8_0_0; # 7.6 ok - OpenGLRaw = self.OpenGLRaw_1_3_0_0; # 7.6 ok - parallel = self.parallel_3_2_0_3; # 7.6 ok - parsec = self.parsec_3_1_3; # 7.6 ok - QuickCheck = self.QuickCheck_2_6; # 7.6 ok - random = self.random_1_0_1_1; # 7.6 ok - regexBase = self.regexBase_0_93_2; # 7.6 ok - regexCompat = self.regexCompat_0_95_1; # 7.6 ok - regexPosix = self.regexPosix_0_95_2; # 7.6 ok - split = self.split_0_2_2; # 7.6 ok - stm = self.stm_2_4_2; # 7.6 ok - syb = self.syb_0_4_0; # 7.6 ok - text = self.text_0_11_3_1; # 7.6 ok - transformers = self.transformers_0_3_0_0; # 7.6 ok + cgi = self.cgi_3001_1_7_5; + fgl = self.fgl_5_4_2_4; + GLUT = self.GLUT_2_4_0_0; + GLURaw = self.GLURaw_1_3_0_0; + haskellSrc = self.haskellSrc_1_0_1_5; + hashable = self.hashable_1_2_0_10; + html = self.html_1_0_1_2; + HTTP = self.HTTP_4000_2_8; + HUnit = self.HUnit_1_2_5_2; + mtl = self.mtl_2_1_2; + network = self.network_2_4_1_2; + OpenGL = self.OpenGL_2_8_0_0; + OpenGLRaw = self.OpenGLRaw_1_3_0_0; + parallel = self.parallel_3_2_0_3; + parsec = self.parsec_3_1_3; + QuickCheck = self.QuickCheck_2_6; + random = self.random_1_0_1_1; + regexBase = self.regexBase_0_93_2; + regexCompat = self.regexCompat_0_95_1; + regexPosix = self.regexPosix_0_95_2; + split = self.split_0_2_2; + stm = self.stm_2_4_2; + syb = self.syb_0_4_0; + text = self.text_0_11_3_1; + transformers = self.transformers_0_3_0_0; unorderedContainers = self.unorderedContainers_0_2_3_0; - vector = self.vector_0_10_0_1; # 7.6 ok - xhtml = self.xhtml_3000_2_1; # 7.6 ok - zlib = self.zlib_0_5_4_1; # 7.6 ok - cabalInstall = self.cabalInstall_1_16_0_2; # 7.6 ok - alex = self.alex_3_0_5; # 7.6 ok - haddock = self.haddock_2_13_2; # 7.6 ok - happy = self.happy_1_18_10; # 7.6 ok + vector = self.vector_0_10_0_1; + xhtml = self.xhtml_3000_2_1; + zlib = self.zlib_0_5_4_1; + cabalInstall = self.cabalInstall_1_16_0_2; + alex = self.alex_3_0_5; + haddock = self.haddock_2_13_2; + happy = self.happy_1_18_10; primitive = self.primitive_0_5_0_1; # semi-official, but specified }; @@ -490,11 +490,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); acidState = callPackage ../development/libraries/haskell/acid-state {}; - Agda = callPackage ../development/libraries/haskell/Agda { - hashable = self.hashable_1_1_2_5; - hashtables = self.hashtables.override { hashable = self.hashable_1_1_2_5; }; - unorderedContainers = self.unorderedContainers.override { hashable = self.hashable_1_1_2_5; }; - }; + Agda = callPackage ../development/libraries/haskell/Agda {}; accelerate = callPackage ../development/libraries/haskell/accelerate {}; @@ -579,7 +575,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); bimap = callPackage ../development/libraries/haskell/bimap {}; - binary = callPackage ../development/libraries/haskell/binary {}; + binary_0_6_0_0 = callPackage ../development/libraries/haskell/binary/0.6.0.0.nix {}; + binary_0_7_1_0 = callPackage ../development/libraries/haskell/binary/0.7.1.0.nix {}; + binary = self.binary_0_7_1_0; binaryShared = callPackage ../development/libraries/haskell/binary-shared {}; @@ -619,6 +617,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); boomerang = callPackage ../development/libraries/haskell/boomerang {}; + bytedump = callPackage ../development/libraries/haskell/bytedump {}; + byteorder = callPackage ../development/libraries/haskell/byteorder {}; bytestringNums = callPackage ../development/libraries/haskell/bytestring-nums {}; @@ -672,6 +672,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); Chart = callPackage ../development/libraries/haskell/Chart {}; + ChartGtk = callPackage ../development/libraries/haskell/Chart-gtk {}; + ChasingBottoms = callPackage ../development/libraries/haskell/ChasingBottoms {}; checkers = callPackage ../development/libraries/haskell/checkers {}; @@ -1066,8 +1068,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); happstackHamlet = callPackage ../development/libraries/haskell/happstack/happstack-hamlet.nix {}; hashable_1_1_2_5 = callPackage ../development/libraries/haskell/hashable/1.1.2.5.nix {}; - hashable_1_2_0_7 = callPackage ../development/libraries/haskell/hashable/1.2.0.7.nix {}; - hashable = self.hashable_1_2_0_7; + hashable_1_2_0_10 = callPackage ../development/libraries/haskell/hashable/1.2.0.10.nix {}; + hashable = self.hashable_1_2_0_10; hashedStorage = callPackage ../development/libraries/haskell/hashed-storage {}; @@ -1133,6 +1135,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); heist = callPackage ../development/libraries/haskell/heist {}; + hflags = callPackage ../development/libraries/haskell/hflags {}; + HFuse = callPackage ../development/libraries/haskell/HFuse {}; highlightingKate = callPackage ../development/libraries/haskell/highlighting-kate {}; @@ -1143,6 +1147,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); Hipmunk = callPackage ../development/libraries/haskell/Hipmunk {}; + hit = callPackage ../development/libraries/haskell/hit {}; + hjsmin = callPackage ../development/libraries/haskell/hjsmin {}; hledger = callPackage ../development/libraries/haskell/hledger {}; @@ -1862,6 +1868,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); tagstreamConduit = callPackage ../development/libraries/haskell/tagstream-conduit {}; + templateDefault = callPackage ../development/libraries/haskell/template-default {}; + temporary = callPackage ../development/libraries/haskell/temporary {}; Tensor = callPackage ../development/libraries/haskell/Tensor {}; @@ -2000,6 +2008,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); vectorSpacePoints = callPackage ../development/libraries/haskell/vector-space-points {}; + vectorThUnbox = callPackage ../development/libraries/haskell/vector-th-unbox {}; + void = callPackage ../development/libraries/haskell/void {}; vty = callPackage ../development/libraries/haskell/vty {}; @@ -2085,6 +2095,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); xmlTypes = callPackage ../development/libraries/haskell/xml-types {}; + xtest = callPackage ../development/libraries/haskell/xtest {}; + xssSanitize = callPackage ../development/libraries/haskell/xss-sanitize {}; yaml = callPackage ../development/libraries/haskell/yaml {}; @@ -2194,7 +2206,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); haddock_2_11_0 = callPackage ../development/tools/documentation/haddock/2.11.0.nix {}; haddock_2_12_0 = callPackage ../development/tools/documentation/haddock/2.12.0.nix {}; haddock_2_13_2 = callPackage ../development/tools/documentation/haddock/2.13.2.nix {}; - haddock = self.haddock_2_13_2; + haddock_2_13_2_1 = callPackage ../development/tools/documentation/haddock/2.13.2.1.nix {}; + haddock = self.haddock_2_13_2_1; happy_1_18_4 = callPackage ../development/tools/parsing/happy/1.18.4.nix {}; happy_1_18_5 = callPackage ../development/tools/parsing/happy/1.18.5.nix {}; diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index 0961ff892ca..c4a6bbb7ca6 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -1212,9 +1212,9 @@ } { baseName = "nijs"; - version = "0.0.7"; + version = "0.0.8"; fullName = "nijs-*"; - hash = "a4a965771c618f870cabf27676a36909f6a9b0981f40d1baa2123af396cf8635"; + hash = "134a4f764835280487334f5cfd5a0d271cdd784fe954ad619fad250f54c3b3b9"; patchLatest = false; topLevel = true; dependencies = [ diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2ef8b156e91..5209c497192 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -18,7 +18,7 @@ rec { buildPerlPackage (args // { buildInputs = buildInputs ++ [ ModuleBuild ]; preConfigure = "touch Makefile.PL"; - buildPhase = "perl Build.PL --prefix=$out"; + buildPhase = "perl Build.PL --prefix=$out; ./Build build"; installPhase = "./Build install"; checkPhase = "./Build test"; }); @@ -107,6 +107,20 @@ rec { propagatedBuildInputs = [Mouse]; }; + ApacheLogFormatCompiler = buildPerlModule { + name = "Apache-LogFormat-Compiler-0.13"; + src = fetchurl { + url = mirror://cpan/authors/id/K/KA/KAZEBURO/Apache-LogFormat-Compiler-0.13.tar.gz; + sha256 = "b4185125501e288efbc664da8b723ff86f0b69eb57d3c7c69c7d2069aab0efb0"; + }; + buildInputs = [ HTTPMessage TestRequires TryTiny URI ]; + meta = { + homepage = https://github.com/kazeburo/Apache-LogFormat-Compiler; + description = "Compile a log format string to perl-code"; + license = "perl"; + }; + }; + AppCLI = buildPerlPackage { name = "App-CLI-0.07"; src = fetchurl { @@ -268,11 +282,16 @@ rec { }; }; - Boolean = buildPerlPackage rec { - name = "boolean-0.20"; + boolean = buildPerlPackage { + name = "boolean-0.30"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IN/INGY/${name}.tar.gz"; - sha256 = "1xqhzy3m2r08my13alff9bzl8b6xgd68312834x0hf33yir3l1yn"; + url = mirror://cpan/authors/id/I/IN/INGY/boolean-0.30.tar.gz; + sha256 = "f46e7a6121d5728ef2ce285a82d1dde94f6dfa0b846a612db75b1dcd37b9fc7f"; + }; + meta = { + homepage = https://github.com/ingydotnet/boolean-pm/tree; + description = "Boolean support for Perl"; + license = "perl"; }; }; @@ -503,6 +522,19 @@ rec { }; }; + CatalystDispatchTypeRegex = buildPerlModule { + name = "Catalyst-DispatchType-Regex-5.90032"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MG/MGRIMES/Catalyst-DispatchType-Regex-5.90032.tar.gz; + sha256 = "003e31fe0c1d6dfc6be4d9cd47cb058a9b53a73bb6a9f74a132a43dbfbbb5e3c"; + }; + propagatedBuildInputs = [ Moose TextSimpleTable ]; + meta = { + description = "Regex DispatchType"; + license = "perl"; + }; + }; + CatalystEngineHTTPPrefork = buildPerlPackage rec { name = "Catalyst-Engine-HTTP-Prefork-0.51"; src = fetchurl { @@ -549,13 +581,13 @@ rec { }; CatalystRuntime = buildPerlPackage { - name = "Catalyst-Runtime-5.90019"; + name = "Catalyst-Runtime-5.90030"; src = fetchurl { - url = mirror://cpan/authors/id/B/BO/BOBTFISH/Catalyst-Runtime-5.90019.tar.gz; - sha256 = "0madnqyzhcvbv6iql6b10dzfqvajj0fyp1sla83csakkbff38mqp"; + url = mirror://cpan/authors/id/J/JJ/JJNAPIORK/Catalyst-Runtime-5.90030.tar.gz; + sha256 = "c27357f744fa0d2f9b2682c5f86723d90de43f30cd50089306dd13eb8849eb0c"; }; buildInputs = [ ClassDataInheritable DataDump HTTPMessage TestException ]; - propagatedBuildInputs = [ CGISimple ClassC3AdoptNEXT ClassLoad ClassMOP DataDump DataOptList HTMLParser HTTPBody HTTPMessage HTTPRequestAsCGI ListMoreUtils LWPUserAgent Moose MooseXEmulateClassAccessorFast MooseXGetopt MooseXMethodAttributes MooseXRoleWithOverloading MROCompat namespaceautoclean namespaceclean PathClass Plack PlackMiddlewareReverseProxy PlackTestExternalServer SafeIsa StringRewritePrefix SubExporter TaskWeaken TextSimpleTable TreeSimple TreeSimpleVisitorFactory TryTiny URI ]; + propagatedBuildInputs = [ CGISimple CatalystDispatchTypeRegex ClassC3AdoptNEXT ClassLoad DataDump DataOptList HTMLParser HTTPBody HTTPMessage HTTPRequestAsCGI LWP ListMoreUtils MROCompat Moose MooseXEmulateClassAccessorFast MooseXGetopt MooseXMethodAttributes MooseXRoleWithOverloading PathClass Plack PlackMiddlewareReverseProxy PlackTestExternalServer SafeIsa StringRewritePrefix SubExporter TaskWeaken TextSimpleTable TreeSimple TreeSimpleVisitorFactory TryTiny URI namespaceautoclean namespaceclean ]; meta = { homepage = http://dev.catalyst.perl.org/; description = "The Catalyst Framework Runtime"; @@ -1033,6 +1065,19 @@ rec { }; }; + ClassMethodMaker = buildPerlPackage { + name = "Class-MethodMaker-2.18"; + src = fetchurl { + url = mirror://cpan/authors/id/S/SC/SCHWIGON/Class-MethodMaker-2.18.tar.gz; + sha256 = "223b7a79025e9bff984d755f9744182505e110680b13eedbac2831d45ddbeeba"; + }; + preConfigure = "patchShebangs ."; + meta = { + description = "A module for creating generic methods"; + license = "perl"; + }; + }; + ClassMethodModifiers = buildPerlPackage { name = "Class-Method-Modifiers-2.00"; src = fetchurl { @@ -1581,6 +1626,21 @@ rec { }; }; + DataStreamBulk = buildPerlPackage { + name = "Data-Stream-Bulk-0.11"; + src = fetchurl { + url = mirror://cpan/authors/id/D/DO/DOY/Data-Stream-Bulk-0.11.tar.gz; + sha256 = "06e08432a6b97705606c925709b99129ad926516e477d58e4461e4b3d9f30917"; + }; + buildInputs = [ TestRequires ]; + propagatedBuildInputs = [ Moose PathClass SubExporter namespaceclean ]; + meta = { + homepage = http://metacpan.org/release/Data-Stream-Bulk; + description = "N at a time iteration API"; + license = "perl"; + }; + }; + DataTaxi = buildPerlPackage { name = "Data-Taxi-0.96"; propagatedBuildInputs = [DebugShowStuff]; @@ -1642,31 +1702,91 @@ rec { }; DateTime = buildPerlModule { - name = "DateTime-0.78"; + name = "DateTime-1.03"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-0.78.tar.gz; - sha256 = "0gicc3ib42jba989lxwy5i5sp4w3bmakdimgfxqbb57mbdarpxc5"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-1.03.tar.gz; + sha256 = "384f97c73da02492d771d6b5c3b37f6b18c2e12f4db3246b1d61ff19c6d6ad6d"; }; buildInputs = [ TestFatal ]; - propagatedBuildInputs = [ DateTimeLocale DateTimeTimeZone ParamsValidate ]; + propagatedBuildInputs = [ DateTimeLocale DateTimeTimeZone ParamsValidate TryTiny ]; meta = { - homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "A date and time object"; license = "artistic_2"; }; }; - DateTimeFormatBuilder = buildPerlPackage rec { - name = "DateTime-Format-Builder-0.7901"; + DateTimeEventICal = buildPerlPackage { + name = "DateTime-Event-ICal-0.11"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; - sha256 = "08zl89gh5lkff8736fkdnrf6dgppsjbmymnysbc06s7igd4ig8zf"; + url = mirror://cpan/authors/id/F/FG/FGLOCK/DateTime-Event-ICal-0.11.tar.gz; + sha256 = "6c3ca03c1810c996fa66943138f1f891bbc4baeb41ae2108a5f821040d78dd4c"; + }; + propagatedBuildInputs = [ DateTime DateTimeEventRecurrence ]; + meta = { + description = "DateTime rfc2445 recurrences"; + license = "unknown"; + }; + }; + + DateTimeEventRecurrence = buildPerlPackage { + name = "DateTime-Event-Recurrence-0.16"; + src = fetchurl { + url = mirror://cpan/authors/id/F/FG/FGLOCK/DateTime-Event-Recurrence-0.16.tar.gz; + sha256 = "3872e0126cd9527a918d3e537f85342d1fbb1e6a9ae5833262201b31879f8609"; + }; + propagatedBuildInputs = [ DateTime DateTimeSet ]; + }; + + DateTimeFormatBuilder = buildPerlPackage { + name = "DateTime-Format-Builder-0.81"; + src = fetchurl { + url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-Builder-0.81.tar.gz; + sha256 = "7cd58a8cb53bf698407cc992f89e4d49bf3dc55baf4f3f00f1def63a0fff33ef"; + }; + propagatedBuildInputs = [ ClassFactoryUtil DateTime DateTimeFormatStrptime ParamsValidate ]; + meta = { + description = "Create DateTime parser classes and objects"; + license = "artistic_2"; + }; + }; + + DateTimeFormatFlexible = buildPerlPackage { + name = "DateTime-Format-Flexible-0.25"; + src = fetchurl { + url = mirror://cpan/authors/id/T/TH/THINC/DateTime-Format-Flexible-0.25.tar.gz; + sha256 = "cd3267e68736ece386d677289b334d4ef1f33ff2524b17b9c9deb53d20420090"; + }; + propagatedBuildInputs = [ DateTime DateTimeFormatBuilder DateTimeTimeZone ListMoreUtils TestMockTime ]; + meta = { + description = "DateTime::Format::Flexible - Flexibly parse strings and turn them into DateTime objects"; + license = "perl"; + }; + }; + + DateTimeFormatHTTP = buildPerlPackage { + name = "DateTime-Format-HTTP-0.40"; + src = fetchurl { + url = mirror://cpan/authors/id/C/CK/CKRAS/DateTime-Format-HTTP-0.40.tar.gz; + sha256 = "214e9e2e364090ebc5bc682b29709828944ae67f0bb4a989dd1e6d010845213f"; + }; + propagatedBuildInputs = [ DateTime HTTPDate ]; + meta = { + description = "Date conversion routines"; + license = "perl"; + }; + }; + + DateTimeFormatICal = buildPerlPackage { + name = "DateTime-Format-ICal-0.09"; + src = fetchurl { + url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-ICal-0.09.tar.gz; + sha256 = "8b09f6539f5e9c0df0e6135031699ed4ef9eef8165fc80aefeecc817ef997c33"; + }; + propagatedBuildInputs = [ DateTime DateTimeEventICal DateTimeSet DateTimeTimeZone ParamsValidate ]; + meta = { + description = "Parse and format iCal datetime and duration strings"; + license = "perl"; }; - propagatedBuildInputs = [ - DateTime ParamsValidate TaskWeaken DateTimeFormatStrptime - ClassFactoryUtil - ]; - buildInputs = [TestPod]; }; DateTimeFormatISO8601 = buildPerlPackage { @@ -1682,16 +1802,18 @@ rec { }; }; - DateTimeFormatNatural = buildPerlPackage rec { - name = "DateTime-Format-Natural-0.74"; + DateTimeFormatNatural = buildPerlPackage { + name = "DateTime-Format-Natural-1.02"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SC/SCHUBIGER/${name}.tar.gz"; - sha256 = "0hq33s5frfa8cpj2al7qi0sbmimm5sdlxf0h3b57fjm9x5arlkcn"; + url = mirror://cpan/authors/id/S/SC/SCHUBIGER/DateTime-Format-Natural-1.02.tar.gz; + sha256 = "5479c48ade5eca9712784afee18c58308d56742a204d5ea9040d011f705303e3"; + }; + buildInputs = [ ModuleUtil TestMockTime ]; + propagatedBuildInputs = [ Clone DateTime DateTimeTimeZone ListMoreUtils ParamsValidate boolean ]; + meta = { + description = "Create machine readable date/time with natural parsing logic"; + license = "perl"; }; - propagatedBuildInputs = [ - DateTime ListMoreUtils ParamsValidate DateCalc - TestMockTime Boolean - ]; }; DateTimeFormatPg = buildPerlPackage { @@ -1707,33 +1829,72 @@ rec { }; }; - DateTimeFormatStrptime = buildPerlPackage rec { - name = "DateTime-Format-Strptime-1.5000"; + DateTimeFormatStrptime = buildPerlPackage { + name = "DateTime-Format-Strptime-1.54"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; - sha256 = "0m55rqbixrsfa6g6mqs8aa0rhcxh6aj2g3n8fgl63wyz9an93w8y"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-Strptime-1.54.tar.gz; + sha256 = "00bb61b12472fb1a637ec55bbd8878db05b3aac89a67b7991b281e32896db9de"; + }; + propagatedBuildInputs = [ DateTime DateTimeLocale DateTimeTimeZone ParamsValidate ]; + meta = { + description = "Parse and format strp and strf time patterns"; + license = "artistic_2"; }; - propagatedBuildInputs = - [ DateTime DateTimeLocale DateTimeTimeZone ParamsValidate ]; }; - DateTimeLocale = buildPerlPackage rec { + DateTimeLocale = buildPerlPackage { name = "DateTime-Locale-0.45"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; - sha256 = "175grkrxiv012n6ch3z1sip4zprcili6m5zqi3njdk5c1gdvi8ca"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Locale-0.45.tar.gz; + sha256 = "8aa1b8db0baccc26ed88f8976a228d2cdf4f6ed4e10fc88c1501ecd8f3ccaf9c"; + }; + propagatedBuildInputs = [ ListMoreUtils ParamsValidate ]; + meta = { + homepage = http://datetime.perl.org/; + description = "Localization support for DateTime.pm"; + license = "perl"; }; - propagatedBuildInputs = [ListMoreUtils ParamsValidate]; }; - DateTimeTimeZone = buildPerlPackage rec { - name = "DateTime-TimeZone-1.45"; + DateTimeSet = buildPerlPackage { + name = "DateTime-Set-0.31"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; - sha256 = "0wnjg6mcpcy7hg79jdsg3vi8ad89rghkcgqjmqiq6pqc0k9sbq2q"; + url = mirror://cpan/authors/id/F/FG/FGLOCK/DateTime-Set-0.31.tar.gz; + sha256 = "499b59e42a1129bf10fd269eb7542d337a29fbbcbf08ef8313fd465d3ae5df02"; + }; + propagatedBuildInputs = [ DateTime SetInfinite ]; + meta = { + description = "DateTime set objects"; + license = "unknown"; + }; + }; + + DateTimeTimeZone = buildPerlPackage { + name = "DateTime-TimeZone-1.59"; + src = fetchurl { + url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-TimeZone-1.59.tar.gz; + sha256 = "b1d50f6abde68671da1db883168ef8d6793a11ba75de02174f42e1dfd16b2522"; }; buildInputs = [ TestOutput ]; - propagatedBuildInputs = [ ClassLoad ClassSingleton ParamsValidate TryTiny ]; + propagatedBuildInputs = [ ClassLoad ClassSingleton ParamsValidate ]; + meta = { + description = "Time zone object base class and factory"; + license = "perl"; + }; + }; + + DateTimeXEasy = buildPerlPackage { + name = "DateTimeX-Easy-0.089"; + src = fetchurl { + url = mirror://cpan/authors/id/R/RO/ROKR/DateTimeX-Easy-0.089.tar.gz; + sha256 = "17e6d202e7ac6049523048e97bb8f195e3c79208570da1504f4313584e487a79"; + }; + buildInputs = [ TestMost ]; + propagatedBuildInputs = [ DateTime DateTimeFormatFlexible DateTimeFormatICal DateTimeFormatNatural TimeDate ]; + meta = { + description = "Parse a date/time string using the best method available"; + license = "perl"; + }; }; DebugShowStuff = buildPerlPackage { @@ -2299,6 +2460,17 @@ rec { propagatedBuildInputs = [ ExceptionBase ]; }; + ExporterLite = buildPerlPackage { + name = "Exporter-Lite-0.02"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MS/MSCHWERN/Exporter-Lite-0.02.tar.gz; + sha256 = "20c1e9b7ddc017b788feb34c032fc585e2c5b46a484e93f519373fd18830ce0e"; + }; + meta = { + license = "perl"; + }; + }; + ExtUtilsCBuilder = buildPerlPackage rec { name = "ExtUtils-CBuilder-0.280202"; src = fetchurl { @@ -2307,6 +2479,18 @@ rec { }; }; + ExtUtilsConfig = buildPerlPackage { + name = "ExtUtils-Config-0.007"; + src = fetchurl { + url = mirror://cpan/authors/id/L/LE/LEONT/ExtUtils-Config-0.007.tar.gz; + sha256 = "2c1465078b876fd16a90507092805265528c2532d4937b03547a6dbdb8ac0eef"; + }; + meta = { + description = "A wrapper for perl's configuration"; + license = "perl"; + }; + }; + ExtUtilsCppGuess = buildPerlModule rec { name = "ExtUtils-CppGuess-0.07"; src = fetchurl { @@ -2327,6 +2511,31 @@ rec { }; }; + ExtUtilsHelpers = buildPerlPackage { + name = "ExtUtils-Helpers-0.021"; + src = fetchurl { + url = mirror://cpan/authors/id/L/LE/LEONT/ExtUtils-Helpers-0.021.tar.gz; + sha256 = "26b85077f4197b30e62ffec87d3f78111522619d62858d2ab45a64687351892a"; + }; + meta = { + description = "Various portability utilities for module builders"; + license = "perl"; + }; + }; + + ExtUtilsInstallPaths = buildPerlPackage { + name = "ExtUtils-InstallPaths-0.009"; + src = fetchurl { + url = mirror://cpan/authors/id/L/LE/LEONT/ExtUtils-InstallPaths-0.009.tar.gz; + sha256 = "1b0827a4acf40d38552c4348767000f7e2d8cf5fd0d19436bf8747d2a72d77bc"; + }; + propagatedBuildInputs = [ ExtUtilsConfig ]; + meta = { + description = "Build.PL install path logic made easy"; + license = "perl"; + }; + }; + ExtUtilsLibBuilder = buildPerlModule { name = "ExtUtils-LibBuilder-0.04"; src = fetchurl { @@ -3130,6 +3339,18 @@ rec { }; }; + IOInteractive = buildPerlPackage { + name = "IO-Interactive-0.0.6"; + src = fetchurl { + url = mirror://cpan/authors/id/B/BD/BDFOY/IO-Interactive-0.0.6.tar.gz; + sha256 = "9cc016cbd94b500027e137cb5070d19487e4431bf822f0cb534c38b6b2c1038c"; + }; + meta = { + description = "Utilities for interactive I/O"; + license = "perl"; + }; + }; + IOLockedFile = buildPerlPackage rec { name = "IO-LockedFile-0.23"; src = fetchurl { @@ -3606,14 +3827,17 @@ rec { }; }; - LWPxParanoidAgent = buildPerlPackage rec { - name = "LWPx-ParanoidAgent-1.07"; + LWPUserAgentDetermined = buildPerlPackage { + name = "LWP-UserAgent-Determined-1.06"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BR/BRADFITZ/${name}.tar.gz"; - sha256 = "bd7ccbe6ed6b64195a967e9b2b04c185b7b97e8ec5a8835bb45dbcd42a18e76a"; + url = mirror://cpan/authors/id/J/JE/JESSE/LWP-UserAgent-Determined-1.06.tar.gz; + sha256 = "c31d8e16dc92e2113c81cdbfb11149cfd19039e789f77cd34333ac9184346fc5"; + }; + propagatedBuildInputs = [ LWP ]; + meta = { + description = "A virtual browser that retries errors"; + license = "unknown"; }; - doCheck = false; # 3 tests fail, probably because they try to connect to the network - propagatedBuildInputs = [ LWP NetDNS ]; }; LWPUserAgentMockable = buildPerlPackage { @@ -3625,6 +3849,16 @@ rec { propagatedBuildInputs = [ LWP HookLexWrap ]; }; + LWPxParanoidAgent = buildPerlPackage rec { + name = "LWPx-ParanoidAgent-1.07"; + src = fetchurl { + url = "mirror://cpan/authors/id/B/BR/BRADFITZ/${name}.tar.gz"; + sha256 = "bd7ccbe6ed6b64195a967e9b2b04c185b7b97e8ec5a8835bb45dbcd42a18e76a"; + }; + doCheck = false; # 3 tests fail, probably because they try to connect to the network + propagatedBuildInputs = [ LWP NetDNS ]; + }; + maatkit = import ../development/perl-modules/maatkit { inherit fetchurl buildPerlPackage stdenv DBDmysql; }; @@ -3792,15 +4026,28 @@ rec { }; ModuleBuild = buildPerlPackage { - name = "Module-Build-0.4003"; + name = "Module-Build-0.4005"; src = fetchurl { - url = mirror://cpan/authors/id/L/LE/LEONT/Module-Build-0.4003.tar.gz; - sha256 = "1izx26gfnjffnj0j601hkc008b31y9f25hms1nzidfkb6r3110s2"; + url = mirror://cpan/authors/id/L/LE/LEONT/Module-Build-0.4005.tar.gz; + sha256 = "eb2522507251550f459c11223ea6d86b34f1dee9b3e3928d0d6a0497505cb7ef"; }; meta = { - homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Build and install Perl modules"; - license = "perl5"; + license = "perl"; + }; + }; + + ModuleBuildTiny = buildPerlModule { + name = "Module-Build-Tiny-0.023"; + src = fetchurl { + url = mirror://cpan/authors/id/L/LE/LEONT/Module-Build-Tiny-0.023.tar.gz; + sha256 = "eba7fbfea2dd84310ab00f22fd29bbf774b10a465df3f6133ca7da88c0bd6ac4"; + }; + buildInputs = [ ExtUtilsConfig ExtUtilsHelpers ExtUtilsInstallPaths JSONPP perl ]; + propagatedBuildInputs = [ ExtUtilsConfig ExtUtilsHelpers ExtUtilsInstallPaths JSONPP ]; + meta = { + description = "A tiny replacement for Module::Build"; + license = "perl"; }; }; @@ -3913,6 +4160,19 @@ rec { }; }; + ModuleUtil = buildPerlPackage { + name = "Module-Util-1.09"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MA/MATTLAW/Module-Util-1.09.tar.gz; + sha256 = "6cfbcb6a45064446ec8aa0ee1a7dddc420b54469303344187aef84d2c7f3e2c6"; + }; + buildInputs = [ ModuleBuild ]; + meta = { + description = "Module name tools and transformations"; + license = "perl"; + }; + }; + ModuleVersions = buildPerlPackage { name = "Module-Versions-0.02"; src = fetchurl { @@ -4182,6 +4442,20 @@ rec { buildInputs = [ Moose TestFatal TestRequires ]; }; + MooseXStrictConstructor = buildPerlPackage { + name = "MooseX-StrictConstructor-0.19"; + src = fetchurl { + url = mirror://cpan/authors/id/D/DR/DROLSKY/MooseX-StrictConstructor-0.19.tar.gz; + sha256 = "486573c16901e83c081da3d90a544281af1baa40bbf036337d6fa91994e48a31"; + }; + buildInputs = [ Moose TestFatal ]; + propagatedBuildInputs = [ Moose namespaceautoclean ]; + meta = { + description = "Make your object constructors blow up on unknown attributes"; + license = "artistic_2"; + }; + }; + MooseXTraits = buildPerlPackage rec { name = "MooseX-Traits-0.11"; src = fetchurl { @@ -4237,6 +4511,20 @@ rec { propagatedBuildInputs = [ DateTime DateTimeLocale DateTimeTimeZone Moose MooseXTypes namespaceclean TestException TestUseOk ]; }; + MooseXTypesDateTimeMoreCoercions = buildPerlPackage { + name = "MooseX-Types-DateTime-MoreCoercions-0.11"; + src = fetchurl { + url = mirror://cpan/authors/id/I/IL/ILMARI/MooseX-Types-DateTime-MoreCoercions-0.11.tar.gz; + sha256 = "c746a9284b7db49ce9acb2fbce26629fa816e6636e883d2ed6c62e336cfc52cb"; + }; + buildInputs = [ TestException TestUseOk ]; + propagatedBuildInputs = [ DateTime DateTimeXEasy Moose MooseXTypes MooseXTypesDateTime TimeDurationParse namespaceclean ]; + meta = { + description = "Extensions to MooseX::Types::DateTime"; + license = "perl"; + }; + }; + MooseXTypesLoadableClass = buildPerlPackage rec { name = "MooseX-Types-LoadableClass-0.008"; src = fetchurl { @@ -4412,6 +4700,20 @@ rec { buildInputs = [ DBI DBDSQLite ]; }; + NetAmazonS3 = buildPerlPackage { + name = "Net-Amazon-S3-0.59"; + src = fetchurl { + url = mirror://cpan/authors/id/P/PF/PFIG/Net-Amazon-S3-0.59.tar.gz; + sha256 = "94f2bd6b317a9142e400d7d17bd573dc9d22284c3ceaa4864474ba674e0e2e9f"; + }; + buildInputs = [ LWP TestException ]; + propagatedBuildInputs = [ DataStreamBulk DateTimeFormatHTTP DigestHMAC DigestMD5File FileFindRule HTTPDate HTTPMessage LWPUserAgentDetermined MIMETypes Moose MooseXStrictConstructor MooseXTypesDateTimeMoreCoercions PathClass RegexpCommon TermEncoding TermProgressBarSimple URI XMLLibXML ]; + meta = { + description = "Use the Amazon S3 - Simple Storage Service"; + license = "perl"; + }; + }; + NetAmazonS3Policy = buildPerlPackage { name = "Net-Amazon-S3-Policy-0.001002"; src = fetchurl { @@ -4862,15 +5164,15 @@ rec { }; Plack = buildPerlPackage { - name = "Plack-1.0015"; + name = "Plack-1.0024"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-1.0015.tar.gz; - sha256 = "1zg30bb55ws8fka5iawmfqnc3wg6ggigl0wljgvw0mk466sr3lxf"; + url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-1.0024.tar.gz; + sha256 = "485f69275d73401739a829cfee3bbc9bfa20a0843470791066365ac07fac04a1"; }; - buildInputs = [ TestRequires ]; - propagatedBuildInputs = [ DevelStackTrace DevelStackTraceAsHTML FileShareDir FilesysNotifySimple HashMultiValue HTTPBody HTTPMessage LWPUserAgent StreamBuffered TestTCP TryTiny URI ]; + buildInputs = [ FileShareDirInstall TestRequires ]; + propagatedBuildInputs = [ ApacheLogFormatCompiler DevelStackTrace DevelStackTraceAsHTML FileShareDir FilesysNotifySimple HTTPBody HTTPMessage HashMultiValue LWP StreamBuffered TestTCP TryTiny URI ]; meta = { - homepage = http://plackperl.org; + homepage = https://github.com/plack/Plack; description = "Perl Superglue for Web frameworks and Web Servers (PSGI toolkit)"; license = "perl"; }; @@ -5175,6 +5477,17 @@ rec { }; }; + SetInfinite = buildPerlPackage { + name = "Set-Infinite-0.65"; + src = fetchurl { + url = mirror://cpan/authors/id/F/FG/FGLOCK/Set-Infinite-0.65.tar.gz; + sha256 = "07bc880734492de40b4a3a8b5a331762f64e69b4629029fd9a9d357b25b87e1f"; + }; + meta = { + description = "Infinite Sets math"; + }; + }; + SetObject = buildPerlPackage { name = "Set-Object-1.26"; src = fetchurl { @@ -5308,16 +5621,17 @@ rec { ]; }; - Starman = buildPerlPackage { - name = "Starman-0.3006"; + Starman = buildPerlModule { + name = "Starman-0.3011"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Starman-0.3006.tar.gz; - sha256 = "0dlwrrq570v5mbpzsi4pmj6n2sjm3xpcilhh6dvpq8qbp550wixy"; + url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Starman-0.3011.tar.gz; + sha256 = "f700e1e9fa8a56609db1b75878ccfbbccfda32454c32e3c33912a1776f583cf2"; }; - buildInputs = [ TestRequires ]; - propagatedBuildInputs = [ DataDump HTTPDate HTTPParserXS HTTPMessage NetServer Plack TestTCP ]; - doCheck = false; # binds to various TCP ports1 + buildInputs = [ ModuleBuildTiny TestRequires ]; + propagatedBuildInputs = [ DataDump HTTPDate HTTPMessage HTTPParserXS NetServer Plack TestTCP ]; + doCheck = false; # binds to various TCP ports meta = { + homepage = https://github.com/miyagawa/Starman; description = "High-performance preforking PSGI/Plack web server"; license = "perl"; }; @@ -5731,6 +6045,54 @@ rec { }; }; + TermEncoding = buildPerlPackage { + name = "Term-Encoding-0.02"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Term-Encoding-0.02.tar.gz; + sha256 = "f274e72346a0c0cfacfb53030ac1e38b57425512fc5bdc5cd9ef75ab0f26cfcc"; + }; + meta = { + description = "Detect encoding of the current terminal"; + license = "perl"; + }; + }; + + TermProgressBar = buildPerlPackage { + name = "Term-ProgressBar-2.13"; + src = fetchurl { + url = mirror://cpan/authors/id/S/SZ/SZABGAB/Term-ProgressBar-2.13.tar.gz; + sha256 = "95a56e1529928b7a0d7adf5bc2f54b9b9ae9da58c43b519af74a1e6596209b3c"; + }; + buildInputs = [ CaptureTiny TestException ]; + propagatedBuildInputs = [ ClassMethodMaker TermReadKey ]; + meta = { + description = "Provide a progress meter on a standard terminal"; + license = "perl"; + }; + }; + + TermProgressBarQuiet = buildPerlPackage { + name = "Term-ProgressBar-Quiet-0.31"; + src = fetchurl { + url = mirror://cpan/authors/id/L/LB/LBROCARD/Term-ProgressBar-Quiet-0.31.tar.gz; + sha256 = "25675292f588bc29d32e710cf3667da9a2a1751e139801770a9fdb18cd2184a6"; + }; + propagatedBuildInputs = [ IOInteractive TermProgressBar TestMockObject ]; + meta = { + description = ""; + license = "perl"; + }; + }; + + TermProgressBarSimple = buildPerlPackage { + name = "Term-ProgressBar-Simple-0.03"; + src = fetchurl { + url = mirror://cpan/authors/id/E/EV/EVDB/Term-ProgressBar-Simple-0.03.tar.gz; + sha256 = "a20db3c67d5bdfd0c1fab392c6d1c26880a7ee843af602af4f9b53a7043579a6"; + }; + propagatedBuildInputs = [ TermProgressBarQuiet ]; + }; + TermReadKey = buildPerlPackage { name = "TermReadKey-2.30"; src = fetchurl { @@ -5946,6 +6308,19 @@ rec { TestMore = TestSimple; + TestMost = buildPerlPackage { + name = "Test-Most-0.31"; + src = fetchurl { + url = mirror://cpan/authors/id/O/OV/OVID/Test-Most-0.31.tar.gz; + sha256 = "0ddc6034dc7cde3631dde41ecb558ed823fc07804bfd051b8ec9a70131862ab7"; + }; + propagatedBuildInputs = [ ExceptionClass TestDeep TestDifferences TestException TestWarn ]; + meta = { + description = "Most commonly needed test functions and features"; + license = "perl"; + }; + }; + TestNoWarnings = buildPerlPackage { name = "Test-NoWarnings-1.04"; src = fetchurl { @@ -6109,11 +6484,16 @@ rec { }; }; - TestUseOk = buildPerlPackage rec { - name = "Test-use-ok-0.02"; + TestUseOk = buildPerlPackage { + name = "Test-use-ok-0.11"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AU/AUDREYT/${name}.tar.gz"; - sha256 = "11inaxiavb35k8zwxwbfbp9wcffvfqas7k9idy822grn2sz5gyig"; + url = mirror://cpan/authors/id/A/AU/AUDREYT/Test-use-ok-0.11.tar.gz; + sha256 = "8410438a2acf127bffcf1ab92205b747a615b487e80a48e8c3d0bb9fa0dbb2a8"; + }; + meta = { + homepage = http://github.com/audreyt/Test-use-ok/tree; + description = "Alternative to Test::More::use_ok"; + license = "unrestricted"; }; }; @@ -6430,6 +6810,33 @@ rec { }; }; + TimeDuration = buildPerlPackage { + name = "Time-Duration-1.1"; + src = fetchurl { + url = mirror://cpan/authors/id/A/AV/AVIF/Time-Duration-1.1.tar.gz; + sha256 = "a69c419c4892f21eba10002e2ab8c55b657b6691cf6873544ef99ef5fd188f4e"; + }; + buildInputs = [ TestPod TestPodCoverage ]; + meta = { + description = "Rounded or exact English expression of durations"; + license = "perl"; + }; + }; + + TimeDurationParse = buildPerlPackage { + name = "Time-Duration-Parse-0.06"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Time-Duration-Parse-0.06.tar.gz; + sha256 = "e88f0e1c322b477ec98fb295324bc78657ce25aa53cb353656f01241ea7fe4db"; + }; + buildInputs = [ TimeDuration ]; + propagatedBuildInputs = [ ExporterLite ]; + meta = { + description = "Parse string that represents time duration"; + license = "perl"; + }; + }; + TimeHiRes = buildPerlPackage rec { name = "Time-HiRes-1.9725"; src = fetchurl { diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix deleted file mode 100644 index 218ce951f06..00000000000 --- a/pkgs/top-level/release-haskell.nix +++ /dev/null @@ -1,437 +0,0 @@ -/* Essential Haskell packages that must build. */ - -{ supportedSystems ? [ "x86_64-linux" ] }: - -with import ./release-lib.nix { inherit supportedSystems; }; - -let - - ghc6104 = "ghc6104"; - ghc6123 = "ghc6123"; - ghc704 = "ghc704"; - ghc742 = "ghc742"; - ghc763 = "ghc763"; - default = [ ghc763 ]; - latest = [ ]; - all = [ ghc6104 ghc6123 ghc704 ghc742 ghc763 ]; - - allBut = platform: pkgs.lib.filter (x: platform != x) all; - - filterSupportedSystems = systems: pkgs.lib.filter (x: pkgs.lib.elem x supportedSystems) systems; - - mapHaskellTestOn = attrs: pkgs.lib.mapAttrs mkJobs attrs; - - mkJobs = pkg: ghcs: builtins.listToAttrs (pkgs.lib.concatMap (ghc: mkJob ghc pkg) ghcs); - - mkJob = ghc: pkg: - let - pkgPath = ["haskellPackages_${ghc}" "${pkg}"]; - systems = filterSupportedSystems (pkgs.lib.attrByPath (pkgPath ++ ["meta" "platforms"]) [] pkgs); - in - map (system: mkSystemJob system ghc pkg) systems; - - mkSystemJob = system: ghc: pkg: - pkgs.lib.nameValuePair "${ghc}" (pkgs.lib.setAttrByPath [system] ((pkgs.lib.getAttrFromPath ["haskellPackages_${ghc}" "${pkg}"] (pkgsFor system)))); - -in - -mapTestOn { - - gitAndTools.gitAnnex = supportedSystems; - jhc = supportedSystems; - -} -// -mapHaskellTestOn { - - abstractPar = default; - ACVector = default; - aeson = default; - AgdaExecutable = default; - alex = all; - alexMeta = default; - alsaCore = default; - alsaPcm = default; - alternativeIo = default; - ansiTerminal = default; - ansiWlPprint = default; - asn1Data = default; - AspectAG = default; - async = default ++ latest; - attempt = default; - attoparsec = default; - attoparsecEnumerator = default; - authenticate = default; - base64Bytestring = default; - baseUnicodeSymbols = default; - benchpress = default; - bimap = default; - binaryShared = default; - bitmap = default; - bktrees = default; - blazeBuilder = default; - blazeBuilderEnumerator = default; - blazeHtml = default; - blazeTextual = default; - bloomfilter = default; - bmp = default; - BNFC = default ++ latest; - BNFCMeta = default; - Boolean = default; - bytestringMmap = default; - bytestringNums = default; - bytestringTrie = default; - cabal2Ghci = default; - cabal2nix = allBut ghc6104; - cabalDev = default ++ latest; - cabalGhci = default ++ latest; - cabalInstall = all; - cairo = default; - caseInsensitive = default; - cautiousFile = default; - cereal = default; - certificate = default; - cgi = all; - Chart = default; - citeprocHs = default; - clientsession = default; - cmdargs = default; - cmdlib = default ++ latest; - colorizeHaskell = default; - colour = default; - comonadsFd = default; - conduit = default; - ConfigFile = default; - continuedFractions = default; - converge = default; - convertible = default; - cookie = default; - cpphs = default; - cprngAes = default; - criterion = default ++ latest; - cryptoApi = default; - cryptocipher = default; - Crypto = default; - cryptohash = default; - cssText = default; - csv = default; - darcs = default; - dataAccessor = default; - dataAccessorTemplate = default; - dataDefault = default; - dataenc = default; - dataReify = default; - datetime = default; - DAV = default; - dbus = default; - derive = default; - diagrams = default; - Diff = default; - digest = default; - digestiveFunctorsHeist = default; - digestiveFunctorsSnap = default; - dimensional = default ++ latest; - dimensionalTf = default ++ latest; - directoryTree = default; - dlist = default; - dns = default; - doctest = default ++ latest; - dotgen = default; - doubleConversion = default; - editDistance = default; - editline = default; - emailValidate = default; - entropy = default; - enumerator = default; - erf = default; - failure = default; - fclabels = default; - feed = default; - fgl = all; - fileEmbed = default; - filestore = default; - fingertree = default; - flexibleDefaults = default; - fsnotify = [ ghc704 ghc742 ghc763 ]; - funcmp = all; - gamma = default; - gdiff = default; - ghc = default; - ghcEvents = default; - ghcMod = default ++ latest; - ghcMtl = default; - ghcPaths = default; - ghcSybUtils = default; - githubBackup = default; - github = default; - gitit = default; - glade = default; - glib = default; - Glob = default; - gloss = default; - GLUT = all; - gnutls = default; - graphviz = default ++ latest; - gtk = default; - gtksourceview2 = default; - hackageDb = default ++ latest; - haddock = all; - hakyll = default; - hamlet = default; - happstackHamlet = default; - happstackServer = default; - happy = all; - hashable = default; - hashedStorage = default; - haskeline = default; - haskellLexer = default; - haskellPlatform = all; - haskellSrc = all; - haskellSrcExts = default; - haskellSrcMeta = default; - HaXml = default; - haxr = default; - HDBC = default; - HDBCPostgresql = default; - HDBCSqlite3 = default; - highlightingKate = default; - hinotify = default; - hint = default; - hledger = default ++ latest; - hledgerInterest = default ++ latest; - hledgerLib = default ++ latest; - hledgerWeb = default; - hlint = default ++ latest; - HList = default ++ latest; - hmatrix = default; - hoogle = default ++ latest; - hopenssl = all; - hostname = default; - hp2anyCore = default; - hp2anyGraph = default; - hS3 = default; - hscolour = default; - hsdns = all; - hsemail = allBut ghc6104; - hslogger = default; - hsloggerTemplate = default; - hspec = default ++ latest; - HsSyck = default; - HStringTemplate = default ++ latest; - hsyslog = all; - html = all; - HTTP = all; - httpConduit = default; - httpDate = default; - httpdShed = default; - httpTypes = default; - HUnit = all; - hxt = default; - idris = default; - IfElse = default; - irc = default; - iteratee = default; - jailbreakCabal = all; - json = default; - jsonTypes = default; - keter = default; - lambdabot = default; - languageCQuote = default; - languageJavascript = default; - largeword = default; - lens = default; - libxmlSax = default; - liftedBase = default; - ListLike = default; - logfloat = default; - mainlandPretty = default; - maude = default; - MaybeT = default; - MemoTrie = default; - mersenneRandomPure64 = default; - mimeMail = default; - MissingH = default; - mmap = default; - MonadCatchIOMtl = default; - MonadCatchIOTransformers = default; - monadControl = default; - monadLoops = default; - monadPar = default ++ latest; - monadPeel = default; - MonadPrompt = default; - MonadRandom = default; - mpppc = default; - mtl = all; - mtlparse = default; - multiplate = default; - multirec = default; - murmurHash = default; - mwcRandom = default; - nat = default; - nats = default; - naturals = default; - network = all; - networkInfo = default; - networkMulticast = default; - networkProtocolXmpp = default; - nonNegative = default; - numericPrelude = default; - numtype = default; - numtypeTf = default; - ObjectName = default; - OneTuple = default; - OpenAL = all; - optparseApplicative = allBut ghc6104; - packunused = default; - pandoc = default ++ latest; - pandocTypes = default; - pango = default; - parallel = all; - parseargs = default; - parsec3 = default; - parsec = all; - parsimony = default; - pathPieces = default; - pathtype = default; - pcreLight = default; - permutation = default ++ latest; - persistent = default; - persistentPostgresql = default; - persistentSqlite = default; - persistentTemplate = default; - polyparse = default; - ppm = default; - prettyShow = default; - primitive = all; - PSQueue = default; - pureMD5 = default; - pwstoreFast = default; - QuickCheck2 = default; - QuickCheck = all; - random = default ++ latest; - randomFu = default; - randomShuffle = default; - randomSource = default; - RangedSets = default; - ranges = default; - readline = default; - recaptcha = default; - regexBase = all; - regexCompat = all; - regexPCRE = default; - regexPosix = all; - regexpr = default; - regexTDFA = default; - regular = default; - RSA = default; - rvar = default; - safe = default; - SafeSemaphore = default; - SDL = default; - SDLImage = default; - SDLMixer = default; - SDLTtf = default; - semigroups = default; - sendfile = default; - SHA = default; - shake = default; - Shellac = default; - shelly = default; - simpleSendfile = default; - smallcheck = default ++ latest; - SMTPClient = default; - snapCore = default; - snap = default; - snapLoaderStatic = default; - snapServer = default; - split = default ++ latest; - srcloc = default; - stateref = default; - StateVar = default; - statistics = default; - stbImage = default; - stm = all; - storableComplex = default; - storableRecord = default; - streamproc = all; - strict = default; - strptime = default; - svgcairo = default; - syb = [ ghc704 ghc742 ghc763 ]; - sybWithClass = default; - sybWithClassInstancesText = default; - tabular = default; - tagged = default; - tagsoup = default; - tar = default ++ latest; - Tensor = default; - terminfo = default; - testFramework = default ++ latest; - testFrameworkHunit = default ++ latest; - texmath = default; - text = all; - thLift = default; - timeplot = default; - tls = default; - tlsExtra = default; - transformers = all; - transformersBase = default; - transformersCompat = default; - tuple = default; - typeLevelNaturalNumber = default; - uniplate = default; - uniqueid = default; - unixCompat = default; - unorderedContainers = default; - url = default; - utf8Light = default; - utf8String = default; - utilityHt = default; - uuagc = default; - uuid = default; - uulib = default ++ latest; - uuOptions = default; - uuParsinglib = default; - vacuum = default; - vcsRevision = default; - Vec = default; - vectorAlgorithms = default; - vector = all; - vectorSpace = default; - vty = default; - waiAppStatic = default; - wai = default; - waiExtra = default; - waiLogger = default; - warp = default; - wlPprint = default ++ latest; - wlPprintExtras = default; - wlPprintTerminfo = default; - X11 = default; - xhtml = all; - xmlConduit = default; - xml = default; - xmlHamlet = default; - xmlTypes = default; - xmobar = default ++ latest; - xmonadContrib = default ++ latest; - xmonad = default ++ latest; - xmonadExtras = default ++ latest; - xssSanitize = default; - yesodAuth = default; - yesodCore = default; - yesod = default; - yesodDefault = default; - yesodForm = default; - yesodJson = default; - yesodPersistent = default; - yesodStatic = default; - zeromq3Haskell = default; - zeromqHaskell = default; - zipArchive = default; - zipper = default; - zlib = all; - zlibBindings = default; - zlibEnum = default; - -}