Merge remote-tracking branch 'upstream/master' into x-updates

Conflicts:
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/gdk-pixbuf/default.nix
	pkgs/development/libraries/gtk+/2.x.nix
	pkgs/misc/ghostscript/default.nix
	pkgs/top-level/all-packages.nix
This commit is contained in:
Michael Raskin 2013-06-13 17:12:43 +04:00
commit 19530856ed
55 changed files with 1041 additions and 148 deletions

View file

@ -1,25 +1,19 @@
{ stdenv, fetchurl, libogg }:
stdenv.mkDerivation rec {
name = "flac-1.2.1";
name = "flac-1.3.0";
src = fetchurl {
url = mirror://sourceforge/flac/flac-1.2.1.tar.gz;
sha256 = "1pry5lgzfg57pga1zbazzdd55fkgk3v5qy4axvrbny5lrr5s8dcn";
url = "http://downloads.xiph.org/releases/flac/${name}.tar.xz";
sha256 = "1p0hh190kqvpkbk1bbajd81jfbmkyl4fn2i7pggk2zppq6m68bgs";
};
buildInputs = [ libogg ];
patches =
[ # Fix for building on GCC 4.3.
(fetchurl {
url = "http://sourceforge.net/p/flac/patches/_discuss/thread/9d4c7504/d8ea/attachment/flac-1.2.1-gcc-4.3-includes.patch";
sha256 = "1m6ql5vyjb2jlp5qiqp6w0drq1m6x6y3i1dnl5ywywl3zd36k0mr";
})
];
doCheck = true; # takes lots of time but will be run rarely (small build-time closure)
meta = {
homepage = http://flac.sourceforge.net;
homepage = http://xiph.org/flac/;
description = "Library and tools for encoding and decoding the FLAC lossless audio file format";
};
}

View file

