Merge 'staging'

Conflicts:
	pkgs/servers/x11/xorg/default.nix
This commit is contained in:
Vladimír Čunát 2014-08-24 10:50:22 +02:00
commit 694fa543af
235 changed files with 3521 additions and 1726 deletions

View file

@ -68,6 +68,7 @@
modulistic = "Pablo Costa <modulistic@gmail.com>";
mornfall = "Petr Ročkai <me@mornfall.net>";
msackman = "Matthew Sackman <matthew@wellquite.org>";
nathan-gs = "Nathan Bijnens <nathan@nathan.gs>";
notthemessiah = "Brian Cohen <brian.cohen.88@gmail.com>";
ocharles = "Oliver Charles <ollie@ocharles.org.uk>";
offline = "Jaka Hudoklin <jakahudoklin@gmail.com>";

View file

@ -200,6 +200,12 @@ rec {
merge = mergeOneOption;
};
either = t1: t2: mkOptionType {
name = "${t1.name} or ${t2.name}";
check = x: t1.check x || t2.check x;
merge = mergeOneOption;
};
# Obsolete alternative to configOf. It takes its option
# declarations from the options attribute of containing option
# declaration.

View file

@ -1492,10 +1492,11 @@ are specific to the kernel version, such as the NVIDIA video drivers.
This ensures that driver packages are consistent with the
kernel.</para>
<para>The default Linux kernel configuration should be fine for most
users. You can see the configuration of your current kernel in
<filename>/run/booted-system/kernel-modules/config</filename>. If you
want to change the kernel configuration, you can use the
<para>The default Linux kernel configuration should be fine for most users. You can see the configuration of your current kernel with the following command:
<programlisting>
cat /proc/config.gz | gunzip
</programlisting>
If you want to change the kernel configuration, you can use the
<option>packageOverrides</option> feature (see <xref
linkend="sec-customising-packages" />). For instance, to enable
support for the kernel debugger KGDB:

View file

@ -211,7 +211,7 @@ foreach my $line (-f "/etc/shadow" ? read_file("/etc/shadow") : ()) {
my ($name, $password, @rest) = split(':', $line, -9);
my $u = $usersOut{$name};;
next if !defined $u;
$password = $u->{hashedPassword} if $u->{hashedPassword} && !$spec->{mutableUsers}; # FIXME
$password = $u->{hashedPassword} if defined $u->{hashedPassword} && !$spec->{mutableUsers}; # FIXME
push @shadowNew, join(":", $name, $password, @rest) . "\n";
$shadowSeen{$name} = 1;
}
@ -219,7 +219,7 @@ foreach my $line (-f "/etc/shadow" ? read_file("/etc/shadow") : ()) {
foreach my $u (values %usersOut) {
next if defined $shadowSeen{$u->{name}};
my $password = "!";
$password = $u->{hashedPassword} if $u->{hashedPassword};
$password = $u->{hashedPassword} if defined $u->{hashedPassword};
# FIXME: set correct value for sp_lstchg.
push @shadowNew, join(":", $u->{name}, $password, "1::::::") . "\n";
}

View file

@ -346,7 +346,7 @@ in {
uid = ids.uids.root;
description = "System administrator";
home = "/root";
shell = cfg.defaultUserShell;
shell = mkDefault cfg.defaultUserShell;
group = "root";
extraGroups = [ "grsecurity" ];
hashedPassword = mkDefault config.security.initialRootPassword;

View file

@ -81,7 +81,7 @@ mount -t tmpfs -o "mode=0755" none $mountPoint/var/setuid-wrappers
rm -rf $mountPoint/var/run
ln -s /run $mountPoint/var/run
rm -f $mountPoint/etc/{resolv.conf,hosts}
cp -f /etc/resolv.conf /etc/hosts $mountPoint/etc/
cp -Lf /etc/resolv.conf /etc/hosts $mountPoint/etc/
if [ -n "$runChroot" ]; then

View file

@ -744,7 +744,7 @@ in
# Make all journals readable to users in the wheel and adm
# groups, in addition to those in the systemd-journal group.
# Users can always read their own journals.
${pkgs.acl}/bin/setfacl -nm g:wheel:rx,d:g:wheel:rx,g:adm:rx,d:g:adm:rx /var/log/journal
${pkgs.acl}/bin/setfacl -nm g:wheel:rx,d:g:wheel:rx,g:adm:rx,d:g:adm:rx /var/log/journal || true
'';
# Target for charon send-keys to hook into.

View file

@ -32,7 +32,10 @@ let
fi
fi
exec "$1"
# Start the regular stage 1 script, passing the bind-mounted
# notification socket from the host to allow the container
# systemd to signal readiness to the host systemd.
NOTIFY_SOCKET=/var/lib/private/host-notify exec "$1"
'';
system = config.nixpkgs.system;
@ -175,17 +178,16 @@ in
ip link del dev "ve-$INSTANCE" 2> /dev/null || true
fi
mkdir -p -m 0755 $root/var/lib
# Create a named pipe to get a signal when the container
# has finished booting.
rm -f $root/var/lib/startup-done
mkfifo -m 0600 $root/var/lib/startup-done
if [ "$PRIVATE_NETWORK" = 1 ]; then
ip link del dev "ve-$INSTANCE" 2> /dev/null || true
fi
'';
script =
''
mkdir -p -m 0755 "$root/etc" "$root/var/lib"
mkdir -p -m 0700 "$root/var/lib/private"
if ! [ -e "$root/etc/os-release" ]; then
touch "$root/etc/os-release"
fi
@ -194,6 +196,8 @@ in
"/nix/var/nix/profiles/per-container/$INSTANCE" \
"/nix/var/nix/gcroots/per-container/$INSTANCE"
cp -f /etc/resolv.conf "$root/etc/resolv.conf"
if [ "$PRIVATE_NETWORK" = 1 ]; then
extraFlags+=" --network-veth"
fi
@ -210,13 +214,16 @@ in
fi
''}
EXIT_ON_REBOOT=1 \
# Run systemd-nspawn without startup notification (we'll
# wait for the container systemd to signal readiness).
EXIT_ON_REBOOT=1 NOTIFY_SOCKET= \
exec ${config.systemd.package}/bin/systemd-nspawn \
--keep-unit \
-M "$INSTANCE" -D "$root" $extraFlags \
--bind-ro=/nix/store \
--bind-ro=/nix/var/nix/db \
--bind-ro=/nix/var/nix/daemon-socket \
--bind=/run/systemd/notify:/var/lib/private/host-notify \
--bind="/nix/var/nix/profiles/per-container/$INSTANCE:/nix/var/nix/profiles" \
--bind="/nix/var/nix/gcroots/per-container/$INSTANCE:/nix/var/nix/gcroots" \
--setenv PRIVATE_NETWORK="$PRIVATE_NETWORK" \
@ -269,6 +276,8 @@ in
Type = "notify";
NotifyAccess = "all";
# Note that on reboot, systemd-nspawn returns 10, so this
# unit will be restarted. On poweroff, it returns 0, so the
# unit won't be restarted.
@ -315,5 +324,30 @@ in
environment.systemPackages = [ nixos-container ];
# Start containers at boot time.
systemd.services.all-containers =
{ description = "All Containers";
wantedBy = [ "multi-user.target" ];
unitConfig.ConditionDirectoryNotEmpty = "/etc/containers";
serviceConfig.Type = "oneshot";
script =
''
res=0
shopt -s nullglob
for i in /etc/containers/*.conf; do
AUTO_START=
source "$i"
if [ "$AUTO_START" = 1 ]; then
systemctl start "container@$(basename "$i" .conf).service" || res=1
fi
done
exit $res
''; # */
};
};
}

View file

