Merge branch 'master' into stdenv-updates.

Conflicts:
	pkgs/development/libraries/libxslt/default.nix

Commit 1764ea2b0a introduced changes to libxslt
in an awkward way to avoid re-builds on Linux. This patch has been simplified
during this merge.
This commit is contained in:
Peter Simons
2013-03-25 13:43:45 +01:00
908 changed files with 4138 additions and 1109 deletions
@@ -1,6 +1,6 @@
{ fetchcvs, stdenv, emacs, w3m, imagemagick, texinfo, autoconf }:
let date = "2012-01-15"; in
let date = "2013-03-21"; in
stdenv.mkDerivation rec {
name = "emacs-w3m-cvs${date}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
inherit date;
cvsRoot = ":pserver:anonymous@cvs.namazu.org:/storage/cvsroot";
module = "emacs-w3m";
sha256 = "7a6d90b9d25f137d5a204cfa29f6c6afa8edb1ee302f969110ffda11f11909cc";
sha256 = "1lmcj8rf83w13q8q68hh7sa1abc2m6j2zmfska92xdp7hslhdgc5";
};
buildInputs = [ emacs w3m texinfo autoconf ];
@@ -1,13 +1,13 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation {
name = "htmlize-1.43";
name = "htmlize-1.47";
builder = ./builder.sh;
src = fetchurl {
url = http://fly.srk.fer.hr/~hniksic/emacs/htmlize.el.cgi;
sha256 = "0bdaxh3pjf4z55i7vz4yz3yz45720h8aalhmx13bgkrpijzn93bi";
sha256 = "0m7lby95w9sj0xlqv39imlbp80x8ajd295cs6079jyhmryf6mr10";
};
meta = {
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, emacs, texinfo, texLive, perl, which, automake }:
stdenv.mkDerivation (rec {
name = "ProofGeneral-4.1";
name = "ProofGeneral-4.2";
src = fetchurl {
url = http://proofgeneral.inf.ed.ac.uk/releases/ProofGeneral-4.1.tgz;
sha256 = "1ivxx8c6j7cfdfj2pj0gzdqac7hpb679bjmwdqdcz1c1ni34s9ia";
url = http://proofgeneral.inf.ed.ac.uk/releases/ProofGeneral-4.2.tgz;
sha256 = "09qb0myq66fw17v4ziz401ilsb5xlxz1nl2wsp69d0vrfy0bcrrm";
};
sourceRoot = name;
@@ -22,9 +22,6 @@ stdenv.mkDerivation (rec {
# @image{ProofGeneral} fails, so remove it.
sed -i '94d' doc/PG-adapting.texi
sed -i '101d' doc/ProofGeneral.texi
# Emacs 24 compatibility.
sed -i 's|interactive-p|called-interactively-p '\'''any|' isar/isabelle-system.el generic/proof-{menu,script,splash}.el lib/scomint.el
'';
preBuild = ''
+4 -1
View File
@@ -23,6 +23,9 @@ cabal.mkDerivation (self: {
description = "Haskell IDE written in Haskell";
license = "GPL";
platforms = self.stdenv.lib.platforms.linux;
maintainers = [ self.stdenv.lib.maintainers.andres ];
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})
+33
View File
@@ -0,0 +1,33 @@
{ stdenv, fetchurl, coreutils , unzip, which, pkgconfig , dbus
, freetype, xdg_utils , libXext, glib, pango , cairo, libX11
, libxdg_basedir , libXScrnSaver, xproto, libXinerama , perl
}:
stdenv.mkDerivation rec {
name = "dunst-0.5.0";
version = "0.5.0";
src = fetchurl {
url = "https://github.com/knopwob/dunst/archive/v0.5.0.zip";
sha256 = "08myzhpb1afffcfk3mpmc7gs9305x853b0553fxf3lkgksmg70a6";
};
buildInputs =
[ coreutils unzip which pkgconfig dbus freetype
xdg_utils libXext glib pango cairo libX11 libxdg_basedir
libXScrnSaver xproto libXinerama perl];
buildPhase = ''
export VERSION=${version};
export PREFIX=$out;
make dunst;
'';
meta = {
description = "lightweight and customizable notification daemon";
homepage = http://www.knopwob.org/dunst/;
license = stdenv.lib.licenses.bsd3;
# NOTE: 'unix' or even 'all' COULD work too, I'm not sure
platforms = stdenv.lib.platforms.linux;
};
}
@@ -8,6 +8,10 @@ stdenv.mkDerivation rec {
sha256 = "0qsi5f8d84mgdszvz22acyv6mjnbrpk55d54km9i5mkkapck7r4y";
};
patchPhase = ''
sed -i -e 's,#include <linux/if_tr.h>,#include <netinet/if_tr.h>,' src/*
'';
preConfigure = "cd src";
installPhase = ''
@@ -0,0 +1,49 @@
{ stdenv, fetchurl, libX11, libXtst, libXext, libXdamage, libXfixes, wine, makeWrapper
, bash }:
# Work in progress.
# It doesn't want to start unless teamviewerd is running as root.
# I haven't tried to make the daemon run.
assert stdenv.system == "i686-linux";
let
topath = "${wine}/bin";
toldpath = stdenv.lib.concatStringsSep ":" (map (x: "${x}/lib")
[ stdenv.gcc.gcc libX11 libXtst libXext libXdamage libXfixes wine ]);
in
stdenv.mkDerivation {
name = "teamviewer-8.0.17147";
src = fetchurl {
url = "http://download.teamviewer.com/download/teamviewer_linux_x64.deb";
sha256 = "01iynk954pphl5mq4avs843xyzvdfzng1lpsy7skgwvw0k9cx5ab";
};
buildInputs = [ makeWrapper ];
unpackPhase = ''
ar x $src
tar xf data.tar.gz
'';
installPhase = ''
mkdir -p $out/share/teamviewer8 $out/bin
cp -a opt/teamviewer8/* $out/share/teamviewer8
rm -R $out/share/teamviewer8/tv_bin/wine/{bin,lib,share}
cat > $out/bin/teamviewer << EOF
#!${bash}/bin/sh
export LD_LIBRARY_PATH=${toldpath}\''${LD_LIBRARY_PATH:+:\$LD_LIBRARY_PATH}
export PATH=${topath}\''${PATH:+:\$PATH}
$out/share/teamviewer8/tv_bin/script/teamviewer
EOF
chmod +x $out/bin/teamviewer
'';
meta = {
homepage = "http://www.teamviewer.com";
license = "unfree";
description = "Desktop sharing application, providing remote support and online meetings";
};
}
@@ -0,0 +1,46 @@
{ stdenv, fetchurl, libX11, libXtst, libXext, libXdamage, libXfixes, wine, makeWrapper
, bash }:
assert stdenv.system == "i686-linux";
let
topath = "${wine}/bin";
toldpath = stdenv.lib.concatStringsSep ":" (map (x: "${x}/lib")
[ stdenv.gcc.gcc libX11 libXtst libXext libXdamage libXfixes wine ]);
in
stdenv.mkDerivation {
name = "teamviewer-7.0.9377";
src = fetchurl {
url = "http://www.teamviewer.com/download/version_7x/teamviewer_linux.tar.gz";
sha256 = "1f8934jqj093m1z56yl6k2ah6njkk6pz1rjvpqnryi29pp5piaiy";
};
buildInputs = [ makeWrapper ];
# I need patching, mainly for it not try to use its own 'wine' (in the tarball).
installPhase = ''
mkdir -p $out/share/teamviewer $out/bin
cp -a .tvscript/* $out/share/teamviewer
cp -a .wine/drive_c $out/share/teamviewer
sed -i -e 's/^tv_Run//' \
-e 's/^ setup_tar_env//' \
-e 's/^ setup_env//' \
-e 's,^ TV_Wine_dir=.*, TV_Wine_dir=${wine},' \
-e 's,progsrc=.*drive_c,progsrc='$out'"/share/teamviewer/drive_c,' \
$out/share/teamviewer/wrapper
cat > $out/bin/teamviewer << EOF
#!${bash}/bin/sh
export LD_LIBRARY_PATH=${toldpath}\''${LD_LIBRARY_PATH:+:\$LD_LIBRARY_PATH}
export PATH=${topath}\''${PATH:+:\$PATH}
$out/share/teamviewer/wrapper wine "c:\Program Files\TeamViewer\Version7\TeamViewer.exe" "\$@"
EOF
chmod +x $out/bin/teamviewer
'';
meta = {
homepage = "http://www.teamviewer.com";
license = "unfree";
description = "Desktop sharing application, providing remote support and online meetings";
};
}
@@ -27,6 +27,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://samba.anu.edu.au/rsync/;
description = "A fast incremental file transfer utility";
license = stdenv.lib.licenses.gpl3Plus;
platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.simons ];
@@ -29,7 +29,7 @@ stdenv.mkDerivation {
description = "Cross platform GUI for the computer algebra system Maxima.";
license = "GPL2";
homepage = http://wxmaxima.sourceforge.net;
platforms = stdenv.lib.platforms.unix;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.simons ];
};
}
@@ -0,0 +1,37 @@
{ stdenv, fetchurl, makeWrapper, xdg_utils, libX11, libXext, libSM }:
stdenv.mkDerivation {
name = "aangifte2012-1";
src = fetchurl {
url = http://download.belastingdienst.nl/belastingdienst/apps/linux/ib2012_linux.tar.gz;
sha256 = "05bahvk514lncgfr9kybcafahyz1rgfpwp5cykchxbbc033zm0xy";
};
dontStrip = true;
dontPatchELF = true;
buildInputs = [ makeWrapper ];
buildPhase =
''
for i in bin/*; do
patchelf \
--set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
--set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_GCC/nix-support/orig-gcc)/lib \
$i
done
'';
installPhase =
''
mkdir -p $out
cp -prvd * $out/
wrapProgram $out/bin/ib2012ux --prefix PATH : ${xdg_utils}/bin
'';
meta = {
description = "Elektronische aangifte IB 2012 (Dutch Tax Return Program)";
url = http://www.belastingdienst.nl/particulier/aangifte2012/download/;
};
}
@@ -10,7 +10,7 @@ rec {
git = lib.makeOverridable (import ./git) {
inherit fetchurl stdenv curl openssl zlib expat perl python gettext gnugrep
asciidoc texinfo xmlto docbook2x docbook_xsl docbook_xml_dtd_45 libxslt
cpio tcl tk makeWrapper subversionClient;
cpio tcl tk makeWrapper subversionClient hardlink;
svnSupport = false; # for git-svn support
guiSupport = false; # requires tcl/tk
sendEmailSupport = false; # requires plenty of perl libraries
@@ -1,6 +1,6 @@
{ fetchurl, stdenv, curl, openssl, zlib, expat, perl, python, gettext, cpio, gnugrep
, asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_45
, libxslt, tcl, tk, makeWrapper
, libxslt, tcl, tk, makeWrapper, hardlink
, svnSupport, subversionClient, perlLibs, smtpPerlLibs
, guiSupport
, withManual ? true
@@ -10,7 +10,7 @@
let
version = "1.8.1.3";
version = "1.8.2";
svn = subversionClient.override { perlBindings = true; };
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://git-core.googlecode.com/files/git-${version}.tar.gz";
sha256 = "1waz35cwgcwhgmgzmc4s00yd2vivhy77p49crgqsl0nqpxyj8lrp";
sha256 = "1rhkya4kfs7iayasgj3bk8zg1pfk3h7wqhfy9d6aaqjgzb75pwy2";
};
patches = [ ./docbook2texi.patch ];
@@ -112,46 +112,26 @@ stdenv.mkDerivation {
notSupported "$out/$prog" \
"reinstall with config git = { guiSupport = true; } set"
done
'')
'');
# Don't know why hardlinks aren't created. git installs the same executable
# multiple times into $out so replace duplicates by symlinks because I
# haven't tested whether the nix distribution system can handle hardlinks.
# This reduces the size of $out from 115MB down to 13MB on x86_64-linux!
+ ''
declare -A seen
shopt -s globstar
for f in "$out/"**; do
if [ -L "$f" ]; then continue; fi
test -f "$f" || continue
sum=$(md5sum "$f");
sum=''\${sum/ */}
if [ -z "''\${seen["$sum"]}" ]; then
seen["$sum"]="$f"
else
rm "$f"; ln -v -s "''\${seen["$sum"]}" "$f"
fi
done
'';
# Git installs many copies of the same binary using hardlinks, but unfortunately
# our patchELF phase re-writes those files and destroys the hardlinks in the
# process. This utility re-generates them afterwards.
postFixup = "${hardlink}/bin/hardlink $out";
enableParallelBuilding = true;
meta = {
license = "GPLv2";
homepage = http://git-scm.com/;
homepage = "http://git-scm.com/";
description = "Git, a popular distributed version control system";
license = stdenv.lib.licenses.gpl2Plus;
longDescription = ''
Git, a popular distributed version control system designed to
handle very large projects with speed and efficiency.
'';
maintainers =
[ # Add your name here!
stdenv.lib.maintainers.ludo
stdenv.lib.maintainers.simons
];
platforms = stdenv.lib.platforms.all;
maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.simons ];
};
}
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, lib, iasl, dev86, pam, libxslt, libxml2, libX11, xproto, libXext
, libXcursor, libXmu, qt4, libIDL, SDL, libcap, zlib, libpng, glib, kernel, lvm2
, libXcursor, libXmu, qt4, libIDL, SDL, libcap, zlib, libpng, glib, kernelDev, lvm2
, which, alsaLib, curl, gawk
, xorriso, makeself, perl, pkgconfig
, javaBindings ? false, jdk ? null
@@ -40,7 +40,7 @@ let
};
in stdenv.mkDerivation {
name = "virtualbox-${version}-${kernel.version}";
name = "virtualbox-${version}-${kernelDev.version}";
src = fetchurl {
url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";
@@ -49,7 +49,7 @@ in stdenv.mkDerivation {
buildInputs =
[ iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor qt4 libIDL SDL
libcap glib kernel lvm2 python alsaLib curl pam xorriso makeself perl
libcap glib kernelDev lvm2 python alsaLib curl pam xorriso makeself perl
pkgconfig which libXmu ]
++ optional javaBindings jdk
++ optional pythonBindings python;
@@ -61,7 +61,7 @@ in stdenv.mkDerivation {
prePatch = ''
set -x
MODULES_BUILD_DIR=`echo ${kernel}/lib/modules/*/build`
MODULES_BUILD_DIR=`echo ${kernelDev}/lib/modules/*/build`
sed -e 's@/lib/modules/`uname -r`/build@'$MODULES_BUILD_DIR@ \
-e 's@MKISOFS --version@MKISOFS -version@' \
-e 's@PYTHONDIR=.*@PYTHONDIR=${if pythonBindings then python else ""}@' \
@@ -1,18 +1,18 @@
{ stdenv, fetchurl, lib, patchelf, cdrkit, kernel, which, makeWrapper
{ stdenv, fetchurl, lib, patchelf, cdrkit, kernelDev, which, makeWrapper
, libX11, libXt, libXext, libXmu, libXcomposite, libXfixes, libXrandr, libXcursor
, dbus }:
let version = "4.2.8"; in
stdenv.mkDerivation {
name = "VirtualBox-GuestAdditions-${version}-${kernel.version}";
name = "VirtualBox-GuestAdditions-${version}-${kernelDev.version}";
src = fetchurl {
url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
sha256 = "04a5402d8dcdefc83ffb2785351ddc57758781a3759137974469189392ae4ad5";
};
KERN_DIR = "${kernel}/lib/modules/*/build";
KERN_DIR = "${kernelDev}/lib/modules/*/build";
buildInputs = [ patchelf cdrkit makeWrapper dbus ];
@@ -112,7 +112,7 @@ stdenv.mkDerivation {
for i in *
do
cd $i
kernelVersion=$(cd ${kernel}/lib/modules; ls)
kernelVersion=$(cd ${kernelDev}/lib/modules; ls)
export MODULE_DIR=$out/lib/modules/$kernelVersion/misc
find . -type f | xargs sed -i -e "s|-o root||g" \
-e "s|-g root||g"
@@ -14,6 +14,9 @@ cabal.mkDerivation (self: {
description = "Third party extensions for xmonad";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})
@@ -17,6 +17,9 @@ cabal.mkDerivation (self: {
description = "Third party extensions for xmonad with wacky dependencies";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})
+1 -1
View File
@@ -92,7 +92,7 @@
# pass the '--enable-tests' flag to cabal in the configure stage
# and run any regression test suites the package might have
doCheck = stdenv.lib.versionOlder "7" ghc.ghcVersion;
doCheck = stdenv.lib.versionOlder "7.4" ghc.ghcVersion;
extraConfigureFlags = [
(stdenv.lib.enableFeature enableLibraryProfiling "library-profiling")
@@ -13,6 +13,9 @@ cabal.mkDerivation (self: {
description = "Command-line program for type-checking and compiling Agda programs";
license = "unknown";
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})
+4 -1
View File
@@ -14,6 +14,9 @@ cabal.mkDerivation (self: {
description = "Compiler for a simple functional language";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})
@@ -98,5 +98,6 @@ stdenv.mkDerivation rec {
[ $(./main) == "yes" ]
'';
meta.license = stdenv.lib.licenses.bsd3;
meta.platforms = ["i686-darwin" "x86_64-linux" "i686-linux"];
}
+1 -1
View File
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
meta = {
inherit homepage;
description = "The Glasgow Haskell Compiler";
platforms = ghc.meta.platforms;
inherit (ghc.meta) license platforms;
};
@@ -97,5 +97,6 @@ stdenv.mkDerivation rec {
[ $(./main) == "yes" ]
'';
meta.license = stdenv.lib.licenses.bsd3;
meta.platforms = ["x86_64-linux" "i686-linux"];
}
+1 -1
View File
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
meta = {
inherit homepage;
description = "The Glasgow Haskell Compiler";
platforms = ghc.meta.platforms;
inherit (ghc.meta) license platforms;
};
passthru = {
+1 -1
View File
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
meta = {
inherit homepage;
description = "The Glasgow Haskell Compiler";
platforms = ghc.meta.platforms;
inherit (ghc.meta) license platforms;
};
+1 -1
View File
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
meta = {
inherit homepage;
description = "The Glasgow Haskell Compiler";
platforms = ghc.meta.platforms;
inherit (ghc.meta) license platforms;
};
passthru = {
+1 -1
View File
@@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
meta = {
inherit homepage;
description = "The Glasgow Haskell Compiler";
platforms = ghc.meta.platforms;
inherit (ghc.meta) license platforms;
};
}
@@ -99,5 +99,6 @@ stdenv.mkDerivation rec {
[ $(./main) == "yes" ]
'';
meta.license = stdenv.lib.licenses.bsd3;
meta.platforms = ["x86_64-linux" "i686-linux"];
}
+1 -1
View File
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
stdenv.lib.maintainers.marcweber
stdenv.lib.maintainers.andres
];
platforms = ghc.meta.platforms;
inherit (ghc.meta) license platforms;
};
# TODO: requires a comment as to what it does and why it is needed.
+1 -1
View File
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
stdenv.lib.maintainers.marcweber
stdenv.lib.maintainers.andres
];
platforms = ghc.meta.platforms;
inherit (ghc.meta) license platforms;
};
# TODO: requires a comment as to what it does and why it is needed.
+1 -1
View File
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
stdenv.lib.maintainers.marcweber
stdenv.lib.maintainers.andres
];
platforms = ghc.meta.platforms;
inherit (ghc.meta) license platforms;
};
# TODO: requires a comment as to what it does and why it is needed.
@@ -62,5 +62,6 @@ stdenv.mkDerivation {
'' else "";
meta.license = stdenv.lib.licenses.bsd3;
meta.platforms = ["i686-darwin" "x86_64-linux" "i686-linux"];
}
+1 -1
View File
@@ -23,6 +23,6 @@ stdenv.mkDerivation {
meta = {
description = "The Glasgow Haskell Compiler";
platforms = ghc.meta.platforms;
inherit (ghc.meta) license platforms;
};
}
+1 -1
View File
@@ -16,7 +16,7 @@ stdenv.mkDerivation (rec {
meta = {
description = "The Glasgow Haskell Compiler";
platforms = ghc.meta.platforms;
inherit (ghc.meta) license platforms;
};
postInstall = ''
+1 -1
View File
@@ -18,7 +18,7 @@ stdenv.mkDerivation (rec {
meta = {
description = "The Glasgow Haskell Compiler";
platforms = ghc.meta.platforms;
inherit (ghc.meta) license platforms;
};
configureFlags=[
+1 -1
View File
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
meta = {
description = "The Glasgow Haskell Compiler";
platforms = ghc.meta.platforms;
inherit (ghc.meta) license platforms;
};
configureFlags=[
+1 -1
View File
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
stdenv.lib.maintainers.marcweber
stdenv.lib.maintainers.andres
];
platforms = ghc.meta.platforms;
inherit (ghc.meta) license platforms;
};
# TODO: requires a comment as to what it does and why it is needed.
+1 -1
View File
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
stdenv.lib.maintainers.marcweber
stdenv.lib.maintainers.andres
];
platforms = ghc.meta.platforms;
inherit (ghc.meta) license platforms;
};
}
+1 -1
View File
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
stdenv.lib.maintainers.marcweber
stdenv.lib.maintainers.andres
];
platforms = ghc.meta.platforms;
inherit (ghc.meta) license platforms;
};
}
@@ -87,5 +87,6 @@ stdenv.mkDerivation rec {
[ $(./main) == "yes" ]
'';
meta.license = stdenv.lib.licenses.bsd3;
meta.platforms = ["x86_64-linux" "i686-linux" "i686-darwin" "x86_64-darwin"];
}
+1 -1
View File
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
stdenv.lib.maintainers.andres
stdenv.lib.maintainers.simons
];
platforms = ghc.meta.platforms;
inherit (ghc.meta) license platforms;
};
}
+1 -1
View File
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
stdenv.lib.maintainers.andres
stdenv.lib.maintainers.simons
];
platforms = ghc.meta.platforms;
inherit (ghc.meta) license platforms;
};
}
@@ -87,5 +87,6 @@ stdenv.mkDerivation rec {
[ $(./main) == "yes" ]
'';
meta.license = stdenv.lib.licenses.bsd3;
meta.platforms = ["x86_64-linux" "i686-linux" "i686-darwin" "x86_64-darwin"];
}
+1 -1
View File
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
stdenv.lib.maintainers.andres
stdenv.lib.maintainers.simons
];
platforms = ghc.meta.platforms;
inherit (ghc.meta) license platforms;
};
}
+1 -1
View File
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
stdenv.lib.maintainers.andres
stdenv.lib.maintainers.simons
];
platforms = ghc.meta.platforms;
inherit (ghc.meta) license platforms;
};
}
+1 -1
View File
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
stdenv.lib.maintainers.andres
stdenv.lib.maintainers.simons
];
platforms = ghc.meta.platforms;
inherit (ghc.meta) license platforms;
};
}
+1 -1
View File
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
stdenv.lib.maintainers.andres
stdenv.lib.maintainers.simons
];
platforms = ghc.meta.platforms;
inherit (ghc.meta) license platforms;
};
}
+4 -1
View File
@@ -17,6 +17,9 @@ cabal.mkDerivation (self: {
description = "Functional Programming Language with Dependent Types";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})
@@ -8,6 +8,9 @@ cabal.mkDerivation (self: {
description = "Efficient geometric vectors and transformations";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})
@@ -21,6 +21,9 @@ cabal.mkDerivation (self: {
description = "A dependently typed functional programming language and proof assistant";
license = "unknown";
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
description = "Attribute Grammars in the form of an EDSL";
license = "LGPL";
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})
@@ -8,6 +8,9 @@ cabal.mkDerivation (self: {
description = "Generalized booleans and numbers";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})
@@ -16,6 +16,9 @@ cabal.mkDerivation (self: {
description = "A framework for packaging Haskell software";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})
@@ -16,6 +16,9 @@ cabal.mkDerivation (self: {
description = "A framework for packaging Haskell software";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})
@@ -14,6 +14,9 @@ cabal.mkDerivation (self: {
description = "A library for generating 2D Charts and Plots";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})
@@ -11,5 +11,6 @@ cabal.mkDerivation (self: {
description = "For testing partial and infinite values";
license = "unknown";
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.simons ];
};
})
@@ -12,6 +12,9 @@ cabal.mkDerivation (self: {
description = "Configuration file reading & writing";
license = "LGPL";
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
description = "CouchDB interface";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
description = "Collects together existing Haskell cryptographic functions into a package";
license = "unknown";
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})
@@ -18,5 +18,6 @@ cabal.mkDerivation (self: {
description = "RFC 4918 WebDAV support";
license = self.stdenv.lib.licenses.gpl3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.simons ];
};
})
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
description = "Database Supported Haskell";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})
@@ -8,6 +8,9 @@ cabal.mkDerivation (self: {
description = "O(ND) diff algorithm in haskell";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
description = "Ferry Core Components";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
description = "A Haskell binding for GLFW";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
description = "A raw binding for the OpenGL graphics system";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
description = "A binding for the OpenGL Utility Toolkit";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})
@@ -12,6 +12,9 @@ cabal.mkDerivation (self: {
description = "A binding for the OpenGL Utility Toolkit";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})
@@ -12,6 +12,9 @@ cabal.mkDerivation (self: {
description = "A binding for the OpenGL Utility Toolkit";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})
@@ -13,6 +13,9 @@ cabal.mkDerivation (self: {
description = "A binding for the OpenGL Utility Toolkit";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})
@@ -13,6 +13,9 @@ cabal.mkDerivation (self: {
description = "A binding for the OpenGL Utility Toolkit";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})
@@ -13,6 +13,9 @@ cabal.mkDerivation (self: {
description = "A binding for the OpenGL Utility Toolkit";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})
@@ -10,5 +10,6 @@ cabal.mkDerivation (self: {
description = "Globbing library";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.simons ];
};
})
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
description = "Simple 3D vector library";
license = "GPL";
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})
@@ -13,6 +13,9 @@ cabal.mkDerivation (self: {
description = "Graph-Theoretic Analysis library";
license = "unknown";
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})
@@ -13,6 +13,9 @@ cabal.mkDerivation (self: {
description = "ODBC driver for HDBC";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})
@@ -15,6 +15,9 @@ cabal.mkDerivation (self: {
description = "PostgreSQL driver for HDBC";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})
@@ -13,6 +13,9 @@ cabal.mkDerivation (self: {
description = "Sqlite v3 driver for HDBC";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})
@@ -12,6 +12,9 @@ cabal.mkDerivation (self: {
description = "Haskell Database Connectivity";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
description = "A simple graphics library based on X11 or Win32";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})
@@ -8,6 +8,9 @@ cabal.mkDerivation (self: {
description = "Heterogeneous lists";
license = self.stdenv.lib.licenses.mit;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})
@@ -1,5 +1,5 @@
{ cabal, filepath, hslogger, MissingH, mtl, regexBase, regexCompat
, regexPosix
, regexPosix, fetchurl
}:
cabal.mkDerivation (self: {
@@ -11,6 +11,7 @@ cabal.mkDerivation (self: {
buildDepends = [
filepath hslogger MissingH mtl regexBase regexCompat regexPosix
];
patches = [ (fetchurl { url = "https://github.com/jgoerzen/hsh/pull/10.patch"; sha256 = "0fw2ihl4hlncggwf3v4d7aydm3rzgzpcxplfbwq7janysix4q950"; }) ];
meta = {
homepage = "http://software.complete.org/hsh";
description = "Library to mix shell scripting with Haskell programs";
@@ -14,6 +14,9 @@ cabal.mkDerivation (self: {
description = "StringTemplate implementation in Haskell";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
description = "A library for client-side HTTP";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
description = "A library for client-side HTTP";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
description = "A library for client-side HTTP";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
description = "A library for client-side HTTP";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})
@@ -16,6 +16,9 @@ cabal.mkDerivation (self: {
description = "A library for client-side HTTP";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})
@@ -16,6 +16,9 @@ cabal.mkDerivation (self: {
description = "A library for client-side HTTP";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})
@@ -16,6 +16,9 @@ cabal.mkDerivation (self: {
description = "A library for client-side HTTP";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})
@@ -18,6 +18,9 @@ cabal.mkDerivation (self: {
description = "A library for client-side HTTP";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})
@@ -18,6 +18,9 @@ cabal.mkDerivation (self: {
description = "A library for client-side HTTP";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
description = "A unit testing framework for Haskell";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
description = "A unit testing framework for Haskell";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
description = "A unit testing framework for Haskell";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
description = "A unit testing framework for Haskell";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})
@@ -12,6 +12,9 @@ cabal.mkDerivation (self: {
description = "A unit testing framework for Haskell";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
description = "A unit testing framework for Haskell";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})
@@ -12,6 +12,9 @@ cabal.mkDerivation (self: {
description = "Utilities for manipulating XML documents";
license = "LGPL";
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
description = "Combinatorics, group theory, commutative algebra, non-commutative algebra";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})
@@ -10,6 +10,9 @@ cabal.mkDerivation (self: {
description = "A Haskell binding for Chipmunk";
license = "unknown";
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})

Some files were not shown because too many files have changed in this diff Show More