@ -4,7 +4,12 @@ args@{source ? "latest", ...}: with args;
let inherit (args.composableDerivation) composableDerivation edf; in
composableDerivation {} (fix: {
composableDerivation {
# use gccApple to compile on darwin
mkDerivation = ( if stdenv.isDarwin
then stdenvAdapters.overrideGCC stdenv gccApple
else stdenv ).mkDerivation;
} (fix: {
name = "vim_configurable-7.3";
@ -37,9 +42,9 @@ composableDerivation {} (fix: {
configureFlags = ["--enable-gui=auto" "--with-features=${args.features}"];
nativeBuildInputs = [ncurses pkgconfig]
++ [ gtk libX11 libXext libSM libXpm libXt libXaw libXau libXmu glib
libICE ];
nativeBuildInputs
= [ ncurses pkgconfig gtk libX11 libXext libSM libXpm libXt libXaw libXau
libXmu glib libICE ];
# most interpreters aren't tested yet.. (see python for example how to do it)
flags = {
@ -71,14 +76,18 @@ composableDerivation {} (fix: {
cfg = {
pythonSupport = config.vim.python or true;
darwinSupport = config.vim.darwin or false;
nlsSupport = config.vim.nls or false;
tclSupport = config.vim.tcl or false;
multibyteSupport = config.vim.multibyte or false;
cscopeSupport = config.vim.cscope or false;
netbeansSupport = config.netbeans or true; # eg envim is using it
# by default, compile with darwin support if we're compiling on darwin, but
# allow this to be disabled by setting config.vim.darwin to false
darwinSupport = stdenv.isDarwin && (config.vim.darwin or true);
# add .nix filetype detection and minimal syntax highlighting support
ftNixSupport = config.vim.ftNix or true;
netbeansSupport = config.netbeans or true; # eg envim is using it
};
#--enable-gui=OPTS X11 GUI default=auto OPTS=auto/no/gtk/gtk2/gnome/gnome2/motif/athena/neXtaw/photon/carbon
@ -93,22 +102,23 @@ composableDerivation {} (fix: {
// edf "gtktest" "gtktest" { } #Do not try to compile and run a test GTK program
*/
postInstall = "
rpath=`patchelf --print-rpath \$out/bin/vim`;
for i in \$nativeBuildInputs; do
echo adding \$i/lib
rpath=\$rpath:\$i/lib
postInstall = if stdenv.isLinux then ''
rpath=`patchelf --print-rpath $out/bin/vim`;
for i in $nativeBuildInputs; do
echo adding $i/lib
rpath=$rpath:$i/lib
done
echo \$nativeBuildInputs
echo \$rpath
patchelf --set-rpath \$rpath \$out/bin/{vim,gvim}
";
dontStrip =1;
echo $nativeBuildInputs
echo $rpath
patchelf --set-rpath $rpath $out/bin/{vim,gvim}
'' else "";
dontStrip = 1;
meta = {
description = "The most popular clone of the VI editor";
homepage = "www.vim.org";
homepage = "www.vim.org";
platforms = lib.platforms.unix;
};
})

View file

@ -1,28 +1,33 @@
{ stdenv, fetchurl, autoconf, automake, libtool, leptonica, libpng, libtiff }:
let
majVersion = "3.02";
version = "${majVersion}.02";
f = lang : sha256 : let
src = fetchurl {
url = "http://tesseract-ocr.googlecode.com/files/${lang}.traineddata.gz";
url = "http://tesseract-ocr.googlecode.com/files/tesseract-ocr-${majVersion}.${lang}.tar.gz";
inherit sha256;
};
in
"gunzip -c ${src} > $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 ];

View file

@ -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;
};
}

View file

@ -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 = ''

View file

@ -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 =

View file

@ -0,0 +1,70 @@
{ stdenv, fetchurl, ruby, rake, rubygems, makeWrapper, ncursesw_sup
, xapian_full_alaveteli, gpgme, libiconvOrEmpty }:
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:${ncursesw_sup}/${ruby.gemPath}"
GEM_PATH="$GEM_PATH:${xapian_full_alaveteli}/${ruby.gemPath}"
GEM_PATH="$GEM_PATH:${gpgme}/${ruby.gemPath}"
# Don't install some dependencies -- we have already installed
# ncursesw-sup, xapian-full-alaveteli and gpgme, 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
# Now install the dependencies that will work out of the box
gem install --no-verbose --install-dir "$out/${ruby.gemPath}" \
--bindir "$out/bin" --no-rdoc --no-ri rmail
gem install --no-verbose --install-dir "$out/${ruby.gemPath}" \
--bindir "$out/bin" --no-rdoc --no-ri trollop
gem install --no-verbose --install-dir "$out/${ruby.gemPath}" \
--bindir "$out/bin" --no-rdoc --no-ri lockfile
gem install --no-verbose --install-dir "$out/${ruby.gemPath}" \
--bindir "$out/bin" --no-rdoc --no-ri mime-types
gem install --no-verbose --install-dir "$out/${ruby.gemPath}" \
--bindir "$out/bin" --no-rdoc --no-ri gettext
gem install --no-verbose --install-dir "$out/${ruby.gemPath}" \
--bindir "$out/bin" --no-rdoc --no-ri chronic
gem install --no-verbose --install-dir "$out/${ruby.gemPath}" \
--bindir "$out/bin" --no-rdoc --no-ri iconv
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
'';
}

View file

@ -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 = [

View file

@ -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 ]

View file

@ -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

View file

@ -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\<dllmap dll="gdiplus.dll" target="${libgdiplus}/lib/libgdiplus.so" os="!windows"/>' $i
done
'';
meta = {
homepage = http://mono-project.com/;
description = "Cross platform, open source .NET development framework";

View file

@ -97,6 +97,7 @@ g: # Get dependencies from patched gems
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;
};
@ -1467,6 +1468,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 = {

View file

@ -91,6 +91,10 @@ in
gemFlags = "--no-rdoc --no-ri";
};
xapian_full_alaveteli = {
buildInputs = [ zlib libuuid ];
};
rjb = {
buildInputs = [ jdk ];
JAVA_HOME = jdk;

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, perl, glib }:
{ stdenv, fetchurl, pkgconfig, perl, glib, libintlOrEmpty }:
stdenv.mkDerivation rec {
name = "atk-2.8.0";
@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "1x3dd3hg9l1j9dq70xwph13vxdp6a9wbfcnryryf1wr6c8bij9dj";
};
buildInputs = libintlOrEmpty;
nativeBuildInputs = [ pkgconfig perl ];
propagatedBuildInputs = [ glib ];

View file

@ -30,8 +30,11 @@ stdenv.mkDerivation rec {
configureFlags = [ "--enable-tee" ]
++ optional xcbSupport "--enable-xcb"
++ optional glSupport "--enable-gl"
++ optional pdfSupport "--enable-pdf"
;
NIX_CFLAGS_COMPILE = "-I${pixman}/include/pixman-1";
preConfigure =
# On FreeBSD, `-ldl' doesn't exist.
(stdenv.lib.optionalString stdenv.isFreeBSD
@ -40,7 +43,14 @@ stdenv.mkDerivation rec {
cat "$i" | sed -es/-ldl//g > t
mv t "$i"
done
'');
'')
+
''
# Work around broken `Requires.private' that prevents Freetype
# `-I' flags to be propagated.
sed -i "src/cairo.pc.in" \
-es'|^Cflags:\(.*\)$|Cflags: \1 -I${freetype}/include/freetype2 -I${freetype}/include|g'
'';
enableParallelBuilding = true;

View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, glib, libtiff, libjpeg, libpng, libX11, xz
, jasper }:
, jasper, libintlOrEmpty }:
stdenv.mkDerivation rec {
name = "gdk-pixbuf-2.28.1";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
# !!! We might want to factor out the gdk-pixbuf-xlib subpackage.
buildInputs = [ libX11 ];
buildInputs = [ libX11 libintlOrEmpty ];
nativeBuildInputs = [ pkgconfig ];

View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, gettext, glib, atk, pango, cairo, perl, xlibs
, gdk_pixbuf
, gdk_pixbuf, xz, libintlOrEmpty
, xineramaSupport ? true
, cupsSupport ? true, cups ? null
}:
@ -17,12 +17,15 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
NIX_CFLAGS_COMPILE = "-I${cairo}/include/cairo";
nativeBuildInputs = [ perl pkgconfig gettext ];
propagatedBuildInputs = with xlibs;
[ glib cairo pango gdk_pixbuf atk
libXrandr libXrender libXcomposite libXi libXcursor
]
++ libintlOrEmpty
++ stdenv.lib.optional xineramaSupport libXinerama
++ stdenv.lib.optionals cupsSupport [ cups ];

View file

@ -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 = [

View file

@ -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";

View file

@ -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
];

View file

@ -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

View file

@ -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";

View file

@ -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;
};
})

View file

@ -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";

View file

@ -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

View file

@ -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/";

View file

@ -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" ]; }
)

View file

@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "08aqis6j8nd1lb4f2h4h9d9kjvp54iwf8zvqzss0qn4v7nfcjyvx";
};
NIX_CFLAGS_COMPILE = "-I${cairo}/include/cairo";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ gettext fontconfig ];
nativeBuildInputs = [ pkgconfig ];