@ -17,25 +17,31 @@ umask 0022;
sub showHelp {
print <<EOF;
Usage: nixos-container list
nixos-container create <container-name> [--config <string>] [--ensure-unique-name]
nixos-container create <container-name> [--system-path <path>] [--config <string>] [--ensure-unique-name] [--auto-start]
nixos-container destroy <container-name>
nixos-container start <container-name>
nixos-container stop <container-name>
nixos-container status <container-name>
nixos-container login <container-name>
nixos-container root-login <container-name>
nixos-container run <container-name> -- args...
nixos-container set-root-password <container-name> <password>
nixos-container show-ip <container-name>
nixos-container show-host-key <container-name>
EOF
exit 0;
}
my $systemPath;
my $ensureUniqueName = 0;
my $autoStart = 0;
my $extraConfig;
GetOptions(
"help" => sub { showHelp() },
"ensure-unique-name" => \$ensureUniqueName,
"auto-start" => \$autoStart,
"system-path=s" => \$systemPath,
"config=s" => \$extraConfig
) or exit 1;
@ -122,17 +128,13 @@ if ($action eq "create") {
push @conf, "PRIVATE_NETWORK=1\n";
push @conf, "HOST_ADDRESS=$hostAddress\n";
push @conf, "LOCAL_ADDRESS=$localAddress\n";
push @conf, "AUTO_START=$autoStart\n";
write_file($confFile, \@conf);
close($lock);
print STDERR "host IP is $hostAddress, container IP is $localAddress\n";
mkpath("$root/etc/nixos", 0, 0755);
my $nixosConfigFile = "$root/etc/nixos/configuration.nix";
writeNixOSConfig $nixosConfigFile;
# The per-container directory is restricted to prevent users on
# the host from messing with guest users who happen to have the
# same uid.
@ -141,10 +143,21 @@ if ($action eq "create") {
$profileDir = "$profileDir/$containerName";
mkpath($profileDir, 0, 0755);
system("nix-env", "-p", "$profileDir/system",
"-I", "nixos-config=$nixosConfigFile", "-f", "<nixpkgs/nixos>",
"--set", "-A", "system") == 0
or die "$0: failed to build initial container configuration\n";
# Build/set the initial configuration.
if (defined $systemPath) {
system("nix-env", "-p", "$profileDir/system", "--set", $systemPath) == 0
or die "$0: failed to set initial container configuration\n";
} else {
mkpath("$root/etc/nixos", 0, 0755);
my $nixosConfigFile = "$root/etc/nixos/configuration.nix";
writeNixOSConfig $nixosConfigFile;
system("nix-env", "-p", "$profileDir/system",
"-I", "nixos-config=$nixosConfigFile", "-f", "<nixpkgs/nixos>",
"--set", "-A", "system") == 0
or die "$0: failed to build initial container configuration\n";
}
print "$containerName\n" if $ensureUniqueName;
exit 0;
@ -154,7 +167,14 @@ my $root = "/var/lib/containers/$containerName";
my $profileDir = "/nix/var/nix/profiles/per-container/$containerName";
my $gcRootsDir = "/nix/var/nix/gcroots/per-container/$containerName";
my $confFile = "/etc/containers/$containerName.conf";
die "$0: container $containerName does not exist\n" if !-e $confFile;
if (!-e $confFile) {
if ($action eq "destroy") {
exit 0;
} elsif ($action eq "status") {
print "gone\n";
}
die "$0: container $containerName does not exist\n" ;
}
sub isContainerRunning {
my $status = `systemctl show 'container\@$containerName'`;
@ -187,6 +207,10 @@ elsif ($action eq "stop") {
stopContainer;
}
elsif ($action eq "status") {
print isContainerRunning() ? "up" : "down", "\n";
}
elsif ($action eq "update") {
my $nixosConfigFile = "$root/etc/nixos/configuration.nix";
@ -241,6 +265,12 @@ elsif ($action eq "show-ip") {
print "$1\n";
}
elsif ($action eq "show-host-key") {
my $fn = "$root/etc/ssh/ssh_host_ecdsa_key.pub";
exit 1 if ! -f $fn;
print read_file($fn);
}
else {
die "$0: unknown action $action\n";
}

View file

@ -16,6 +16,7 @@ cabal.mkDerivation (self: {
description = "Executable for hoodle";
license = self.stdenv.lib.licenses.gpl3;
platforms = self.ghc.meta.platforms;
hydraPlatforms = self.stdenv.lib.platforms.none;
maintainers = with self.stdenv.lib.maintainers; [ ianwookim ];
};
})

View file

@ -9,7 +9,7 @@ let
url = "http://tesseract-ocr.googlecode.com/files/tesseract-ocr-${majVersion}.${lang}.tar.gz";
inherit sha256;
};
in
in
"tar xfvz ${src} -C $out/share/ --strip=1";
extraLanguages = ''
@ -19,6 +19,7 @@ let
${f "nld" "162acxp1yb6gyki2is3ay2msalmfcsnrlsd9wml2ja05k94m6bjy"}
${f "eng" "1y5xf794n832s3lymzlsdm2s9nlrd2v27jjjp0fd9xp7c2ah4461"}
${f "slv" "0rqng43435cly32idxm1lvxkcippvc3xpxbfizwq5j0155ym00dr"}
${f "jpn" "07v8pymd0iwyzh946lxylybda20gsw7p4fsb09jw147955x49gq9"}
'';
in

View file

@ -1,25 +1,23 @@
{ stdenv, fetchgit, perl, makeWrapper, makeDesktopItem
# Perl modules:
, EncodeLocale, MathClipper, ExtUtilsXSpp, BoostGeometryUtils
, MathConvexHullMonotoneChain, MathGeometryVoronoi, MathPlanePath, Moo
, IOStringy, ClassXSAccessor, Wx, GrowlGNTP, NetDBus
, which, perlPackages
}:
stdenv.mkDerivation rec {
version = "0.9.10b";
version = "1.1.7";
name = "slic3r-${version}";
# Slic3r doesn't put out tarballs, only a git repository is available
src = fetchgit {
url = "git://github.com/alexrj/Slic3r";
rev = "refs/tags/${version}";
sha256 = "0j06h0z65qn4kyb2b7pnq6bcn4al60q227iz9jlrin0ffx3l0ra7";
sha256 = "0hss90iw4xwca08d03wrz0fds5nqwb9zjqii2n6rgpcl4km69fka";
};
buildInputs = [ perl makeWrapper
buildInputs = with perlPackages; [ perl makeWrapper which
EncodeLocale MathClipper ExtUtilsXSpp BoostGeometryUtils
MathConvexHullMonotoneChain MathGeometryVoronoi MathPlanePath Moo
IOStringy ClassXSAccessor Wx GrowlGNTP NetDBus
IOStringy ClassXSAccessor Wx GrowlGNTP NetDBus ImportInto XMLSAX
ExtUtilsMakeMaker
];
desktopItem = makeDesktopItem {
@ -32,13 +30,23 @@ stdenv.mkDerivation rec {
categories = "Application;Development;";
};
# Nothing to do here
buildPhase = "true";
buildPhase = ''
export SLIC3R_NO_AUTO=true
export PERL5LIB="./xs/blib/arch/:./xs/blib/lib:$PERL5LIB"
pushd xs
perl Build.PL
perl Build
popd
perl Build.PL
'';
installPhase = ''
mkdir -p "$out/share/slic3r/"
cp -r * "$out/share/slic3r/"
wrapProgram "$out/share/slic3r/slic3r.pl" --prefix PERL5LIB : $PERL5LIB
wrapProgram "$out/share/slic3r/slic3r.pl" \
--prefix PERL5LIB : "$out/share/slic3r/xs/blib/arch:$out/share/slic3r/xs/blib/lib:$PERL5LIB"
mkdir -p "$out/bin"
ln -s "$out/share/slic3r/slic3r.pl" "$out/bin/slic3r"
mkdir -p "$out/share/pixmaps/"
@ -57,6 +65,6 @@ stdenv.mkDerivation rec {
homepage = http://slic3r.org/;
license = licenses.agpl3;
platforms = platforms.linux;
maintainers = [ maintainers.bjornfor ];
maintainers = with maintainers; [ bjornfor the-kenny ];
};
}

View file

@ -1,21 +1,21 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, cairo, dbus, dyre, filepath, gtk, gtkTraymanager
, HStringTemplate, HTTP, mtl, network, parsec, split, stm, text
, time, transformers, utf8String, X11, xdgBasedir, xmonad
, xmonadContrib
{ cabal, cairo, dbus, dyre, enclosedExceptions, filepath, gtk
, gtkTraymanager, HStringTemplate, HTTP, mtl, network, parsec, safe
, split, stm, text, time, transformers, utf8String, X11, xdgBasedir
, xmonad, xmonadContrib
}:
cabal.mkDerivation (self: {
pname = "taffybar";
version = "0.3.0";
sha256 = "02vpfbwfprca997ykk746ih7id0ls3i5pnb33gj3nrfgc59fkz7v";
version = "0.4.0";
sha256 = "1l6zl5mlpkdsvs3id6ivh4b74p65n6jr17k23y2cdwj2fr9prvr8";
isLibrary = true;
isExecutable = true;
buildDepends = [
cairo dbus dyre filepath gtk gtkTraymanager HStringTemplate HTTP
mtl network parsec split stm text time transformers utf8String X11
xdgBasedir xmonad xmonadContrib
cairo dbus dyre enclosedExceptions filepath gtk gtkTraymanager
HStringTemplate HTTP mtl network parsec safe split stm text time
transformers utf8String X11 xdgBasedir xmonad xmonadContrib
];
pkgconfigDepends = [ gtk ];
meta = {

View file

@ -30,6 +30,8 @@ mkChromiumDerivation (base: rec {
done
'';
preHook = "unset NIX_ENFORCE_PURITY";
meta = {
description = "An open source web browser from Google";
homepage = http://www.chromium.org/;

View file

@ -108,7 +108,7 @@ let
nspr udev
(if useOpenSSL then openssl else nss)
utillinux alsaLib
gcc bison gperf krb5
bison gperf krb5
glib gtk dbus_glib
libXScrnSaver libXcursor libXtst mesa
pciutils protobuf speechd libXdamage

View file

@ -25,9 +25,9 @@ let
else if stdenv.system == "i686-linux" then "ld-linux.so.2"
else throw "Dropbox client for: ${stdenv.system} not supported!";
version = "2.10.27";
sha256 = if stdenv.system == "x86_64-linux" then "0l5fkmcr5jc0sm9xm4gshhdn3a7c9ff8qf60vjbiz3gn3n7asjvv"
else if stdenv.system == "i686-linux" then "0gn1lx97z4wr1clyjd3y8r6bvwni47rc84zl20s3lsalmm25srh7"
version = "2.10.28";
sha256 = if stdenv.system == "x86_64-linux" then "0jrg9xy03yc7npjhng9wiyzidbq7s5n8g4fwynnm1yqfd69r3yac"
else if stdenv.system == "i686-linux" then "17vbikhdp5l2s8cnqmk8dln4dfzvrvgqls7av3ngf71bx3bj0fij"
else throw "Dropbox client for: ${stdenv.system} not supported!";
# relative location where the dropbox libraries are stored
@ -57,8 +57,7 @@ in stdenv.mkDerivation {
src = fetchurl {
name = "dropbox-${version}.tar.gz";
# I found the URLs here: https://forums.dropbox.com/topic.php?id=118678
url = "https://d1ilhw0800yew8.cloudfront.net/client/dropbox-lnx.${arch}-${version}.tar.gz";
url = "https://dl-web.dropbox.com/u/17/dropbox-lnx.${arch}-${version}.tar.gz";
inherit sha256;
};

View file

@ -1,39 +1,41 @@
{ stdenv, fetchurl, zlib, glib, libpng, freetype, xorg, fontconfig, alsaLib,
qt4, pulseaudio ? null }:
{ stdenv, fetchurl, zlib, glib, libpng, freetype, xorg, fontconfig, alsaLib, makeWrapper, xlibs
, qt5, pulseaudio ? null, qt4, xkeyboard_config, libredirect }:
let
version = "3.0.13.1";
arch = if stdenv.is64bit then "amd64" else "x86";
libDir = if stdenv.is64bit then "lib64" else "lib";
deps =
[ zlib glib libpng freetype xorg.libSM xorg.libICE xorg.libXrender
xorg.libXrandr xorg.libXfixes xorg.libXcursor xorg.libXinerama
fontconfig xorg.libXext xorg.libX11 alsaLib qt4 pulseaudio
xorg.libXrandr xorg.libXfixes xorg.libXcursor xorg.libXinerama xlibs.libxcb
fontconfig xorg.libXext xorg.libX11 alsaLib qt5 pulseaudio
];
in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
name = "teamspeak-client-${version}";
version = "3.0.16";
src = fetchurl {
urls = [
"http://dl.4players.de/ts/releases/${version}/TeamSpeak3-Client-linux_${arch}-${version}.run"
"http://dl.4players.de/ts/releases/${version}/TeamSpeak3-Client-linux_${arch}-${version}.run"
"http://teamspeak.gameserver.gamed.de/ts3/releases/${version}/TeamSpeak3-Client-linux_${arch}-${version}.run"
"http://files.teamspeak-services.com/releases/${version}/TeamSpeak3-Client-linux_${arch}-${version}.run"
];
sha256 = if stdenv.is64bit
then "0mj8vpsnv906n3wgjwhiby5gk26jr5jbd94swmsf0s9kqwhsj6i1"
else "1hlw7lc0nl1mrsyd052s6ws64q5aabnw6qpv8mrdxb3hyp7g2qh1";
then "0gvphrmrkyy1g2nprvdk7cvawznzlv4smw0mlvzd4b9mvynln0v2"
else "1b3nbvfpd8lx3dig8z5yk6zjkbmsy6y938dhj1f562wc8adixciz";
};
buildInputs = [ makeWrapper ];
unpackPhase =
''
yes yes | sh $src
yes | sh $src
cd TeamSpeak*
'';
@ -51,7 +53,8 @@ stdenv.mkDerivation {
installPhase =
''
# Delete unecessary libraries - these are provided by nixos.
rm *.so.*
rm libQt*.so.*
rm qt.conf
# Install files.
mkdir -p $out/lib/teamspeak
@ -60,6 +63,11 @@ stdenv.mkDerivation {
# Make a symlink to the binary from bin.
mkdir -p $out/bin/
ln -s $out/lib/teamspeak/ts3client $out/bin/ts3client
wrapProgram $out/bin/ts3client \
--set LD_PRELOAD "${libredirect}/lib/libredirect.so:$out/lib/teamspeak/libquazip.so.1" \
--set QT_PLUGIN_PATH "$out/lib/teamspeak/platforms" \
--set NIX_REDIRECTS /usr/share/X11/xkb=${xkeyboard_config}/share/X11/xkb
'';
dontStrip = true;

View file

@ -0,0 +1,17 @@
Index: twinkle-1.4.2/configure.in
===================================================================
--- twinkle-1.4.2.orig/configure.in 2013-07-25 11:07:54.160534950 -0400
+++ twinkle-1.4.2/configure.in 2013-07-25 11:07:59.000000000 -0400
@@ -294,7 +294,11 @@
AC_CHECK_LIB(boost_regex-gcc, main, [
LIBS="-lboost_regex-gcc $LIBS"
echo "LIBS += -lboost_regex-gcc" >> $QT_INCL_PRO],
- [AC_MSG_ERROR([libboost_regex library is missing (boost package).])])])
+ [
+ AC_CHECK_LIB(boost_regex, main, [
+ LIBS="-lboost_regex $LIBS"
+ echo "LIBS += -lboost_regex" >> $QT_INCL_PRO],
+ [AC_MSG_ERROR([libboost_regex library is missing (boost package).])])])])
ms_CHECK_LRELEASE()

View file

@ -1,29 +1,40 @@
{ stdenv, fetchurl, pkgconfig, commoncpp2, ccrtp, openssl, boost
{ stdenv, fetchurl, pkgconfig, autoreconfHook, commoncpp2, ccrtp, openssl, boost
, libsndfile, libxml2, libjpeg, readline, qt3, perl, file
, alsaLib, speex, libzrtpcpp, xorg }:
stdenv.mkDerivation {
stdenv.mkDerivation rec {
name = "twinkle-1.4.2";
src = fetchurl {
url = http://www.xs4all.nl/~mfnboer/twinkle/download/twinkle-1.4.2.tar.gz;
url = "http://www.xs4all.nl/~mfnboer/twinkle/download/${name}.tar.gz";
sha256 = "19c9gqam78srsgv0463g7lfnv4mn5lvbxx3zl87bnm0vmk3qcxl0";
};
patches = [ # all from Debian
./newer-libccrtp.diff
./libgsm.patch
./localetime_r_conflict.diff
./boost_regex.patch # modified not to use "-mt" suffix
];
configureFlags = "--with-extra-includes=${libjpeg}/include";
buildInputs =
[ pkgconfig commoncpp2 ccrtp openssl boost libsndfile
[ pkgconfig autoreconfHook commoncpp2 openssl boost libsndfile
libxml2 libjpeg readline qt3 perl file
# optional ? :
alsaLib
speex libzrtpcpp xorg.libX11 xorg.libXaw xorg.libICE xorg.libXext
alsaLib speex
libzrtpcpp xorg.libX11 xorg.libXaw xorg.libICE xorg.libXext
];
meta = {
homepage = http://www.xs4all.nl/~mfnboer/twinkle/index.html;
license = "GPL";
maintainers = [ stdenv.lib.maintainers.marcweber ];
platforms = stdenv.lib.platforms.linux;
NIX_CFLAGS_LINK = "-Wl,--as-needed -lboost_regex -lasound -lzrtpcpp -lspeex -lspeexdsp";
enableParallelBuilding = true;
meta = with stdenv.lib; {
homepage = http://www.twinklephone.com/;
license = licenses.gpl2Plus;
maintainers = [ maintainers.marcweber ];
platforms = platforms.linux;
};
}

View file

@ -0,0 +1,70 @@
Index: twinkle-1.4.2/configure.in
===================================================================
--- twinkle-1.4.2.orig/configure.in 2013-07-25 11:07:54.264533206 -0400
+++ twinkle-1.4.2/configure.in 2013-07-25 11:07:54.256533340 -0400
@@ -195,22 +195,33 @@
# This check does not work on all platforms
# Check if libgsm is available
-# AC_CHECK_LIB(gsm, sf_open, [
-# AC_CHECK_HEADER(gsm.h, [],
-# [AC_MSG_ERROR([gsm header files missing (gsm.h)])])
-# AC_DEFINE(HAVE_GSM, 1, [Define to 1 if you have the <libgsm> library.])
-# GSM_LIBS="-lgsm"
-# echo "LIBS += -lgsm" >> $QT_INCL_PRO
-# have_gsm="yes" ], [
-# have_gsm="no"
-# GSM_LIBS="\$(top_builddir)/src/audio/gsm/libgsm.a"
-# echo "LIBS += ../audio/gsm/libgsm.a" >> $QT_INCL_PRO ])
-have_gsm="no"
-GSM_LIBS="\$(top_builddir)/src/audio/gsm/libgsm.a"
-echo "LIBS += ../audio/gsm/libgsm.a" >> $QT_INCL_PRO
+AC_CHECK_LIB(gsm, sf_open, [
+ AC_CHECK_HEADER(gsm.h, [],
+ [AC_MSG_ERROR([gsm header files missing (gsm.h)])])
+ AC_DEFINE(HAVE_GSM, 1, [Define to 1 if you have the <libgsm> library.])
+ GSM_LIBS="-lgsm"
+ echo "LIBS += -lgsm" >> $QT_INCL_PRO
+ have_gsm="yes" ], [
+ have_gsm="no"
+ GSM_LIBS="\$(top_builddir)/src/audio/gsm/libgsm.a"
+ echo "LIBS += ../audio/gsm/libgsm.a" >> $QT_INCL_PRO ])
+#have_gsm="no"
+#GSM_LIBS="\$(top_builddir)/src/audio/gsm/libgsm.a"
+#echo "LIBS += ../audio/gsm/libgsm.a" >> $QT_INCL_PRO
AC_SUBST(GSM_LIBS)
+# Check if libgsm is available
+AC_CHECK_LIB(gsm, sf_open, [
+ AC_CHECK_HEADER(gsm.h, [],
+ [AC_MSG_ERROR([gsm header files missing (gsm.h)])])
+ AC_DEFINE(HAVE_GSM, 1, [Define to 1 if you have the <libgsm> library.])
+ LIBS="-lgsm $LIBS"
+ echo "LIBS += -lgsm" >> $QT_INCL_PRO
+ have_gsm="yes" ], [
+ have_gsm="no"
+ echo "$(top_builddir)/src/audio/gsm/libgsm.a" >> $QT_INCL_PRO ])
+
# Check if ALSA is available
AC_CHECK_LIB(asound, main, [
AC_CHECK_HEADER(alsa/asoundlib.h, [],
@@ -348,3 +359,4 @@
AC_MSG_RESULT([Speex: $have_speex])
AC_MSG_RESULT([iLBC: $have_ilbc])
AC_MSG_RESULT([ZRTP: $have_zrtp])
+AC_MSG_RESULT([Libgsm dynamic link: $have_gsm])
Index: twinkle-1.4.2/src/twinkle_config.h.in
===================================================================
--- twinkle-1.4.2.orig/src/twinkle_config.h.in 2013-07-25 11:07:54.264533206 -0400
+++ twinkle-1.4.2/src/twinkle_config.h.in 2013-07-25 11:07:54.256533340 -0400
@@ -19,6 +19,9 @@
/* Define to 1 if you have the <history.h> header file. */
#undef HAVE_HISTORY_H
+/* Define to 1 if you have the <libgsm> library. */
+#undef HAVE_GSM
+
/* Define to 1 if you have the <ilbc> library. */
#undef HAVE_ILBC

View file

@ -0,0 +1,13 @@
Index: twinkle-1.4.2/src/log.cpp
===================================================================
--- twinkle-1.4.2.orig/src/log.cpp 2009-01-18 09:35:28.000000000 -0500
+++ twinkle-1.4.2/src/log.cpp 2013-07-25 11:43:08.901209713 -0400
@@ -161,7 +161,7 @@
gettimeofday(&t, NULL);
date = t.tv_sec;
- localtime_r(&date, &tm);
+ ost::localtime_r(&date, &tm);
*log_stream << "+++ ";
*log_stream << tm.tm_mday;

View file

@ -0,0 +1,22 @@
Index: twinkle-1.4.2/configure.in
===================================================================
--- twinkle-1.4.2.orig/configure.in 2013-07-25 11:09:16.000000000 -0400
+++ twinkle-1.4.2/configure.in 2013-07-25 11:11:59.512418187 -0400
@@ -66,7 +66,7 @@
export PKG_CONFIG_PATH
-PKG_CHECK_MODULES(CCRTP, libccrtp1 >= 1.6.0)
+PKG_CHECK_MODULES(CCRTP, libccrtp >= 1.6.0)
PKG_CHECK_MODULES(XML2, libxml-2.0)
# AC_CHECK_HEADER(libxml/tree.h, [],
@@ -136,7 +136,7 @@
#echo "INCLUDEPATH += `$CCGNU2_CONFIG --includes`" | sed -e s/-I//g > $QT_INCL_PRO
# libccrtp1(ccrtp) depend from libccgnu2(commoncpp2) and
# should include above flags !
-echo "INCLUDEPATH += `$PKG_CONFIG --cflags-only-I libccrtp1`" | sed -e s/-I//g >> $QT_INCL_PRO
+echo "INCLUDEPATH += `$PKG_CONFIG --cflags-only-I libccrtp`" | sed -e s/-I//g >> $QT_INCL_PRO
echo "INCLUDEPATH += `$PKG_CONFIG --cflags-only-I libxml-2.0`" | sed -e s/-I//g >> $QT_INCL_PRO
# get libraries specified on command line

View file

@ -3,12 +3,12 @@
, pythonPackages, cacert, cmake, makeWrapper }:
stdenv.mkDerivation rec {
version = "0.4.3";
version = "1.0";
name = "weechat-${version}";
src = fetchurl {
url = "http://weechat.org/files/src/${name}.tar.gz";
sha256 = "1sfx2j8xy6das0zis2nmzi9z41q96gzq61xaw4i0xbgag17s7ddz";
sha256 = "1z17wyrl5fp697qp44srpmzk79w37f5hm1r0krffbmga6sbzdj3x";
};
buildInputs =
@ -17,13 +17,6 @@ stdenv.mkDerivation rec {
cacert cmake ]
++ stdenv.lib.optional stdenv.isDarwin pythonPackages.pync;
# This patch is based on
# weechat/c324610226cef15ecfb1235113c8243b068084c8. It fixes
# freeze/crash on /exit when using nixpkgs' gnutls 3.2. The next
# weechat release (0.4.4) will include this, so it's safe to remove
# then.
patches = [ ./fix-gnutls-32.diff ];
NIX_CFLAGS_COMPILE = "-I${python}/include/${python.libPrefix}";
postInstall = ''

View file

@ -1,16 +0,0 @@
diff --git a/src/gui/curses/CMakeLists.txt b/src/gui/curses/CMakeLists.txt
index 325c611..a8927bc 100644
--- a/src/gui/curses/CMakeLists.txt
+++ b/src/gui/curses/CMakeLists.txt
@@ -53,9 +53,7 @@ IF(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
ENDIF(HAVE_BACKTRACE)
ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
-IF(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
- LIST(APPEND EXTRA_LIBS "pthread")
-ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
+LIST(APPEND EXTRA_LIBS "pthread")
IF(ICONV_LIBRARY)
LIST(APPEND EXTRA_LIBS ${ICONV_LIBRARY})

View file

@ -3,7 +3,7 @@
{stdenv, fetchgit, pkgconfig, ocaml, findlib, camlp5, ncurses, lablgtk ? null}:
let
version = "8.5pre-fff9e2f7";
version = "8.5pre-8bc01590";
buildIde = lablgtk != null;
ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else "";
idePath = if buildIde then ''
@ -16,8 +16,8 @@ stdenv.mkDerivation {
src = fetchgit {
url = git://scm.gforge.inria.fr/coq/coq.git;
rev = "21994cc4c617582f4f94577c1c582a7b51b7770b";
sha256 = "12kadlmyh9bspn9kds36pwrq77d0widrk5q43wyrgb8y9zrnyz61";
rev = "8bc0159095cb0230a50c55a1611c8b77134a6060";
sha256 = "1cp4hbk9jw78y03vwz099yvixax161h60hsbyvwiwz2z5czjxzcv";
};
buildInputs = [ pkgconfig ocaml findlib camlp5 ncurses lablgtk ];

View file

@ -6,7 +6,7 @@
let
pname = "ssreflect";
version = "1.4";
version = "1.5";
name = "${pname}-${version}";
webpage = http://www.msr-inria.inria.fr/Projects/math-components;
in
@ -15,8 +15,8 @@ stdenv.mkDerivation {
inherit name;
src = fetchurl {
url = "http://ssr.msr-inria.inria.fr/FTP/${name}-coq8.4.tar.gz";
sha256 = "1ysx29xw09i86lq0d92z9cnyx133jfgq4qddy3501000fn7xwi7h";
url = "http://ssr.msr-inria.inria.fr/FTP/${name}.tar.gz";
sha256 = "0hm1ha7sxqfqhc7iwhx6zdz3nki4rj5nfd3ab24hmz8v7mlpinds";
};
buildInputs = [ ocaml camlp5 coq makeWrapper ];

View file

@ -3,45 +3,38 @@
{ cabal, aeson, async, blazeBuilder, bloomfilter, bup, byteable
, caseInsensitive, clientsession, cryptoApi, cryptohash, curl
, dataDefault, dataenc, DAV, dbus, dlist, dns, editDistance
, exceptions, extensibleExceptions, fdoNotify, feed, filepath, git
, gnupg1, gnutls, hamlet, hinotify, hS3, hslogger, HTTP, httpClient
, httpConduit, httpTypes, IfElse, json, liftedBase, lsof, MissingH
, monadControl, mtl, network, networkInfo, networkMulticast
, networkProtocolXmpp, openssh, optparseApplicative, pathPieces
, perl, QuickCheck, random, regexTdfa, rsync, SafeSemaphore
, securemem, SHA, shakespeare, stm, tasty, tastyHunit
, tastyQuickcheck, tastyRerun, text, time, transformers, unixCompat
, utf8String, uuid, wai, waiExtra, warp, warpTls, which, xmlTypes
, yesod, yesodCore, yesodDefault, yesodForm, yesodStatic
, fsnotify
, exceptions, fdoNotify, feed, filepath, git, gnupg1, gnutls
, hamlet, hinotify, hS3, hslogger, httpClient, httpConduit
, httpTypes, IfElse, json, lsof, MissingH, monadControl, mtl
, network, networkInfo, networkMulticast, networkProtocolXmpp
, openssh, optparseApplicative, pathPieces, perl, QuickCheck
, random, regexTdfa, rsync, SafeSemaphore, securemem, SHA
, shakespeare, stm, tasty, tastyHunit, tastyQuickcheck, tastyRerun
, text, time, transformers, unixCompat, utf8String, uuid, wai
, waiExtra, warp, warpTls, which, xmlTypes, yesod, yesodCore
, yesodDefault, yesodForm, yesodStatic
}:
cabal.mkDerivation (self: {
pname = "git-annex";
version = "5.20140717";
sha256 = "199gqp85f6xnyg3svs23n3r6q4pflvz4zy5y376klay9mzzp0rbl";
version = "5.20140817";
sha256 = "0cly19rd250qiikzszgad2r5xz570kr00vcb8ij6icbm53pw3hxc";
isLibrary = false;
isExecutable = true;
buildDepends = [
aeson async blazeBuilder bloomfilter byteable caseInsensitive
clientsession cryptoApi cryptohash dataDefault dataenc DAV
dlist dns editDistance exceptions extensibleExceptions
feed filepath gnutls hamlet hS3 hslogger HTTP httpClient
httpConduit httpTypes IfElse json liftedBase MissingH monadControl
mtl network networkInfo networkMulticast networkProtocolXmpp
optparseApplicative pathPieces QuickCheck random regexTdfa
SafeSemaphore securemem SHA shakespeare stm tasty tastyHunit
tastyQuickcheck tastyRerun text time transformers unixCompat
utf8String uuid wai waiExtra warp warpTls xmlTypes yesod yesodCore
yesodDefault yesodForm yesodStatic
] ++ (if self.stdenv.isDarwin then [
fsnotify
] else [
dbus fdoNotify hinotify
]);
clientsession cryptoApi cryptohash dataDefault dataenc DAV dbus
dlist dns editDistance exceptions fdoNotify feed filepath gnutls
hamlet hinotify hS3 hslogger httpClient httpConduit httpTypes
IfElse json MissingH monadControl mtl network networkInfo
networkMulticast networkProtocolXmpp optparseApplicative pathPieces
QuickCheck random regexTdfa SafeSemaphore securemem SHA shakespeare
stm tasty tastyHunit tastyQuickcheck tastyRerun text time
transformers unixCompat utf8String uuid wai waiExtra warp warpTls
xmlTypes yesod yesodCore yesodDefault yesodForm yesodStatic
];
buildTools = [ bup curl git gnupg1 lsof openssh perl rsync which ];
configureFlags = "-fAssistant
-fProduction";
configureFlags = "-fAssistant -fProduction";
preConfigure = ''
export HOME="$NIX_BUILD_TOP/tmp"
mkdir "$HOME"
@ -57,6 +50,6 @@ cabal.mkDerivation (self: {
description = "manage files with git, without checking their contents into git";
license = self.stdenv.lib.licenses.gpl3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.simons ];
maintainers = with self.stdenv.lib.maintainers; [ simons ];
};
})

View file

@ -10,7 +10,7 @@
let
version = "2.0.2";
version = "2.1.0";
svn = subversionClient.override { perlBindings = true; };
@ -21,7 +21,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
sha256 = "1hk9xxnqiyxii4cfl0j88kws5h1w8xavmfp8a2qb3as5jwnc5y5w";
sha256 = "19q1as2bjh4yifmgw6cciwfw0dswxppaf5iq8h8934i33bf15mwd";
};
patches = [ ./docbook2texi.patch ./symlinks-in-bin.patch ./cert-path.patch ];
@ -66,6 +66,7 @@ stdenv.mkDerivation {
ln -s "$out/share/git/contrib/emacs/"*.el $out/share/emacs/site-lisp/
mkdir -p $out/etc/bash_completion.d
ln -s $out/share/git/contrib/completion/git-completion.bash $out/etc/bash_completion.d/
ln -s $out/share/git/contrib/completion/git-prompt.sh $out/etc/bash_completion.d/
# grep is a runtime dependency, need to patch so that it's found
substituteInPlace $out/libexec/git-core/git-sh-setup \

View file

@ -1,8 +1,8 @@
{stdenv, fetchurl, pygtk, python, intltool, scrollkeeper, makeWrapper }:
let
minor = "1.6";
version = "${minor}.1";
minor = "1.8";
version = "${minor}.6";
in
stdenv.mkDerivation {
@ -10,7 +10,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "mirror://gnome/sources/meld/${minor}/meld-${version}.tar.xz";
sha256 = "00rsff0yl5qwzh0igkdns6ry2xsbxad70avpqpkbd2bldi94v76y";
sha256 = "19g86rksrs77hd58zhs3zwbjmmhqc98v2ly8451avwsbiwmni5mg";
};
buildInputs = [ pygtk python intltool scrollkeeper makeWrapper ];

View file

@ -17,13 +17,13 @@ assert javahlBindings -> jdk != null && perl != null;
stdenv.mkDerivation rec {
version = "1.8.9";
version = "1.8.10";
name = "subversion-${version}";
src = fetchurl {
url = "mirror://apache/subversion/${name}.tar.bz2";
sha1 = "424ee12708f39a126efd905886666083dcc4eeaf";
sha1 = "d6896d94bb53c1b4c6e9c5bb1a5c466477b19b2b";
};
buildInputs = [ zlib apr aprutil sqlite ]

View file

@ -1,5 +1,6 @@
{ stdenv, fetchurl, pkgconfig, freetype, yasm
, fontconfigSupport ? true, fontconfig ? null, freefont_ttf ? null
, fribidiSupport ? true, fribidi ? null
, x11Support ? true, libX11 ? null, libXext ? null, mesa ? null
, xineramaSupport ? true, libXinerama ? null
, xvSupport ? true, libXv ? null
@ -25,6 +26,7 @@
assert fontconfigSupport -> (fontconfig != null);
assert (!fontconfigSupport) -> (freefont_ttf != null);
assert fribidiSupport -> (fribidi != null);
assert x11Support -> (libX11 != null && libXext != null && mesa != null);
assert xineramaSupport -> (libXinerama != null && x11Support);
assert xvSupport -> (libXv != null && x11Support);
@ -78,7 +80,7 @@ let
in
stdenv.mkDerivation rec {
name = "mplayer-1.1";
name = "mplayer-1.1.1";
src = fetchurl {
# Old kind of URL:
@ -89,8 +91,8 @@ stdenv.mkDerivation rec {
#url = http://www.mplayerhq.hu/MPlayer/releases/mplayer-export-snapshot.tar.bz2;
#sha256 = "cc1b3fda75b172f02c3f46581cfb2c17f4090997fe9314ad046e464a76b858bb";
url = "http://www.mplayerhq.hu/MPlayer/releases/MPlayer-1.1.tar.xz";
sha256 = "173cmsfz7ckzy1hay9mpnc5as51127cfnxl20b521d2jvgm4gjvn";
url = "http://www.mplayerhq.hu/MPlayer/releases/MPlayer-1.1.1.tar.xz";
sha256 = "ce8fc7c3179e6a57eb3a58cb7d1604388756b8a61764cc93e095e7aff3798c76";
};
prePatch = ''
@ -100,6 +102,7 @@ stdenv.mkDerivation rec {
buildInputs = with stdenv.lib;
[ pkgconfig freetype ]
++ optional fontconfigSupport fontconfig
++ optional fribidiSupport fribidi
++ optionals x11Support [ libX11 libXext mesa ]
++ optional alsaSupport alsaLib
++ optional xvSupport libXv
@ -150,6 +153,7 @@ stdenv.mkDerivation rec {
${if pulseSupport then "--enable-pulse" else "--disable-pulse"}
${optionalString (useUnfreeCodecs && codecs != null) "--codecsdir=${codecs}"}
${optionalString (stdenv.isi686 || stdenv.isx86_64) "--enable-runtime-cpudetection"}
${optionalString fribidiSupport "--enable-fribidi"}
--disable-xanim
--disable-ivtv
--disable-xvid --disable-xvid-lavc
@ -160,6 +164,7 @@ stdenv.mkDerivation rec {
NIX_LDFLAGS = with stdenv.lib;
optional fontconfigSupport "-lfontconfig"
++ optional fribidiSupport "-lfribidi"
++ optionals x11Support [ "-lX11" "-lXext" ]
;

View file

@ -1,23 +1,25 @@
{ stdenv, fetchurl, git, perl, libxcb, libXinerama, xcbutil, xcbutilwm, xcbutilkeysyms }:
stdenv.mkDerivation rec {
name = "bar-1.0";
{ stdenv, fetchurl, perl, libxcb }:
let
version = "1.0";
in
stdenv.mkDerivation rec {
name = "bar-${version}";
src = fetchurl {
url = "https://github.com/LemonBoy/bar/archive/v1.0.tar.gz";
sha256 = "1n2vak2acs37sslxl250cnz9c3irif5z4s54wi9qjyxbfzr2h2nc";
};
buildInputs = [ libxcb git perl libXinerama xcbutil xcbutilkeysyms xcbutilwm ];
prePatch = ''sed -i "s@/usr@$out@" Makefile'';
meta = {
description = "A lightweight xcb based bar";
homepage = "https://github.com/LemonBoy/bar";
maintainers = stdenv.lib.maintainers.meisternu;
license = "Custom";
platforms = stdenv.lib.platforms.linux;
};
src = fetchurl {
url = "https://github.com/LemonBoy/bar/archive/v${version}.tar.gz";
sha256 = "1n2vak2acs37sslxl250cnz9c3irif5z4s54wi9qjyxbfzr2h2nc";
};
buildInputs = [ libxcb perl ];
prePatch = ''sed -i "s@/usr@$out@" Makefile'';
meta = {
description = "A lightweight xcb based bar";
homepage = "https://github.com/LemonBoy/bar";
maintainers = stdenv.lib.maintainers.meisternu;
license = "Custom";
platforms = stdenv.lib.platforms.linux;
};
}

View file

@ -18,6 +18,11 @@ let
optionals = stdenv.lib.optionals;
optionalString = stdenv.lib.optionalString;
filter = stdenv.lib.filter;
defaultSetupHs = builtins.toFile "Setup.hs" ''
import Distribution.Simple
main = defaultMain
'';
in
# Cabal shipped with GHC 6.12.4 or earlier doesn't know the "--enable-tests configure" flag.
@ -179,9 +184,10 @@ assert !enableStaticLibraries -> versionOlder "7.7" ghc.version;
${optionalString self.jailbreak "${jailbreakCabal}/bin/jailbreak-cabal ${self.pname}.cabal"}
for i in Setup.hs Setup.lhs; do
test -f $i && ghc --make $i
for i in Setup.hs Setup.lhs ${defaultSetupHs}; do
test -f $i && break
done
ghc --make -o Setup -odir $TMPDIR $i
for p in $extraBuildInputs $propagatedNativeBuildInputs; do
if [ -d "$p/lib/ghc-${ghc.ghc.version}/package.conf.d" ]; then
@ -199,10 +205,13 @@ assert !enableStaticLibraries -> versionOlder "7.7" ghc.version;
done
${optionalString (self.enableSharedExecutables && self.stdenv.isLinux) ''
configureFlags+=" --ghc-option=-optl=-Wl,-rpath=$out/lib/${ghc.ghc.name}/${self.pname}-${self.version}";
configureFlags+=" --ghc-option=-optl=-Wl,-rpath=$out/lib/${ghc.ghc.name}/${self.pname}-${self.version}"
''}
${optionalString (self.enableSharedExecutables && self.stdenv.isDarwin) ''
configureFlags+=" --ghc-option=-optl=-Wl,-headerpad_max_install_names";
configureFlags+=" --ghc-option=-optl=-Wl,-headerpad_max_install_names"
''}
${optionalString (versionOlder "7.8" ghc.version) ''
configureFlags+=" --ghc-option=-j$NIX_BUILD_CORES"
''}
echo "configure flags: $extraConfigureFlags $configureFlags"

View file

@ -77,7 +77,6 @@ if test "$NIX_ENFORCE_PURITY" = "1" -a -n "$NIX_STORE"; then
n=$((n + 1))
done
params=("${rest[@]}")
NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE --sysroot=/var/empty"
fi

View file

@ -32,9 +32,6 @@ if test "$NIX_ENFORCE_PURITY" = "1" -a -n "$NIX_STORE" \
# We cannot skip this; barf.
echo "impure path \`$p' used in link" >&2
exit 1
elif test "${p:0:9}" = "--sysroot"; then
# Our ld is not built with sysroot support (Can we fix that?)
:
else
rest=("${rest[@]}" "$p")
fi

View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "man-pages-3.64";
name = "man-pages-3.70";
src = fetchurl {
url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz";
sha256 = "1p9zk130c852gqci6dyw57yaqx4v871n8n82kkccdpj7y63xr4bl";
sha256 = "1qnhlicshlcz2da9k9czp75cfj7a6y90m0bhik7gzxa3s3b4f43j";
};
preBuild =

View file

@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
gobjectIntrospection libX11 gtk
libcanberra_gtk3 pam libtool ];
enableParallelBuilding = true;
#enableParallelBuilding = true; # problems compiling
preBuild = ''
substituteInPlace daemon/gdm-simple-slave.c --replace 'BINDIR "/gnome-session' '"${gnome_session}/bin/gnome-session'

View file

@ -4,7 +4,7 @@
, automoc4, soprano, qca2, attica, enchant, libdbusmenu_qt, grantlee
, docbook_xml_dtd_42, docbook_xsl, polkit_qt_1, acl, attr, libXtst
, udev, herqq, phonon, libjpeg, xz, ilmbase, libxslt
, pkgconfig
, pkgconfig, fetchpatch
}:
kde {
@ -28,7 +28,15 @@ kde {
# There are a few hardcoded paths.
# Split plugins from libs?
patches = [ ../files/polkit-install.patch ];
patches = [
../files/polkit-install.patch
(fetchpatch {
name = "CVE-2014-5033.patch";
url = "http://quickgit.kde.org/?p=kdelibs.git"
+ "&a=commit&h=e4e7b53b71e2659adaf52691d4accc3594203b23";
sha256 = "0mdqa9w1p6cmli6976v4wi0sw9r4p5prkj7lzfd1877wk11c9c73";
})
];
cmakeFlags = [
"-DDOCBOOKXML_CURRENTDTD_DIR=${docbook_xml_dtd_42}/xml/dtd/docbook"

View file

@ -1,13 +1,12 @@
{ stdenv, fetchgit, mono, pkgconfig, autoconf, automake, which }:
{ stdenv, fetchurl, mono, pkgconfig, autoconf, automake, which }:
stdenv.mkDerivation rec {
name = "fsharp-${version}";
version = "3.1.0";
version = "3.1.1.25";
src = fetchgit {
url = "https://github.com/fsharp/fsharp";
rev = "refs/heads/fsharp_31";
sha256 = "0d41ae31c57ec9ac8a4ea149b615ae085f3774b8877d8e53ddbf68856c32eda0";
src = fetchurl {
url = "https://github.com/fsharp/fsharp/archive/${version}.tar.gz";
sha256 = "1vrgw7qk4g78mjjapc1a1frribcgya4cdrwahv3i26z9s10g5h3d";
};
buildInputs = [ mono pkgconfig autoconf automake which ];

View file

@ -64,6 +64,7 @@ let version = "4.8.3";
patches = []
++ optional enableParallelBuilding ./parallel-bconfig.patch
++ optional (cross != null) ./libstdc++-target.patch
++ optional noSysDirs ./no-sys-dirs.patch
# The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its
# target libraries and tools.
++ optional langAda ./gnat-cflags.patch

View file

@ -0,0 +1,28 @@
diff -ru -x '*~' gcc-4.8.3-orig/gcc/cppdefault.c gcc-4.8.3/gcc/cppdefault.c
--- gcc-4.8.3-orig/gcc/cppdefault.c 2013-01-10 21:38:27.000000000 +0100
+++ gcc-4.8.3/gcc/cppdefault.c 2014-08-18 16:20:32.893944536 +0200
@@ -35,6 +35,8 @@
# undef CROSS_INCLUDE_DIR
#endif
+#undef LOCAL_INCLUDE_DIR
+
const struct default_include cpp_include_defaults[]
#ifdef INCLUDE_DEFAULTS
= INCLUDE_DEFAULTS;
diff -ru -x '*~' gcc-4.8.3-orig/gcc/gcc.c gcc-4.8.3/gcc/gcc.c
--- gcc-4.8.3-orig/gcc/gcc.c 2014-03-23 12:30:57.000000000 +0100
+++ gcc-4.8.3/gcc/gcc.c 2014-08-18 13:19:32.689201690 +0200
@@ -1162,10 +1162,10 @@
/* Default prefixes to attach to command names. */
#ifndef STANDARD_STARTFILE_PREFIX_1
-#define STANDARD_STARTFILE_PREFIX_1 "/lib/"
+#define STANDARD_STARTFILE_PREFIX_1 ""
#endif
#ifndef STANDARD_STARTFILE_PREFIX_2
-#define STANDARD_STARTFILE_PREFIX_2 "/usr/lib/"
+#define STANDARD_STARTFILE_PREFIX_2 ""
#endif
#ifdef CROSS_DIRECTORY_STRUCTURE /* Don't use these prefixes for a cross compiler. */

View file

@ -1,12 +1,12 @@
{ stdenv, fetchurl, ghc, perl, gmp, ncurses, happy, alex }:
stdenv.mkDerivation rec {
version = "7.9.20140608";
version = "7.9.20140814";
name = "ghc-${version}";
src = fetchurl {
url = "http://deb.haskell.org/dailies/2014-06-08/ghc_${version}.orig.tar.bz2";
sha256 = "0x3hgh4zfns2m6bbq9xwwlafav0a29azl0xh8549za256clz97w1";
url = "http://deb.haskell.org/dailies/2014-08-14/ghc_${version}.orig.tar.bz2";
sha256 = "05vmlbzbfv72z570xmlh8n003z9xc4l5hixjqvczyyyisdvmyaa3";
};
buildInputs = [ ghc perl gmp ncurses happy alex ];

View file

@ -3,18 +3,13 @@
stdenv.mkDerivation rec {
name = "jhc-${version}";
version = "0.8.1";
version = "0.8.2";
src = fetchurl {
url = "http://repetae.net/dist/${name}.tar.gz";
sha256 = "11fya5ggk6q4vcm3kwjacfaaqvkammih25saqwlr1g40bcikbnf2";
url = "http://repetae.net/dist/${name}.tar.gz";
sha256 = "0lrgg698mx6xlrqcylba9z4g1f053chrzc92ri881dmb1knf83bz";
};
patchPhase = ''
substituteInPlace ./src/Util/Interact.hs \
--replace USE_NOLINE USE_READLINE
'';
buildInputs =
[ perl ghc binary zlib utf8String
readline fgl regexCompat HsSyck random

View file

@ -0,0 +1,24 @@
#!/bin/bash
source $stdenv/setup
echo "Building Manticore research compiler."
set -xe
PATH=$smlnj/bin:$PATH
mkdir -p $out/bin
# Manticore seems to use the MLB files from the build tree,
# so for now we copy the whole build tree into the store:
cd $out/
tar xf $src
mv manticore* repo_checkout
cd repo_checkout/
# TODO: At the very least, this could probably be cut down to a subset
# of the repo.
${autoconf}/bin/autoheader -Iconfig
${autoconf}/bin/autoconf -Iconfig
./configure --prefix=$out
make build -j
make install

View file

@ -0,0 +1,28 @@
{ stdenv, fetchurl, coreutils, autoconf, automake, smlnj }:
stdenv.mkDerivation rec {
name = "manticore-${version}";
version = "2014.08.18";
builder = ./builder.sh;
src = fetchurl {
url = https://github.com/rrnewton/manticore_temp_mirror/archive/snapshot-20140818.tar.gz;
sha256 = "1x52xpj5gbcpqjqm6aw6ssn901f353zypj3d5scm8i3ad777y29d";
};
inherit stdenv coreutils autoconf automake smlnj;
meta = {
description = "a parallel, pure variant of Standard ML";
longDescription = ''
Manticore is a high-level parallel programming language aimed at
general-purpose applications running on multi-core
processors. Manticore supports parallelism at multiple levels:
explicit concurrency and coarse-grain parallelism via CML-style
constructs and fine-grain parallelism via various light-weight
notations, such as parallel tuple expressions and NESL/Nepal-style
parallel array comprehensions.
'';
homepage = http://manticore.cs.uchicago.edu/;
};
}

View file

@ -1,14 +1,14 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "orc-0.4.19";
name = "orc-0.4.21";
src = fetchurl {
url = "http://gstreamer.freedesktop.org/src/orc/${name}.tar.gz";
sha256 = "17mmgwll2waz44m908lcxc5fd6n44yysh7p4pdw33hr138r507z2";
url = "http://gstreamer.freedesktop.org/src/orc/${name}.tar.xz";
sha256 = "187wrnq0ficwjj4y3yqci5fxcdkiazfs6k5js26k5b26hipzmham";
};
doCheck = true;
doCheck = stdenv.is64bit; # see https://bugzilla.gnome.org/show_bug.cgi?id=728129#c7
meta = {
description = "The Oil Runtime Compiler";

View file

@ -42,8 +42,7 @@ in stdenv.mkDerivation {
homepage = "http://www.cs.uu.nl/wiki/UHC";
description = "Utrecht Haskell Compiler";
platforms = stdenv.lib.platforms.linux;
maintainers = [
stdenv.lib.maintainers.andres
];
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
};
}

View file

@ -1,14 +1,14 @@
{ stdenv, fetchurl, erlang, rebar, makeWrapper, coreutils }:
let
version = "0.13.3";
version = "0.15.1";
in
stdenv.mkDerivation {
name = "elixir-${version}";
src = fetchurl {
url = "https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz";
sha256 = "17nb8qfyjc67g62x10l2gq0z1501xa4wry906br0w2rm8bf4j8rf";
sha256 = "8e608abf90a6e9a25ef5fb7e45dfd04e2cb7e1fecb4ac260bf6652885a7f0c50";
};
buildInputs = [ erlang rebar makeWrapper ];

View file

@ -0,0 +1,30 @@
{ stdenv, fetchgit, cmake, perl }:
stdenv.mkDerivation rec {
name = "boringssl-${version}";
version = "20140820-a7d1363f";
src = fetchgit {
url = "https://boringssl.googlesource.com/boringssl";
rev = "a7d1363fcb1f0d825ec2393c06be3d58b0c57efd";
sha256 = "d27dd1416de1a2ea4ec2c219248b2ed2cce5c0405e56adb394077ddc7c319bab";
};
buildInputs = [ cmake perl ];
enableParallelBuilding = true;
installPhase = ''
mkdir -p $out/bin $out/include $out/lib
mv tool/bssl $out/bin
mv ssl/libssl.a $out/lib
mv ../include/openssl $out/include
'';
meta = {
description = "Free TLS/SSL implementation";
homepage = "https://boringssl.googlesource.com";
platforms = stdenv.lib.platforms.all;
maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
};
}

View file

@ -2,13 +2,17 @@
stdenv.mkDerivation rec {
name = "concurrencykit-${version}";
version = "0.4.1";
version = "0.4.3";
src = fetchurl {
url = "http://concurrencykit.org/releases/ck-${version}.tar.gz";
sha256 = "1gi5gpkxvbb6vkhjm9kab7dz1av2i11f1pggxp001rqq2mi3i6aq";
sha256 = "1fjdvbj6wazblg6qy0gdqs3kach2y2p6xrcvssmcvxr0nfyaadg2";
};
enableParallelBuilding = true;
configurePhase = "./configure --prefix=$out";
meta = {
description = "A library of safe, high-performance concurrent data structures";
homepage = "http://concurrencykit.org";

View file

@ -57,7 +57,7 @@ let
"--sysconfdir=/etc"
"--with-session-socket-dir=/tmp"
"--with-systemdsystemunitdir=$(out)/etc/systemd/system"
];
] ++ lib.optional (!useX11) "--without-x";
enableParallelBuilding = true;

View file

@ -31,11 +31,11 @@ assert playSupport -> SDL != null;
assert freetypeSupport -> freetype != null;
stdenv.mkDerivation rec {
name = "ffmpeg-1.2.7";
name = "ffmpeg-1.2.8";
src = fetchurl {
url = "http://www.ffmpeg.org/releases/${name}.tar.bz2";
sha256 = "13nj5q5ad0kcrid8r5x6x8lqfhk8kms14pmncf6vbdbk6x45k6v6";
sha256 = "0n9fklr8zqkd60dc5ai161l6k4dbiac5hqy0pi1w82yamc25k6s2";
};
# `--enable-gpl' (as well as the `postproc' and `swscale') mean that

View file

@ -5,11 +5,11 @@
}:
stdenv.mkDerivation rec {
name = "ffmpeg-2.3.2";
name = "ffmpeg-2.3.3";
src = fetchurl {
url = "http://www.ffmpeg.org/releases/${name}.tar.bz2";
sha256 = "1lpzqjpklmcjzk327pz070m3qz3s1cwg8v90w6r1sdh8491kbqc4";
sha256 = "0ik4c06anh49r5b0d3rq9if4zl6ysjsa341655kzw22fl880sk5v";
};
subtitleSupport = config.ffmpeg.subtitle or true;

View file

@ -10,11 +10,11 @@ let
in
stdenv.mkDerivation rec {
name = "fmod-${version}";
version = "4.44.34";
version = "4.44.41";
src = fetchurl {
url = "http://www.fmod.org/download/fmodex/api/Linux/fmodapi44434linux.tar.gz";
sha256 = "057dvawckw3laavfkzvakyrw5lnvvfabs8myibjc95ap1awacb8x";
url = "http://www.fmod.org/download/fmodex/api/Linux/fmodapi44441linux.tar.gz";
sha256 = "0qjvbhx9g6ijv542n6w3ryv20f74p1qx6bbllda9hl14683z8r8p";
};
dontStrip = true;

View file

@ -3,11 +3,11 @@
with stdenv.lib;
stdenv.mkDerivation rec {
name = "glew-1.10.0";
name = "glew-1.11.0";
src = fetchurl {
url = "mirror://sourceforge/glew/${name}.tgz";
sha256 = "01zki46dr5khzlyywr3cg615bcal32dazfazkf360s1znqh17i4r";
sha256 = "1mhkllxz49l1x680dmzrv2i82qjrq017sykah3xc90f2d8qcxfv9";
};
nativeBuildInputs = [ x11 libXmu libXi ];
@ -42,9 +42,11 @@ stdenv.mkDerivation rec {
] ++ optional (stdenv.cross.libc == "msvcrt") "SYSTEM=mingw"
++ optional (stdenv.cross.libc == "libSystem") "SYSTEM=darwin";
meta = {
meta = with stdenv.lib; {
description = "An OpenGL extension loading library for C(++)";
homepage = http://glew.sourceforge.net/;
license = ["BSD" "GLX" "SGI-B" "GPL2"]; # License description copied from gentoo-1.4.0
license = licenses.free; # different files under different licenses
#["BSD" "GLX" "SGI-B" "GPL2"]
platforms = platforms.mesaPlatforms;
};
}

View file

@ -1,21 +1,21 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, caseInsensitive, either, errors, httpClient, httpClientTls
, httpTypes, lens, liftedBase, monadControl, mtl, network
, optparseApplicative, transformers, transformersBase, xmlConduit
, xmlHamlet
{ cabal, caseInsensitive, dataDefault, either, errors, exceptions
, httpClient, httpClientTls, httpTypes, lens, mtl, network
, optparseApplicative, transformers, transformersBase, utf8String
, xmlConduit, xmlHamlet
}:
cabal.mkDerivation (self: {
pname = "DAV";
version = "0.8";
sha256 = "0khjid5jaaf4c3xn9cbph8ay4ibqr7pg3b3w7d0kfvci90ksc08r";
version = "1.0.1";
sha256 = "0j8z7hi5dykimv6da584zgyn8xlvfhg1k9sbhj5ay7ncxszb134k";
isLibrary = true;
isExecutable = true;
buildDepends = [
caseInsensitive either errors httpClient httpClientTls httpTypes
lens liftedBase monadControl mtl network optparseApplicative
transformers transformersBase xmlConduit xmlHamlet
caseInsensitive dataDefault either errors exceptions httpClient
httpClientTls httpTypes lens mtl network optparseApplicative
transformers transformersBase utf8String xmlConduit xmlHamlet
];
jailbreak = true;
meta = {

View file

@ -11,6 +11,7 @@ cabal.mkDerivation (self: {
buildDepends = [
bktrees fgl filepath graphviz pandoc random text time
];
jailbreak = true;
meta = {
description = "Graph-Theoretic Analysis library";
license = "unknown";

View file

@ -0,0 +1,16 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, connection, dataDefault, HaskellNet, network, tls }:
cabal.mkDerivation (self: {
pname = "HaskellNet-SSL";
version = "0.2.4";
sha256 = "0rwj69rz8i84qj6n1zd9fllp4333azfxppd7blzd486bczzkgkbb";
buildDepends = [ connection dataDefault HaskellNet network tls ];
meta = {
homepage = "https://github.com/dpwright/HaskellNet-SSL";
description = "Helpers to connect to SSL/TLS mail servers with HaskellNet";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

View file

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "Strafunski-StrategyLib";
version = "5.0.0.3";
sha256 = "1s7410dfzkqd9j8n5g92pvh9rwglngj3ca9ipcr6xsq0n6yhs51y";
version = "5.0.0.4";
sha256 = "0miffjc8li5l1jarmz8l34z5mx3q68pyxghsi1lbda51bzz3wy1g";
buildDepends = [ mtl syb ];
jailbreak = true;
meta = {

View file

@ -0,0 +1,28 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, attoparsec, blazeBuilder, deepseq, dlist, hashable, HUnit
, mtl, QuickCheck, scientific, syb, testFramework
, testFrameworkHunit, testFrameworkQuickcheck2, text, time
, unorderedContainers, vector
}:
cabal.mkDerivation (self: {
pname = "aeson";
version = "0.7.0.6";
sha256 = "0vsf9msz9iv7xvsnys5c0kbkldb0pvhiai02vz50b0d1kdsk2mb4";
buildDepends = [
attoparsec blazeBuilder deepseq dlist hashable mtl scientific syb
text time unorderedContainers vector
];
testDepends = [
attoparsec HUnit QuickCheck testFramework testFrameworkHunit
testFrameworkQuickcheck2 text time unorderedContainers vector
];
meta = {
homepage = "https://github.com/bos/aeson";
description = "Fast JSON parsing and encoding";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
hydraPlatforms = self.stdenv.lib.platforms.none;
};
})

View file

@ -0,0 +1,21 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, adjunctions, distributive, mtl, nats, semigroupoids
, semigroups, tagged, transformers, void
}:
cabal.mkDerivation (self: {
pname = "algebra";
version = "4.1";
sha256 = "1wcwpngaqnr9w89p5dycmpsaihdwqqrs2vjap6jfwrscq16yyyc6";
buildDepends = [
adjunctions distributive mtl nats semigroupoids semigroups tagged
transformers void
];
meta = {
homepage = "http://github.com/ekmett/algebra/";
description = "Constructive abstract algebra";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

View file

@ -1,19 +1,19 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, binary, clock, connection, dataBinaryIeee754, hspec
, hspecExpectations, monadControl, network, split, text, vector
, xml
, hspecExpectations, monadControl, network, networkUri, split, text
, vector, xml
}:
cabal.mkDerivation (self: {
pname = "amqp";
version = "0.10";
sha256 = "0606grl2149phzqf0aww8264f9xaw4486ps5jw47ar57mcnxsml6";
version = "0.10.1";
sha256 = "1a2d17h1zhd2yv1zhd0vvr4g1v6nr188gwv12qwljs1v9y4jkbmc";
isLibrary = true;
isExecutable = true;
buildDepends = [
binary clock connection dataBinaryIeee754 monadControl network
split text vector xml
networkUri split text vector xml
];
testDepends = [
binary clock connection dataBinaryIeee754 hspec hspecExpectations

View file

@ -1,18 +1,18 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, aeson, attoparsec, blazeBuilder, caseInsensitive, conduit
, httpConduit, httpTypes, monadControl, network, resourcet
, httpConduit, httpTypes, monadControl, networkUri, resourcet
, tagstreamConduit, text, transformers, unorderedContainers
, xmlConduit
}:
cabal.mkDerivation (self: {
pname = "authenticate";
version = "1.3.2.9";
sha256 = "09vg7m2sh3566q7jgi85djc5jrq2y06swlbj1fbym6yf4cmk8gdr";
version = "1.3.2.10";
sha256 = "1dy38k5jpms3xrkw1zh7vjmx06yr5iibgh50m5i2wky2wmryqkf4";
buildDepends = [
aeson attoparsec blazeBuilder caseInsensitive conduit httpConduit
httpTypes monadControl network resourcet tagstreamConduit text
httpTypes monadControl networkUri resourcet tagstreamConduit text
transformers unorderedContainers xmlConduit
];
meta = {

View file

@ -1,25 +1,32 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, aeson, base16Bytestring, base64Bytestring, blazeBuilder
, byteable, caseInsensitive, cereal, conduit, conduitExtra
, cryptohash, dataDefault, filepath, httpConduit, httpTypes
, liftedBase, monadControl, mtl, network, resourcet, text, time
, transformers, unorderedContainers, utf8String, vector, xmlConduit
{ cabal, aeson, attoparsec, base16Bytestring, base64Bytestring
, blazeBuilder, byteable, caseInsensitive, cereal, conduit
, conduitExtra, cryptohash, dataDefault, errors, filepath
, httpConduit, httpTypes, liftedBase, monadControl, mtl, network
, QuickCheck, quickcheckInstances, resourcet, safe, scientific
, tagged, tasty, tastyQuickcheck, text, time, transformers
, unorderedContainers, utf8String, vector, xmlConduit
}:
cabal.mkDerivation (self: {
pname = "aws";
version = "0.9.3";
sha256 = "11g8i6kfq7n1v5nvj8bkhrgsiyzfz0vwk4lh8sljnfd5pyjawx7h";
version = "0.10.2";
sha256 = "15yr06z54wxnl37a94515ajlxrb7z9kii5dd0ssan32izh4nfrl2";
isLibrary = true;
isExecutable = true;
buildDepends = [
aeson base16Bytestring base64Bytestring blazeBuilder byteable
caseInsensitive cereal conduit conduitExtra cryptohash dataDefault
filepath httpConduit httpTypes liftedBase monadControl mtl network
resourcet text time transformers unorderedContainers utf8String
vector xmlConduit
aeson attoparsec base16Bytestring base64Bytestring blazeBuilder
byteable caseInsensitive cereal conduit conduitExtra cryptohash
dataDefault filepath httpConduit httpTypes liftedBase monadControl
mtl network resourcet safe scientific tagged text time transformers
unorderedContainers utf8String vector xmlConduit
];
testDepends = [
aeson errors mtl QuickCheck quickcheckInstances tagged tasty
tastyQuickcheck text transformers
];
doCheck = false;
meta = {
homepage = "http://github.com/aristidb/aws";
description = "Amazon Web Services (AWS) for Haskell";

View file

@ -0,0 +1,18 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, bitsExtras, cpu, hspec, QuickCheck }:
cabal.mkDerivation (self: {
pname = "base32-bytestring";
version = "0.2.1.0";
sha256 = "0z0q3fw3jzprgxmq9b2iz98kf4hwl3nydrzlaiwk81aplisfdgkl";
buildDepends = [ bitsExtras cpu ];
testDepends = [ hspec QuickCheck ];
meta = {
homepage = "https://github.com/pxqr/base32-bytestring";
description = "Fast base32 and base32hex codec for ByteStrings";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
};
})

View file

@ -0,0 +1,18 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal }:
cabal.mkDerivation (self: {
pname = "bits-extras";
version = "0.1.3";
sha256 = "0sy9dksmdx0773bsn8yi5hw4qpgn16g8aqqj888w1x75cbsxr997";
isLibrary = true;
isExecutable = true;
configureFlags = "--ghc-option=-lgcc_s";
meta = {
description = "Efficient high-level bit operations not found in Data.Bits";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
};
})

View file

@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "bytes";
version = "0.14.0.2";
sha256 = "1bdradf5lq1kgiri64zd8cvcw2fxwbwv0apznl8vxyqlx406v3rn";
version = "0.14.1";
sha256 = "023sdwdirvigrdg03f6jrdndm6pkqsmsrwz9ji57dpqg4f5k9jzk";
buildDepends = [
binary cereal mtl text time transformers transformersCompat void
];

View file

@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "clientsession";
version = "0.9.0.3";
sha256 = "0w7mkyrd8gx5d6mcqprn7ll05414vm2j5fbyi6pj9cxd2m4qc9b1";
version = "0.9.0.5";
sha256 = "0l11wpxr3cgd8q708ay7957mdzq7nhm7c6z3p9iwl0lp3pkcl810";
buildDepends = [
base64Bytestring cereal cipherAes cprngAes cryptoApi cryptoRandom
entropy skein tagged

View file

@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "conduit-extra";
version = "1.1.3";
sha256 = "1gzvplaxplqia23g6l8z42w0z10y33yz594lxdk82g4i7swaagix";
version = "1.1.3.2";
sha256 = "15flywjw5ha8cgn4yznwlnx31ls4y82gfmvbniby0d51y4x8dmgq";
buildDepends = [
attoparsec blazeBuilder conduit filepath monadControl network
primitive resourcet stm streamingCommons text transformers
@ -18,7 +18,6 @@ cabal.mkDerivation (self: {
async attoparsec blazeBuilder conduit exceptions hspec resourcet
stm text transformers transformersBase
];
noHaddock = true;
meta = {
homepage = "http://github.com/snoyberg/conduit";
description = "Batteries included conduit: adapters for common libraries";

View file

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "constraints";
version = "0.3.5";
sha256 = "01xrk0xqkfwzzr5jwkadkyjgrdcpslwiqfqdb7mci688xp2isi3i";
version = "0.4";
sha256 = "0nnplylzbcw884jgsd4i46z75dkiyx4166j5fym5zdnwhyj75sp5";
buildDepends = [ newtype ];
meta = {
homepage = "http://github.com/ekmett/constraints/";

View file

@ -1,13 +1,14 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, semigroups, tagged, transformers, transformersCompat }:
{ cabal, semigroups, tagged, transformers, transformersCompat, void
}:
cabal.mkDerivation (self: {
pname = "contravariant";
version = "1.1";
sha256 = "0j2q6gl9f8jgknjqr2qzzxkb4fl7m9n5zjavnzan2arlv4viznhh";
version = "1.2";
sha256 = "0gzk9b3xig48jvqz9983a7kziyb2n9z329kn6cqw1k0p8w2h3l8f";
buildDepends = [
semigroups tagged transformers transformersCompat
semigroups tagged transformers transformersCompat void
];
meta = {
homepage = "http://github.com/ekmett/contravariant/";

View file

@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "data-fin";
version = "0.1.1.2";
sha256 = "13qgqx3b01a8bm7jw7fkv7nyyzg2jkgg27zv2wp57g0nd5aw5hpn";
version = "0.1.1.3";
sha256 = "02n3dr4gj73z549vwq5h7h1kvmx2j8vaxjcggpdlppps9wl6flry";
buildDepends = [
lazysmallcheck preludeSafeenum QuickCheck reflection smallcheck
tagged

View file

@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "distributed-process";
version = "0.5.0";
sha256 = "16lfmkhc6jk2n46w39vf0q1ql426h5jrjgdi6cyjgwy1d5kaqcny";
version = "0.5.1";
sha256 = "1c654l7r3cn89nknh67vsg7crnfhgswh4523qyrmn8z4ykyd0zfk";
buildDepends = [
binary dataAccessor deepseq distributedStatic hashable mtl
networkTransport random rank1dynamic stm syb time transformers

View file

@ -0,0 +1,16 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, async, djinnLib, mtl, transformers }:
cabal.mkDerivation (self: {
pname = "djinn-ghc";
version = "0.0.2.2";
sha256 = "0dz5jg58si9fsc12212rxmzky09zric7b2sdj1ydmvnrjxkh9l70";
buildDepends = [ async djinnLib mtl transformers ];
meta = {
description = "Generate Haskell code from a type. Bridge from Djinn to GHC API.";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
};
})

View file

@ -0,0 +1,17 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, mtl }:
cabal.mkDerivation (self: {
pname = "djinn-lib";
version = "0.0.1.2";
sha256 = "048hs27awl4j9lg04qbnpf8c51mzbgy2afckis19zcswmavi1zn0";
buildDepends = [ mtl ];
meta = {
homepage = "http://www.augustsson.net/Darcs/Djinn/";
description = "Generate Haskell code from a type. Library extracted from djinn package.";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
};
})

View file

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "double-conversion";
version = "0.2.0.6";
sha256 = "1c6hy0ghdqf44fvhdpdxjbcr0ahimw283x5fnvjxja36i71qshjp";
version = "2.0.1.0";
sha256 = "034ji9jgf3jl0n5pp1nki3lsg173c3b9vniwnwp1q21iasqbawh0";
buildDepends = [ text ];
testDepends = [ testFramework testFrameworkQuickcheck2 text ];
meta = {

View file

@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "dynamic-cabal";
version = "0.3.1";
sha256 = "0jjhz6h1ggznbvi4qgv0p5x1s7j0fgv1xvkfgid57jrjvdvd4gic";
version = "0.3.2";
sha256 = "0f0g4kml17j1j101gnpjjpdmny4m2wgr0dbjq18fw1s3nxc3jagm";
buildDepends = [
dataDefault filepath ghcPaths haskellGenerate haskellSrcExts time
void

View file

@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "ekg";
version = "0.4.0.1";
sha256 = "09pjsd9jr91whdhv36fkb36ivvvcr415g90a798i86vl8mklgnyx";
version = "0.4.0.2";
sha256 = "0svw43dnlg93nyaxiq310sp5csbf0w68ipbhqkxm052yvc9k6fv9";
buildDepends = [
aeson ekgCore filepath network snapCore snapServer text time
transformers unorderedContainers

View file

@ -9,8 +9,8 @@
cabal.mkDerivation (self: {
pname = "fay";
version = "0.20.1.1";
sha256 = "0jcvq880xnkm8aqr69ihwf7by55fc1bbd8wk8152zqgkih74qzc4";
version = "0.20.1.2";
sha256 = "1ssii9wkml8jn8kcdq8h6sxrq4gap4asyglakvif2zawl3sqrdji";
isLibrary = true;
isExecutable = true;
buildDepends = [
@ -21,7 +21,7 @@ cabal.mkDerivation (self: {
utf8String vector
];
meta = {
homepage = "http://fay-lang.org/";
homepage = "https://github.com/faylang/fay/wiki";
description = "A compiler for Fay, a Haskell subset that compiles to JavaScript";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;

View file

@ -19,5 +19,7 @@ cabal.mkDerivation (self: {
description = "Use system-filepath data types with conduits. (deprecated)";
license = self.stdenv.lib.licenses.mit;
platforms = self.ghc.meta.platforms;
hydraPlatforms = self.stdenv.lib.platforms.none;
broken = true;
};
})

View file

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "force-layout";
version = "0.3.0.5";
sha256 = "01wk8zygw9d3r5dwbycyab82kfk8s05ynnajb6kfjv7i09s9sgcb";
version = "0.3.0.6";
sha256 = "0qmzz9gbzf1jdk08w3nhnw7l3n5bq5sw5k4r0mdc5y11m38xpgm4";
buildDepends = [
dataDefaultClass lens vectorSpace vectorSpacePoints
];

View file

@ -8,13 +8,16 @@ cabal.mkDerivation (self: {
sha256 = "1qi7f3phj2j63x1wd2cvk36945cxd84s12zs03hlrn49wzx2pf1n";
buildDepends = [ binary transformers ];
postInstall = ''
mkdir -p "$out/share/ghci"
ensureDir "$out/share/ghci"
ln -s "$out/share/$pname-$version/ghci" "$out/share/ghci/$pname"
'';
meta = {
description = "Extract the heap representation of Haskell values and thunks";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
maintainers = with self.stdenv.lib.maintainers; [ andres ];
hydraPlatforms = self.stdenv.lib.platforms.none;
broken = self.stdenv.lib.versionOlder "7.7" self.ghc.version;
};
})

View file

@ -0,0 +1,59 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, Cabal, convertible, deepseq, djinnGhc, doctest, emacs
, filepath, ghcPaths, ghcSybUtils, haskellSrcExts, hlint, hspec
, ioChoice, monadControl, monadJournal, mtl, split, syb, text, time
, transformers, transformersBase
}:
cabal.mkDerivation (self: {
pname = "ghc-mod";
version = "5.0.1";
sha256 = "01awsi5rfzq6433shfvvnr69ifxb7h8v90mlknxv3dl34zmrhv19";
isLibrary = true;
isExecutable = true;
buildDepends = [
Cabal convertible deepseq djinnGhc filepath ghcPaths ghcSybUtils
haskellSrcExts hlint ioChoice monadControl monadJournal mtl split
syb text time transformers transformersBase
];
testDepends = [
Cabal convertible deepseq djinnGhc doctest filepath ghcPaths
ghcSybUtils haskellSrcExts hlint hspec ioChoice monadControl
monadJournal mtl split syb text time transformers transformersBase
];
buildTools = [ emacs ];
doCheck = false;
configureFlags = "--datasubdir=${self.pname}-${self.version}";
postInstall = ''
cd $out/share/$pname-$version
make
rm Makefile
cd ..
ensureDir "$out/share/emacs"
mv $pname-$version emacs/site-lisp
mv $out/bin/ghc-mod $out/bin/.ghc-mod-wrapped
cat - > $out/bin/ghc-mod <<EOF
#! ${self.stdenv.shell}
eval exec $out/bin/.ghc-mod-wrapped \$( ${self.ghc.GHCGetPackages} ${self.ghc.version} | tr " " "\n" | tail -n +2 | paste -d " " - - | sed 's/.*/-g "&"/' | tr "\n" " ") "\$@"
EOF
mv $out/bin/ghc-modi $out/bin/.ghc-modi-wrapped
cat - > $out/bin/ghc-modi <<EOF
#! ${self.stdenv.shell}
eval exec $out/bin/.ghc-modi-wrapped \$( ${self.ghc.GHCGetPackages} ${self.ghc.version} | tr " " "\n" | tail -n +2 | paste -d " " - - | sed 's/.*/-g "&"/' | tr "\n" " ") "\$@"
EOF
chmod +x $out/bin/ghc-mod
chmod +x $out/bin/ghc-modi
'';
meta = {
homepage = "http://www.mew.org/~kazu/proj/ghc-mod/";
description = "Happy Haskell Programming";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = with self.stdenv.lib.maintainers; [
andres bluescreen303 ocharles
];
};
})

View file

@ -12,9 +12,8 @@ cabal.mkDerivation (self: {
cairo deepseq fgl ghcHeapView graphviz gtk mtl svgcairo text
transformers xdot
];
jailbreak = true;
postInstall = ''
mkdir -p "$out/share/ghci"
ensureDir "$out/share/ghci"
ln -s "$out/share/$pname-$version/ghci" "$out/share/ghci/$pname"
'';
meta = {
@ -22,6 +21,7 @@ cabal.mkDerivation (self: {
description = "Live visualization of data structures in GHCi";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
maintainers = with self.stdenv.lib.maintainers; [ andres ];
hydraPlatforms = self.stdenv.lib.platforms.none;
};
})

View file

@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "github";
version = "0.9";
sha256 = "19ff9srvm03n9iz7mf6wadydfw0xs0j9ayvr86dmmp9blmjkqc0d";
version = "0.10.0";
sha256 = "1llwzkhyw5wazczpiv3w8dq4l7j3q49ii64yh7cxwakkp2h5yiwb";
buildDepends = [
aeson attoparsec caseInsensitive conduit dataDefault failure
hashable HTTP httpConduit httpTypes network text time

View file

@ -26,5 +26,7 @@ cabal.mkDerivation (self: {
description = "Wiki using happstack, git or darcs, and pandoc";
license = "GPL";
platforms = self.ghc.meta.platforms;
hydraPlatforms = self.stdenv.lib.platforms.none;
broken = true;
};
})

View file

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "gtk-traymanager";
version = "0.1.4";
sha256 = "0dprxds49ljn0n94ca423gvh5ks2jmb4qx3lkqwpxqbcp0j8il7p";
version = "0.1.5";
sha256 = "0hzl9pa5vx04vslb2visx35wwjagzzi1j5gyk5acy8pym8ly50hm";
buildDepends = [ glib gtk ];
pkgconfigDepends = [ gtk x11 ];
jailbreak = true;

View file

@ -0,0 +1,23 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, cairo, gio, glib, gtk2hsBuildtools, gtk3, mtl, pango, text
, time, transformers
}:
cabal.mkDerivation (self: {
pname = "gtk3";
version = "0.13.0.0";
sha256 = "0aq58gf6bcwnk085in0xilg7p8zyd2v079aqk1c47gjyrcg7p78f";
isLibrary = true;
isExecutable = true;
buildDepends = [ cairo gio glib mtl pango text time transformers ];
buildTools = [ gtk2hsBuildtools ];
pkgconfigDepends = [ glib gtk3 ];
meta = {
homepage = "http://projects.haskell.org/gtk2hs/";
description = "Binding to the Gtk+ graphical user interface library";
license = self.stdenv.lib.licenses.lgpl21;
platforms = self.ghc.meta.platforms;
maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
};
})

View file

@ -0,0 +1,17 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, baseCompat, deepseq, hspec, QuickCheck }:
cabal.mkDerivation (self: {
pname = "haddock-library";
version = "1.1.0";
sha256 = "0apqm9nxgxbpvcphaim93q4z67c1cd0vdjz0i1cbr67ymffl69nd";
buildDepends = [ deepseq ];
testDepends = [ baseCompat deepseq hspec QuickCheck ];
meta = {
homepage = "http://www.haskell.org/haddock/";
description = "Library exposing some functionality of Haddock";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

View file

@ -33,5 +33,7 @@ cabal.mkDerivation (self: {
description = "A static website compiler library";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
hydraPlatforms = self.stdenv.lib.platforms.none;
broken = true;
};
})

View file

@ -2,20 +2,20 @@
{ cabal, base64Bytestring, blazeHtml, extensibleExceptions
, filepath, hslogger, html, HUnit, monadControl, mtl, network
, parsec, sendfile, syb, systemFilepath, text, threads, time
, timeCompat, transformers, transformersBase, utf8String, xhtml
, zlib
, networkUri, parsec, sendfile, syb, systemFilepath, text, threads
, time, timeCompat, transformers, transformersBase, utf8String
, xhtml, zlib
}:
cabal.mkDerivation (self: {
pname = "happstack-server";
version = "7.3.7";
sha256 = "1phw3hpnklcdav3wv10kwjsmrg8gshnsgd564p459pc4k2zffgh1";
version = "7.3.8";
sha256 = "11jy4r4ih6sndyga3fjg298f5ww8806180dm3fgzsm0xfsjw1ac2";
buildDepends = [
base64Bytestring blazeHtml extensibleExceptions filepath hslogger
html monadControl mtl network parsec sendfile syb systemFilepath
text threads time timeCompat transformers transformersBase
utf8String xhtml zlib
html monadControl mtl network networkUri parsec sendfile syb
systemFilepath text threads time timeCompat transformers
transformersBase utf8String xhtml zlib
];
testDepends = [ HUnit parsec zlib ];
jailbreak = true;

View file

@ -16,5 +16,7 @@ cabal.mkDerivation (self: {
description = "Distributed parallel programming in Haskell using MPI";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
hydraPlatforms = self.stdenv.lib.platforms.none;
broken = true;
};
})

View file

@ -13,5 +13,7 @@ cabal.mkDerivation (self: {
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
hydraPlatforms = self.stdenv.lib.platforms.none;
broken = true;
};
})

View file

@ -0,0 +1,27 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, aeson, async, binary, byteable, cryptohash, deepseq
, either, HUnit, jsonRpc, mtl, pbkdf, QuickCheck, split
, testFramework, testFrameworkHunit, testFrameworkQuickcheck2, text
}:
cabal.mkDerivation (self: {
pname = "haskoin";
version = "0.1.0.2";
sha256 = "0l3h2wvi56k0dcfjambqyjrd45hb7bj0brp8nzrrcfn7fbpyjg8c";
buildDepends = [
aeson binary byteable cryptohash deepseq either jsonRpc mtl pbkdf
split text
];
testDepends = [
aeson async binary byteable cryptohash deepseq either HUnit jsonRpc
mtl pbkdf QuickCheck split testFramework testFrameworkHunit
testFrameworkQuickcheck2 text
];
meta = {
homepage = "http://github.com/haskoin/haskoin";
description = "Implementation of the Bitcoin protocol";
license = self.stdenv.lib.licenses.publicDomain;
platforms = self.ghc.meta.platforms;
};
})

View file

@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "haskore";
version = "0.2.0.3";
sha256 = "0vg4m2cmy1fabfnck9v22jicflb0if64h0wjvyrgpn2ykb9wwbpa";
version = "0.2.0.4";
sha256 = "0hhsiazdz44amilcwfxl0r10yxzhql83pgd21k89fmg1gkc4q46j";
isLibrary = true;
isExecutable = true;
buildDepends = [

View file

@ -12,5 +12,7 @@ cabal.mkDerivation (self: {
description = "Automatic deriving of XML-RPC structs for Haskell records";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
hydraPlatforms = self.stdenv.lib.platforms.none;
broken = true;
};
})

View file

@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "hcltest";
version = "0.3.3";
sha256 = "191fpvcr5hg902akcvq9wcsy801drqwrl7xqk0bqy003ffrv4228";
version = "0.3.4";
sha256 = "0p8skabp6z4i5xr22qxk1sij2ayla2iqylvlzxfxa8yw1fxs8wsq";
buildDepends = [
dlist either filepath free lens mmorph monadControl mtl
optparseApplicative randomShuffle split stm tagged tasty temporary

View file

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "hdaemonize";
version = "0.4.5.0";
sha256 = "1b9aic08pgmp95qy74qcrmq9dn33k6knycy7mn1dg8c5svmchb2w";
version = "0.5.0.0";
sha256 = "15dyaa9rbmsjp3sg9yxg1i90kfy9rvlzmwg5kl8kwal69ajzjjgv";
buildDepends = [ extensibleExceptions filepath hsyslog mtl ];
meta = {
homepage = "http://github.com/madhadron/hdaemonize";

View file

@ -0,0 +1,14 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal }:
cabal.mkDerivation (self: {
pname = "hex";
version = "0.1.2";
sha256 = "1v31xiaivrrn0q2jz8919wvkjplv1kxna5ajhsj701fqxm1i5vhj";
meta = {
description = "Convert strings into hexadecimal and back";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

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