View file

@ -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 <<EOF >"$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
'';
}

View file

@ -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
'';
}

View file

@ -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!";

View file

@ -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 ];
};
}

View file

@ -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];

View file

@ -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];

View file

@ -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 ];
};
}

View file

@ -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"
+)
+

View file

@ -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 ];
};
}

View file

@ -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 = {

View file

@ -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"
+)

View file

@ -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 ];
};
}

View file

@ -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 <<EOF >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

View file

@ -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
)
'';

View file

@ -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
'';

View file

@ -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 ];
};
})

View file

@ -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";
};
}

View file

@ -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

View file

@ -8,6 +8,7 @@
all = "Nix Committers <nix-commits@lists.science.uu.nl>";
amiddelk = "Arie Middelkoop <amiddelk@gmail.com>";
andres = "Andres Loeh <ksnixos@andres-loeh.de>";
amorsillo = "Andrew Morsillo <andrew.morsillo@gmail.com>";
antono = "Antono Vasiljev <self@antono.info>";
astsmtl = "Alexander Tsamutali <astsmtl@yandex.ru>";
aszlig = "aszlig <aszlig@redmoonstudios.org>";
@ -22,6 +23,7 @@
goibhniu = "Cillian de Róiste <cillian.deroiste@gmail.com>";
guibert = "David Guibert <david.guibert@gmail.com>";
iElectric = "Domen Kozar <domen@dev.si>";
lovek323 = "Jason O'Conal <jason@oconal.id.au>";
jcumming = "Jack Cummings <jack@mudshark.org>";
kkallio = "Karn Kallio <tierpluspluslists@gmail.com>";
ludo = "Ludovic Courtès <ludo@gnu.org>";

View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, libjpeg, libpng, libtiff, zlib, pkgconfig, fontconfig, openssl
, lcms2, freetype, libpaper, jbig2dec, expat
, lcms2, freetype, libpaper, jbig2dec, expat, libiconvOrEmpty
, x11Support, x11 ? null
, cupsSupport ? false, cups ? null
, gnuFork ? true
@ -83,6 +83,7 @@ stdenv.mkDerivation rec {
libpaper jbig2dec expat
] ++ stdenv.lib.optionals x11Support [x11 freetype]
++ stdenv.lib.optional cupsSupport cups
++ libiconvOrEmpty
# [] # maybe sometimes jpeg2000 support
;

View file

@ -0,0 +1,34 @@
{ stdenv, fetchurl, kernelDev, zlib }:
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];
};
}

View file

@ -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 = ''

View file

@ -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";

View file

@ -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";
};
}

View file

@ -2654,7 +2654,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 { };
@ -2708,12 +2710,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;
};
@ -3400,6 +3412,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 { };
@ -4090,7 +4103,9 @@ let
gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf { };
gtk2 = callPackage ../development/libraries/gtk+/2.x.nix { };
gtk2 = callPackage ../development/libraries/gtk+/2.x.nix {
cupsSupport = config.gtk2.cups or true;
};
gtk3 = lowPrio (callPackage ../development/libraries/gtk+/3.x.nix {
inherit (gnome3) at_spi2_atk;
});
@ -4643,7 +4658,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 { };
@ -6251,6 +6270,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 {
@ -7187,6 +7208,7 @@ let
keepassx = callPackage ../applications/misc/keepassx { };
inherit (gnome3) evince;
keepass = callPackage ../applications/misc/keepass { };
evolution_data_server = newScope (gnome) ../servers/evolution-data-server { };
@ -7785,6 +7807,21 @@ 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 {
rake = rubyLibs.rake_10_0_4;
ruby = ruby19;
xapian_full_alaveteli = rubyLibs.xapian_full_alaveteli_1_2_9_5;
gpgme = ruby_gpgme;
ncursesw_sup = ruby_ncursesw_sup;
};
msmtp = callPackage ../applications/networking/msmtp { };
imapfilter = callPackage ../applications/networking/mailreaders/imapfilter.nix {
@ -8222,18 +8259,20 @@ 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;
# 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"; };
@ -9459,6 +9498,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 {

View file

@ -1143,6 +1143,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 {};
@ -2204,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 {};

View file

@ -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 = [