Merge remote-tracking branch 'upstream/master' into staging

This commit is contained in:
William A. Kennington III 2015-05-07 01:44:49 -07:00
commit 074c4a7f78
1696 changed files with 4288 additions and 39821 deletions

View file

@ -513,8 +513,8 @@ script) if it exists.</para>
<term><varname>dontAddPrefix</varname></term>
<listitem><para>By default, the flag
<literal>--prefix=$prefix</literal> is added to the configure
flags. If this is undesirable, set this variable to a non-empty
value.</para></listitem>
flags. If this is undesirable, set this variable to
true.</para></listitem>
</varlistentry>
<varlistentry>
@ -530,8 +530,7 @@ script) if it exists.</para>
<listitem><para>By default, the flag
<literal>--disable-dependency-tracking</literal> is added to the
configure flags to speed up Automake-based builds. If this is
undesirable, set this variable to a non-empty
value.</para></listitem>
undesirable, set this variable to true.</para></listitem>
</varlistentry>
<varlistentry>
@ -544,7 +543,16 @@ script) if it exists.</para>
variables in the Libtool script to prevent Libtool from using
libraries in <filename>/usr/lib</filename> and
such.</para></footnote>. If this is undesirable, set this
variable to a non-empty value.</para></listitem>
variable to true.</para></listitem>
</varlistentry>
<varlistentry>
<term><varname>dontDisableStatic</varname></term>
<listitem><para>By default, when the configure script has
<option>--enable-static</option>, the option
<option>--disable-static</option> is added to the configure flags.</para>
<para></para>If this is undesirable, set this variable to
true.</para></listitem>
</varlistentry>
<varlistentry>

View file

@ -153,6 +153,7 @@
pakhfn = "Fedor Pakhomov <pakhfn@gmail.com>";
pashev = "Igor Pashev <pashev.igor@gmail.com>";
phausmann = "Philipp Hausmann <nix@314.ch>";
philandstuff = "Philip Potter <philip.g.potter@gmail.com>";
phreedom = "Evgeny Egorochkin <phreedom@yandex.ru>";
pierron = "Nicolas B. Pierron <nixos@nbp.name>";
piotr = "Piotr Pietraszkiewicz <ppietrasa@gmail.com>";

View file

@ -105,7 +105,7 @@ in
options = {
isoImage.isoName = mkOption {
default = "${config.isoImage.isoName}.iso";
default = "${config.isoImage.isoBaseName}.iso";
description = ''
Name of the generated ISO image file.
'';

View file

@ -352,7 +352,7 @@ EOF
if ($fsType eq "btrfs") {
my ($status, @id_info) = runCommand("btrfs subvol show $rootDir$mountPoint");
if ($status != 0 || join("", @msg) =~ /ERROR:/) {
die "Failed to retreive subvolume info for $mountPoint\n";
die "Failed to retrieve subvolume info for $mountPoint\n";
}
my @ids = join("", @id_info) =~ m/Object ID:[ \t\n]*([^ \t\n]*)/;
if ($#ids > 0) {

View file

@ -411,6 +411,7 @@
lambdabot = 191;
#asterisk = 192; # unused
plex = 193;
sabnzbd = 194;
# When adding a gid, make sure it doesn't match an existing
# uid. Users and groups with the same name should have equal

View file

@ -186,6 +186,7 @@
./services/misc/canto-daemon.nix
./services/misc/cpuminer-cryptonight.nix
./services/misc/cgminer.nix
./services/misc/confd.nix
./services/misc/dictd.nix
./services/misc/disnix.nix
./services/misc/docker-registry.nix

View file

@ -36,6 +36,16 @@ let
'';
};
u2fAuth = mkOption {
default = config.security.pam.enableU2F;
type = types.bool;
description = ''
If set, users listed in
<filename>~/.yubico/u2f_keys</filename> are able to log in
with the associated U2F key.
'';
};
usbAuth = mkOption {
default = config.security.pam.usb.enable;
type = types.bool;
@ -209,6 +219,8 @@ let
"auth sufficient ${pkgs.pam_ssh_agent_auth}/libexec/pam_ssh_agent_auth.so file=~/.ssh/authorized_keys:~/.ssh/authorized_keys2:/etc/ssh/authorized_keys.d/%u"}
${optionalString cfg.fprintAuth
"auth sufficient ${pkgs.fprintd}/lib/security/pam_fprintd.so"}
${optionalString cfg.u2fAuth
"auth sufficient ${pkgs.pam_u2f}/lib/security/pam_u2f.so"}
${optionalString cfg.usbAuth
"auth sufficient ${pkgs.pam_usb}/lib/security/pam_usb.so"}
${optionalString cfg.unixAuth
@ -364,6 +376,13 @@ in
'';
};
security.pam.enableU2F = mkOption {
default = false;
description = ''
Enable the U2F PAM module.
'';
};
security.pam.enableEcryptfs = mkOption {
default = false;
description = ''
@ -392,6 +411,7 @@ in
++ optionals config.krb5.enable [pam_krb5 pam_ccreds]
++ optionals config.security.pam.enableOTPW [ pkgs.otpw ]
++ optionals config.security.pam.enableOATH [ pkgs.oathToolkit ]
++ optionals config.security.pam.enableU2F [ pkgs.pam_u2f ]
++ optionals config.security.pam.enableEcryptfs [ pkgs.ecryptfs ];
security.setuidPrograms =

View file

@ -249,6 +249,8 @@ in
script = ''
mkdir -p -m 0755 ${dirOf cfg.cachedir}
mkdir -p -m 0700 ${cfg.cachedir}
chown root:root ${cfg.cachedir}
chmod 0700 ${cfg.cachedir}
DIRS=`cat /etc/tarsnap/$1.dirs`
exec tarsnap --configfile /etc/tarsnap/$1.conf -c -f $1-$(date +"%Y%m%d%H%M%S") $DIRS
'';

View file

@ -176,11 +176,11 @@ in
touch /tmp/mysql_init
fi
mkdir -m 0700 -p ${cfg.pidDir}
mkdir -m 0755 -p ${cfg.pidDir}
chown -R ${cfg.user} ${cfg.pidDir}
# Make the socket directory
mkdir -m 0700 -p /run/mysqld
mkdir -m 0755 -p /run/mysqld
chown -R ${cfg.user} /run/mysqld
'';

View file

@ -265,7 +265,7 @@ in
extraAliases = mkOption {
default = "";
description = "
Additional entries to put verbatim into aliases file.
Additional entries to put verbatim into aliases file, cf. man-page aliases(8).
";
};
@ -302,7 +302,7 @@ in
virtual = mkOption {
default = "";
description = "
Entries for the virtual alias map.
Entries for the virtual alias map, cf. man-page virtual(8).
";
};

View file

@ -0,0 +1,89 @@
{ config, pkgs, lib, ... }:
with lib;
let
cfg = config.services.confd;
confdConfig = ''
backend = "${cfg.backend}"
confdir = "${cfg.confDir}"
interval = ${toString cfg.interval}
nodes = [ ${concatMapStringsSep "," (s: ''"${s}"'') cfg.nodes}, ]
prefix = "${cfg.prefix}"
log-level = "${cfg.logLevel}"
watch = ${if cfg.watch then "true" else "false"}
'';
in {
options.services.confd = {
enable = mkEnableOption "Whether to enable confd service.";
backend = mkOption {
description = "Confd config storage backend to use.";
default = "etcd";
type = types.enum ["etcd" "consul" "redis" "zookeeper"];
};
interval = mkOption {
description = "Confd check interval.";
default = 10;
type = types.int;
};
nodes = mkOption {
description = "Confd list of nodes to connect to.";
default = [ "http://127.0.0.1:4001" ];
type = types.listOf types.str;
};
watch = mkOption {
description = "Confd, whether to watch etcd config for changes.";
default = true;
type = types.bool;
};
prefix = mkOption {
description = "The string to prefix to keys.";
default = "/";
type = types.path;
};
logLevel = mkOption {
description = "Confd log level.";
default = "info";
type = types.enum ["info" "debug"];
};
confDir = mkOption {
description = "The path to the confd configs.";
default = "/etc/confd";
type = types.path;
};
package = mkOption {
description = "Confd package to use.";
default = pkgs.goPackages.confd;
type = types.package;
};
};
config = mkIf cfg.enable {
systemd.services.confd = {
description = "Confd Service.";
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
serviceConfig = {
ExecStart = "${cfg.package}/bin/confd";
};
};
environment.etc = {
"confd/confd.toml".text = confdConfig;
};
environment.systemPackages = [ cfg.package ];
services.etcd.enable = mkIf (cfg.backend == "etcd") (mkDefault true);
};
}

View file

@ -17,11 +17,21 @@ in
services.sabnzbd = {
enable = mkOption {
default = false;
description = "Whether to enable the sabnzbd FTP server.";
description = "Whether to enable the sabnzbd server.";
};
configFile = mkOption {
default = "/var/sabnzbd/sabnzbd.ini";
description = "Path to config file. (You need to create this file yourself!)";
default = "/var/lib/sabnzbd/sabnzbd.ini";
description = "Path to config file.";
};
user = mkOption {
default = "sabnzbd";
description = "User to run the service as";
};
group = mkOption {
default = "sabnzbd";
description = "Group to run the service as";
};
};
};
@ -31,23 +41,29 @@ in
config = mkIf cfg.enable {
users.extraUsers =
[ { name = "sabnzbd";
users.extraUsers.sabnzbd = {
uid = config.ids.uids.sabnzbd;
group = "sabnzbd";
description = "sabnzbd user";
home = "/homeless-shelter";
}
];
home = "/var/lib/sabnzbd/";
createHome = true;
};
systemd.services.sabnzbd =
{ description = "sabnzbd server";
users.extraGroups.sabnzbd = {
gid = config.ids.gids.sabnzbd;
};
systemd.services.sabnzbd = {
description = "sabnzbd server";
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
serviceConfig = {
Type = "forking";
GuessMainPID = "no";
User = "${cfg.user}";
Group = "${cfg.group}";
ExecStart = "${sabnzbd}/bin/sabnzbd -d -f ${cfg.configFile}";
};
};
};
};
}

View file

@ -286,8 +286,8 @@ in
type = types.bool;
description = ''
Whether to allow TRIM requests to the underlying device. This option
has security implications, please read the LUKS documentation before
activating in.
has security implications; please read the LUKS documentation before
activating it.
'';
};
@ -303,43 +303,43 @@ in
twoFactor = mkOption {
default = true;
type = types.bool;
description = "Whether to use a passphrase and a Yubikey (true), or only a Yubikey (false)";
description = "Whether to use a passphrase and a Yubikey (true), or only a Yubikey (false).";
};
slot = mkOption {
default = 2;
type = types.int;
description = "Which slot on the Yubikey to challenge";
description = "Which slot on the Yubikey to challenge.";
};
saltLength = mkOption {
default = 16;
type = types.int;
description = "Length of the new salt in byte (64 is the effective maximum)";
description = "Length of the new salt in byte (64 is the effective maximum).";
};
keyLength = mkOption {
default = 64;
type = types.int;
description = "Length of the LUKS slot key derived with PBKDF2 in byte";
description = "Length of the LUKS slot key derived with PBKDF2 in byte.";
};
iterationStep = mkOption {
default = 0;
type = types.int;
description = "How much the iteration count for PBKDF2 is increased at each successful authentication";
description = "How much the iteration count for PBKDF2 is increased at each successful authentication.";
};
gracePeriod = mkOption {
default = 2;
type = types.int;
description = "Time in seconds to wait before attempting to find the Yubikey";
description = "Time in seconds to wait before attempting to find the Yubikey.";
};
ramfsMountPoint = mkOption {
default = "/crypt-ramfs";
type = types.string;
description = "Path where the ramfs used to update the LUKS key will be mounted in stage-1";
description = "Path where the ramfs used to update the LUKS key will be mounted during early boot.";
};
/* TODO: Add to the documentation of the current module:
@ -359,13 +359,13 @@ in
fsType = mkOption {
default = "vfat";
type = types.string;
description = "The filesystem of the unencrypted device";
description = "The filesystem of the unencrypted device.";
};
mountPoint = mkOption {
default = "/crypt-storage";
type = types.string;
description = "Path where the unencrypted device will be mounted in stage-1";
description = "Path where the unencrypted device will be mounted during early boot.";
};
path = mkOption {
@ -419,10 +419,10 @@ in
mkdir -p $out/etc/ssl
cp -pdv ${pkgs.openssl}/etc/ssl/openssl.cnf $out/etc/ssl
cat > $out/bin/openssl-wrap <<EOF
#!$out/bin/sh
EOF
chmod +x $out/bin/openssl-wrap
cat > $out/bin/openssl-wrap <<EOF
#!$out/bin/sh
EOF
chmod +x $out/bin/openssl-wrap
''}
'';
@ -432,10 +432,10 @@ EOF
$out/bin/ykchalresp -V
$out/bin/ykinfo -V
cat > $out/bin/openssl-wrap <<EOF
#!$out/bin/sh
export OPENSSL_CONF=$out/etc/ssl/openssl.cnf
$out/bin/openssl "\$@"
EOF
#!$out/bin/sh
export OPENSSL_CONF=$out/etc/ssl/openssl.cnf
$out/bin/openssl "\$@"
EOF
$out/bin/openssl-wrap version
''}
'';

View file

@ -35,8 +35,8 @@ with lib;
wget="wget -q --retry-connrefused -O -"
echo "setting host name..."
${optionalString (config.networking.hostName == "") ''
echo "setting host name..."
${pkgs.nettools}/bin/hostname $($wget http://169.254.169.254/1.0/meta-data/hostname)
''}
@ -69,14 +69,18 @@ with lib;
fi
${optionalString (! config.ec2.metadata) ''
# Since the user data is sensitive, prevent it from being
# accessed from now on.
ip route add blackhole 169.254.169.254/32
# Since the user data is sensitive, prevent it from
# being accessed from now on. FIXME: remove at some
# point, since current NixOps no longer relies on
# metadata secrecy.
ip route add blackhole 169.254.169.254/32
''}
'';
serviceConfig.Type = "oneshot";
serviceConfig.RemainAfterExit = true;
restartIfChanged = false;
};
systemd.services."print-host-key" =

View file

@ -0,0 +1,94 @@
{ stdenv, fetchgit, alsaLib, aubio, boost, cairomm, curl, fftw
, fftwSinglePrec, flac, glibc, glibmm, gtk, gtkmm, jack2
, libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg, librdf
, librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile
, libusb, libuuid, libxml2, libxslt, lilv, lv2, makeWrapper, pango
, perl, pkgconfig, python, serd, sord, sratom, suil }:
let
# Ardour git repo uses a mix of annotated and lightweight tags. Annotated
# tags are used for MAJOR.MINOR versioning, and lightweight tags are used
# in-between; MAJOR.MINOR.REV where REV is the number of commits since the
# last annotated tag. A slightly different version string format is needed
# for the 'revision' info that is built into the binary; it is the format of
# "git describe" when _not_ on an annotated tag(!): MAJOR.MINOR-REV-HASH.
# Version to build.
tag = "3.5.403";
# Version info that is built into the binary. Keep in sync with 'tag'. The
# last 8 digits is a (fake) commit id.
revision = "3.5-403-00000000";
in
stdenv.mkDerivation rec {
name = "ardour-${tag}";
src = fetchgit {
url = git://git.ardour.org/ardour/ardour.git;
rev = "refs/tags/${tag}";
sha256 = "0k1z8sbjf88dqn12kf9cykrqj38vkr879n2g6b4adk6cghn8wz3x";
};
buildInputs =
[ alsaLib aubio boost cairomm curl fftw fftwSinglePrec flac glibc
glibmm gtk gtkmm jack2 libgnomecanvas libgnomecanvasmm liblo
libmad libogg librdf librdf_raptor librdf_rasqal libsamplerate
libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv lv2
makeWrapper pango perl pkgconfig python serd sord sratom suil
];
patchPhase = ''
printf '#include "libs/ardour/ardour/revision.h"\nnamespace ARDOUR { const char* revision = \"${revision}\"; }\n' > libs/ardour/revision.cc
sed 's|/usr/include/libintl.h|${glibc}/include/libintl.h|' -i wscript
sed -e 's|^#!/usr/bin/perl.*$|#!${perl}/bin/perl|g' -i tools/fmt-bindings
sed -e 's|^#!/usr/bin/env.*$|#!${perl}/bin/perl|g' -i tools/*.pl
'';
configurePhase = "python waf configure --optimize --prefix=$out";
buildPhase = "python waf";
# For the custom ardour clearlooks gtk-engine to work, it must be
# moved to a directory called "engines" and added to GTK_PATH
installPhase = ''
python waf install
mkdir -pv $out/gtk2/engines
cp build/libs/clearlooks-newer/libclearlooks.so $out/gtk2/engines/
wrapProgram $out/bin/ardour3 --prefix GTK_PATH : $out/gtk2
# Install desktop file
mkdir -p "$out/share/applications"
cat > "$out/share/applications/ardour.desktop" << EOF
[Desktop Entry]
Name=Ardour 3
GenericName=Digital Audio Workstation
Comment=Multitrack harddisk recorder
Exec=$out/bin/ardour3
Icon=$out/share/ardour3/icons/ardour_icon_256px.png
Terminal=false
Type=Application
X-MultipleArgs=false
Categories=GTK;Audio;AudioVideoEditing;AudioVideo;Video;
EOF
'';
meta = with stdenv.lib; {
description = "Multi-track hard disk recording software";
longDescription = ''
Ardour is a digital audio workstation (DAW), You can use it to
record, edit and mix multi-track audio and midi. Produce your
own CDs. Mix video soundtracks. Experiment with new ideas about
music and sound.
Please consider supporting the ardour project financially:
https://community.ardour.org/node/8288
'';
homepage = http://ardour.org/;
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = [ maintainers.goibhniu ];
};
}

View file

@ -1,9 +1,11 @@
{ stdenv, fetchgit, alsaLib, aubio, boost, cairomm, curl, fftw
{ stdenv, fetchgit, alsaLib, aubio, boost, cairomm, curl, dbus, fftw
, fftwSinglePrec, flac, glibc, glibmm, gtk, gtkmm, jack2
, libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg, librdf
, librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile
, libusb, libuuid, libxml2, libxslt, lilv, lv2, makeWrapper, pango
, perl, pkgconfig, python, serd, sord, sratom, suil }:
, perl, pkgconfig, python, rubberband, serd, sord, sratom, suil, taglib
, vampSDK
}:
let
@ -15,11 +17,11 @@ let
# "git describe" when _not_ on an annotated tag(!): MAJOR.MINOR-REV-HASH.
# Version to build.
tag = "3.5.403";
tag = "4.0";
# Version info that is built into the binary. Keep in sync with 'tag'. The
# last 8 digits is a (fake) commit id.
revision = "3.5-403-00000000";
revision = "4.0-e1aa66cb3f";
in
@ -28,17 +30,18 @@ stdenv.mkDerivation rec {
src = fetchgit {
url = git://git.ardour.org/ardour/ardour.git;
rev = "refs/tags/${tag}";
sha256 = "0k1z8sbjf88dqn12kf9cykrqj38vkr879n2g6b4adk6cghn8wz3x";
rev = "e1aa66cb3f";
sha256 = "396668fb9116a68f5079f0d880930e890fd0cdf7ee5f3b97fcf44b88cf840b4c";
};
buildInputs =
[ alsaLib aubio boost cairomm curl fftw fftwSinglePrec flac glibc
glibmm gtk gtkmm jack2 libgnomecanvas libgnomecanvasmm liblo
libmad libogg librdf librdf_raptor librdf_rasqal libsamplerate
libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv lv2
makeWrapper pango perl pkgconfig python serd sord sratom suil
];
buildInputs = [
alsaLib aubio boost cairomm curl dbus fftw fftwSinglePrec flac
glibc glibmm gtk gtkmm jack2 libgnomecanvas libgnomecanvasmm liblo
libmad libogg librdf librdf_raptor librdf_rasqal libsamplerate
libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv lv2
makeWrapper pango perl pkgconfig python rubberband serd sord
sratom suil taglib vampSDK
];
patchPhase = ''
printf '#include "libs/ardour/ardour/revision.h"\nnamespace ARDOUR { const char* revision = \"${revision}\"; }\n' > libs/ardour/revision.cc
@ -47,7 +50,7 @@ stdenv.mkDerivation rec {
sed -e 's|^#!/usr/bin/env.*$|#!${perl}/bin/perl|g' -i tools/*.pl
'';
configurePhase = "python waf configure --optimize --prefix=$out";
configurePhase = "python waf configure --with-backend=alsa,jack --optimize --prefix=$out";
buildPhase = "python waf";
@ -57,17 +60,17 @@ stdenv.mkDerivation rec {
python waf install
mkdir -pv $out/gtk2/engines
cp build/libs/clearlooks-newer/libclearlooks.so $out/gtk2/engines/
wrapProgram $out/bin/ardour3 --prefix GTK_PATH : $out/gtk2
wrapProgram $out/bin/ardour4 --prefix GTK_PATH : $out/gtk2
# Install desktop file
mkdir -p "$out/share/applications"
cat > "$out/share/applications/ardour.desktop" << EOF
[Desktop Entry]
Name=Ardour 3
Name=Ardour 4
GenericName=Digital Audio Workstation
Comment=Multitrack harddisk recorder
Exec=$out/bin/ardour3
Icon=$out/share/ardour3/icons/ardour_icon_256px.png
Exec=$out/bin/ardour4
Icon=$out/share/ardour4/icons/ardour_icon_256px.png
Terminal=false
Type=Application
X-MultipleArgs=false
@ -78,7 +81,13 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Multi-track hard disk recording software";
longDescription = ''
Also read "The importance of Paying Something" on their homepage, please!
Ardour is a digital audio workstation (DAW), You can use it to
record, edit and mix multi-track audio and midi. Produce your
own CDs. Mix video soundtracks. Experiment with new ideas about
music and sound.
Please consider supporting the ardour project financially:
https://community.ardour.org/node/8288
'';
homepage = http://ardour.org/;
license = licenses.gpl2;

View file

@ -2,12 +2,12 @@
, libxslt, lv2, pkgconfig, premake3, xlibs }:
stdenv.mkDerivation rec {
name = "distrho-ports-git-2015-01-28";
name = "distrho-ports-git-2015-05-04";
src = fetchgit {
url = "https://github.com/DISTRHO/DISTRHO-Ports.git";
rev = "b4e2dc24802fe6804c60fcd2559a0bca46b7709c";
sha256 = "661ff6f7cda71a8dd08cbcea3f560e99f0fc2232053cbc9a2aaba854137805c6";
rev = "3f13db5dc7722ed0dcbb5256d7fac1ac9165c2d8";
sha256 = "6f740f6a8af714436ef75b858944e8122490a2faa04591a201105e84bca42fa0";
};
patchPhase = ''
@ -22,13 +22,11 @@ stdenv.mkDerivation rec {
buildPhase = ''
sh ./scripts/premake-update.sh linux
make standalone
make lv2
'';
installPhase = ''
mkdir -p $out/bin
cp bin/standalone/* $out/bin/
mkdir -p $out/lib/lv2
cp -a bin/lv2/* $out/lib/lv2/
'';
@ -38,18 +36,14 @@ stdenv.mkDerivation rec {
description = "A collection of cross-platform audio effects and plugins";
longDescription = ''
Includes:
3BandEQ bitmangler drowaudio-distortion drowaudio-flanger
drowaudio-tremolo eqinox juce_pitcher sDelay TAL-Filter
TAL-NoiseMaker TAL-Reverb-2 TAL-Vocoder-2 ThePilgrim
Wolpertinger argotlunar capsaicin drowaudio-distortionshaper
drowaudio-reverb drumsynth highlife JuceDemoPlugin PingPongPan
TAL-Dub-3 TAL-Filter-2 TAL-Reverb TAL-Reverb-3 TheFunction vex
Dexed drowaudio-distortion drowaudio-distortionshaper drowaudio-flanger
drowaudio-reverb drowaudio-tremolo drumsynt EasySSP eqinox
JuceDemoPlugin klangfalter LUFSMeter luftikus obxd pitchedDelay
stereosourceseparation TAL-Dub-3 TAL-Filter TAL-Filter-2 TAL-NoiseMaker
TAL-Reverb TAL-Reverb-2 TAL-Reverb-3 TAL-Vocoder-2 TheFunction
ThePilgrim Vex Wolpertinger
'';
maintainers = [ maintainers.goibhniu ];
platforms = platforms.linux;
# The old repo was removed and split into multiple repos. More
# work is required to get everything to build and work.
broken = true;
};
}

View file

@ -1,24 +1,27 @@
{ stdenv, fetchsvn, boost, ganv, glibmm, gtk, gtkmm, jack2, lilv
, lv2, makeWrapper, pkgconfig, python, raul, rdflib, serd, sord, sratom
{ stdenv, fetchsvn, boost, ganv, glibmm, gtk, gtkmm, jack2, lilv-svn
, lv2, makeWrapper, pkgconfig, python, raul, rdflib, serd, sord-svn, sratom
, suil
}:
stdenv.mkDerivation rec {
name = "ingen-svn-${rev}";
rev = "5490";
rev = "5675";
src = fetchsvn {
url = "http://svn.drobilla.net/lad/trunk/ingen";
rev = rev;
sha256 = "09h2mrkzpwzhhyqy21xr7jhfbl82gmqfyj0lzhnjsrab8z56yzk6";
sha256 = "1dk56rzbc0rwlbzr90rv8bh5163xwld32nmkvcz7ajfchi4fnv86";
};
buildInputs = [
boost ganv glibmm gtk gtkmm jack2 lilv lv2 makeWrapper pkgconfig
python raul serd sord sratom suil
boost ganv glibmm gtk gtkmm jack2 lilv-svn lv2 makeWrapper pkgconfig
python raul serd sord-svn sratom suil
];
configurePhase = "python waf configure --prefix=$out";
configurePhase = ''
sed -e "s@{PYTHONDIR}/'@out/'@" -i wscript
python waf configure --prefix=$out
'';
propagatedBuildInputs = [ rdflib ];

View file

@ -0,0 +1,40 @@
{ stdenv, fetchurl, gtk, lv2, libsamplerate, libsndfile, pkgconfig, zita-convolver }:
stdenv.mkDerivation rec {
name = "ir.lv2-${version}";
version = "1.2.2";
src = fetchurl {
url = "http://factorial.hu/system/files/${name}.tar.gz";
sha256 = "17a6h2mv9xv41jpbx6bdakkngin4kqzh2v67l4076ddq609k5a7v";
};
buildInputs = [ gtk lv2 libsamplerate libsndfile pkgconfig zita-convolver ];
buildPhase = ''
make
make convert4chan
'';
installPhase = ''
mkdir "$out/bin"
mkdir "$out/include"
mkdir "$out/share"
mkdir "$out/share/doc"
make PREFIX="$out" install
install -Dm755 convert4chan "$out/bin/convert4chan"
# fixed location
sed -i 's/, but seem like its gone://' README
sed -i 's@rhythminmind.net/1313@rhythminmind.net/STN@' README
install -Dm644 README "$out/share/doc/README"
'';
meta = with stdenv.lib; {
homepage = http://factorial.hu/plugins/lv2/ir;
description = "Zero-latency, realtime, high performance signal convolver especially for creating reverb effects";
license = licenses.gpl2;
maintainers = [ maintainers.magnetophon ];
platforms = platforms.linux;
};
}

View file

@ -0,0 +1,26 @@
{ stdenv, fetchurl, boost, cairomm, cmake, libsndfile, lv2, ntk, pkgconfig, python }:
stdenv.mkDerivation rec {
name = "sorcer-${version}";
version = "1.1.1";
src = fetchurl {
url = "https://github.com/harryhaaren/openAV-Sorcer/archive/release-${version}.tar.gz";
sha256 = "1jkhs2rhn4givac7rlbj8067r7qq6jnj3ixabb346nw7pd6gn1wn";
};
buildInputs = [ boost cairomm cmake libsndfile lv2 ntk pkgconfig python ];
installPhase = ''
make install
cp -a ../presets/* "$out/lib/lv2"
'';
meta = with stdenv.lib; {
homepage = http://openavproductions.com/sorcer/;
description = "A wavetable LV2 plugin synth, targeted at the electronic / dubstep genre";
license = licenses.gpl3;
maintainers = [ maintainers.magnetophon ];
platforms = platforms.linux;
};
}

View file

@ -1,30 +0,0 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, c2hs, dataDefault, deepseq, filepath, hspec
, hspecExpectations, libmpd, mtl, ncurses, QuickCheck, time
, transformers, utf8String, wcwidth
}:
cabal.mkDerivation (self: {
pname = "vimus";
version = "0.2.0";
sha256 = "0s7hfyil9rnr9rmjb08g1l1sxybx3qdkw2f59p433fkdjp2m140h";
isLibrary = true;
isExecutable = true;
buildDepends = [
dataDefault deepseq filepath libmpd mtl time utf8String wcwidth
];
testDepends = [
dataDefault hspec hspecExpectations mtl QuickCheck transformers
wcwidth
];
buildTools = [ c2hs ];
extraLibraries = [ ncurses ];
meta = {
description = "An MPD client with vim-like key bindings";
license = self.stdenv.lib.licenses.mit;
platforms = self.ghc.meta.platforms;
maintainers = with self.stdenv.lib.maintainers; [ jzellner ];
broken = self.stdenv.isLinux && self.stdenv.isi686;
};
})

View file

@ -0,0 +1,29 @@
{ stdenv, fetchurl, boost, libX11, mesa, liblo, jack2, ladspaH, lv2, pkgconfig, rubberband, libsndfile }:
stdenv.mkDerivation rec {
name = "zam-plugins-${version}";
version = "3.5";
src = fetchurl {
url = "https://github.com/zamaudio/zam-plugins/archive/${version}.tar.gz";
sha256 = "0icdrs4vaaj8gqi76jkkx5yk9h3agipa11cyb5h52y814q6mx6vm";
};
buildInputs = [ boost libX11 mesa liblo jack2 ladspaH lv2 pkgconfig rubberband libsndfile ];
patchPhase = ''
patchShebangs ./libs/generate-ttl.sh
'';
makeFlags = [
"PREFIX=$(out)"
];
meta = with stdenv.lib; {
homepage = http://www.zamaudio.com/?p=976;
description = "A collection of LV2/LADSPA/VST/JACK audio plugins by ZamAudio";
license = licenses.gpl2Plus;
maintainers = [ maintainers.magnetophon ];
platforms = platforms.linux;
};
}

View file

@ -298,7 +298,7 @@ in {
};
"i686-linux" = fetchurl {
url = http://download.eclipse.org/eclipse/downloads/drops4/R-4.4.2-201502041700/eclipse-SDK-4.4.2-linux-gtk.tar.gz;
sha256 = "9f4238ce9f887a1a57bbc6c6898e43357d14a6d74f59385327813c5e82aa735d";
sha256 = "1hacyjjwhhxi7r3xyhpqgjqpd5r0irw9bfkalz5s5l6shb0lq4i7";
};
};
};

View file

@ -1,23 +0,0 @@
{ cabal, emacs, haskellMode, haskellSrcExts }:
cabal.mkDerivation (self: {
pname = "structured-haskell-mode";
version = "1.0.4";
sha256 = "1402wx27py7292ad7whsb13ywv71k36501jpfrn2p0v7knzknj8z";
isLibrary = false;
isExecutable = true;
buildDepends = [ haskellSrcExts haskellMode ];
buildTools = [ emacs ];
postInstall = ''
emacs -L elisp -L ${haskellMode}/share/emacs/site-lisp \
--batch -f batch-byte-compile "elisp/"*.el
install -d $out/share/emacs/site-lisp
install "elisp/"*.el "elisp/"*.elc $out/share/emacs/site-lisp
'';
meta = {
homepage = "https://github.com/chrisdone/structured-haskell-mode";
description = "Structured editing Emacs mode for Haskell";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

View file

@ -212,14 +212,14 @@ in
android-studio = buildAndroidStudio rec {
name = "android-studio-${version}";
version = "1.2.0.8";
build = "141.1845774";
version = "1.2.0.12";
build = "141.1890965";
description = "Android development environment based on IntelliJ IDEA";
license = stdenv.lib.licenses.asl20;
src = fetchurl {
url = "https://dl.google.com/dl/android/studio/ide-zips/${version}" +
"/android-studio-ide-${build}-linux.zip";
sha256 = "1l201qv1aya1l9jrybgqclv2v2fgzdpcb6qsnxszcq3npplisw9h";
sha256 = "01k96rql192ksnprc4yai97fcals7msf06m9bx1q7asn46887h7n";
};
};
@ -309,13 +309,13 @@ in
webstorm = buildWebStorm rec {
name = "webstorm-${version}";
version = "9.0.3";
build = "139.1112";
version = "10.0.2";
build = "141.728";
description = "Professional IDE for Web and JavaScript devlopment";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz";
sha256 = "e4cfe7b5f1220b68d880c4f236df9c9df2b1efcc04775afad6149d949f45f0aa";
sha256 = "0ghv1r145qb5kmp2x375f5674b86d51w024fz390znlnniclizqx";
};
};

View file

@ -2,20 +2,19 @@
stdenv.mkDerivation rec {
pname = "texmaker";
version = "4.1.1";
version = "4.4.1";
name = "${pname}-${version}";
src = fetchurl {
url = "http://www.xm1math.net/texmaker/${name}.tar.bz2";
sha256 = "1h5rxdq6f05wk3lnlw96fxwrb14k77cx1mwy648127h2c8nsgw4z";
sha256 = "1d5lb4sibdhvzgfr0zi48j92b4acvvvdy2biqi3jzjdnzy9r94w0";
};
buildInputs = [ qt4 poppler_qt4 zlib ];
nativeBuildInputs = [ pkgconfig poppler ];
NIX_CFLAGS_COMPILE="-I${poppler}/include/poppler";
preConfigure = ''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo ${poppler}/include/poppler/) " # for poppler-config.h
qmake PREFIX=$out DESKTOPDIR=$out/share/applications ICONDIR=$out/share/pixmaps texmaker.pro
'';

View file

@ -1,21 +1,20 @@
{ stdenv, fetchurl, qt4, poppler_qt4, zlib}:
{ stdenv, fetchurl, qt4, poppler_qt4, zlib, pkgconfig}:
stdenv.mkDerivation rec {
pname = "texstudio";
version = "2.7.0";
version = "2.9.4";
name = "${pname}-${version}";
altname="Texstudio";
src = fetchurl {
url = "mirror://sourceforge/texstudio/${name}.tar.gz";
sha256 = "167d78nfk265jjvl129nr70v8ladb2rav2qyhw7ngr6m54gak831";
sha256 = "1smmc4xqs8x8qzp6iqj2wr4xarfnxxxp6rq6chx1kb256w75jwfw";
};
buildInputs = [ qt4 poppler_qt4 zlib ];
buildInputs = [ qt4 poppler_qt4 zlib pkgconfig];
preConfigure = ''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo ${poppler_qt4}/include/poppler/qt4) "
qmake PREFIX=$out texstudio.pro
qmake PREFIX=$out NO_APPDATA=True texstudio.pro
'';
meta = with stdenv.lib; {

View file

@ -1,39 +0,0 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, binary, Cabal, cautiousFile, dataDefault, derive, dlist
, dynamicState, dyre, exceptions, filepath, glib, gtk, hashable
, hint, HUnit, lens, mtl, ooPrototypes, pango, parsec, pointedlist
, QuickCheck, random, regexBase, regexTdfa, safe, semigroups, split
, tagged, tasty, tastyHunit, tastyQuickcheck, text, time
, transformersBase, unixCompat, unorderedContainers, utf8String
, vty, wordTrie, xdgBasedir, yiLanguage, yiRope
}:
cabal.mkDerivation (self: {
pname = "yi";
version = "0.11.1";
sha256 = "15m1wwrxmszl930az79lpgyz5rxg72gy8vi17ibpac1cszfdx192";
isLibrary = true;
isExecutable = true;
buildDepends = [
binary Cabal cautiousFile dataDefault derive dlist dynamicState
dyre exceptions filepath glib gtk hashable hint lens mtl
ooPrototypes pango parsec pointedlist QuickCheck random regexBase
regexTdfa safe semigroups split tagged text time transformersBase
unixCompat unorderedContainers utf8String vty wordTrie xdgBasedir
yiLanguage yiRope
];
testDepends = [
filepath HUnit lens QuickCheck semigroups tasty tastyHunit
tastyQuickcheck text yiLanguage yiRope
];
configureFlags = "-fpango -fvty";
noHaddock = self.stdenv.lib.versionOlder self.ghc.version "7.8";
meta = {
homepage = http://haskell.org/haskellwiki/Yi;
description = "The Haskell-Scriptable Editor";
license = self.stdenv.lib.licenses.gpl2;
platforms = self.ghc.meta.platforms;
maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
};
})

View file

@ -1,22 +0,0 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, cmdargs, configurator, dyre, filepath, hoodleCore, mtl }:
cabal.mkDerivation (self: {
pname = "hoodle";
version = "0.3";
sha256 = "01wz7bwdr3i43ikaiaq8vpn6b0clxjnjyaw6nl6zaq489dhj6fv5";
isLibrary = true;
isExecutable = true;
buildDepends = [
cmdargs configurator dyre filepath hoodleCore mtl
];
meta = {
homepage = "http://ianwookim.org/hoodle";
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

@ -1,31 +0,0 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, aeson, binary, bytestringProgress, deepseq, filepath
, HUnit, libXScrnSaver, parsec, pcreLight, processExtras, strict
, tasty, tastyGolden, tastyHunit, terminalProgressBar, time
, transformers, utf8String, X11
}:
cabal.mkDerivation (self: {
pname = "arbtt";
version = "0.8.1.4";
sha256 = "15ydb425nvqfzajx09q713wy5xa7awbzfjlsidk17vf7qbhfjn7z";
isLibrary = false;
isExecutable = true;
buildDepends = [
aeson binary bytestringProgress deepseq filepath parsec pcreLight
strict terminalProgressBar time transformers utf8String X11
];
testDepends = [
binary deepseq HUnit parsec pcreLight processExtras tasty
tastyGolden tastyHunit time transformers utf8String
];
extraLibraries = [ libXScrnSaver ];
jailbreak = true;
meta = {
homepage = "http://arbtt.nomeata.de/";
description = "Automatic Rule-Based Time Tracker";
license = "GPL";
platforms = self.ghc.meta.platforms;
};
})

View file

@ -1,51 +1,42 @@
{ stdenv, fetchurl, jdk, jre, ant, coreutils, gnugrep }:
{ stdenv, fetchurl, jdk, jre, ant }:
stdenv.mkDerivation {
name = "freemind-0.9.0";
stdenv.mkDerivation rec {
name = "freemind-${version}";
version = "1.0.1";
src = fetchurl {
url = mirror://sourceforge/freemind/freemind-src-0.9.0.tar.gz;
sha256 = "1qd535gwx00d8z56mplxli5529yds2gsmbgla5b0bhhmsdwmrxmf";
url = "mirror://sourceforge/freemind/freemind-src-${version}.tar.gz";
sha256 = "06c6pm7hpwh9hbmyah3lj2wp1g957x8znfwc5cwygsi7dc98b0h1";
};
buildInputs = [ jdk ant ];
phases = "unpackPhase patchPhase buildPhase installPhase";
preConfigure = ''
chmod +x check_for_duplicate_resources.sh
sed 's,/bin/bash,${stdenv.shell},' -i check_for_duplicate_resources.sh
patchPhase = ''
# There is a complain about this. I don't understand it.
mkdir plugins/plugins
## work around javac encoding errors
export JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8"
'';
buildPhase="ant dist";
# LIBXCB_ALLOW_SLOPPY_LOCK=true :
# don't know yet what this option really means but I'm no longer getting
# Checking Java Version...
# Locking assertion failure. Backtrace:
# java: xcb_xlib.c:82: xcb_xlib_unlock: Assertion `c->xlib.lock' failed
# this way
# reference and more info https://bugs.launchpad.net/ubuntu/+source/sun-java5/+bug/86103
# JDK 7 beta seems to have fixed this (bug ?)
buildPhase = "ant dist";
installPhase = ''
mkdir -p $out/{bin,nix-support}
cp -r ../bin/dist $out/nix-support
sed -i 's/which/type -p/' $out/nix-support/dist/freemind.sh
cat > $out/bin/freemind << EOF
#!/bin/sh
export PATH=${coreutils}/bin:${gnugrep}/bin:"$PATH"
export JAVA_HOME="${jre}"
export LIBXCB_ALLOW_SLOPPY_LOCK=true
$out/nix-support/dist/freemind.sh
EOF
cat >$out/bin/freemind <<EOF
#! /bin/sh
JAVA_HOME=${jre} $out/nix-support/dist/freemind.sh
EOF
chmod +x $out/{bin/freemind,nix-support/dist/freemind.sh}
'';
meta = {
meta = with stdenv.lib; {
description = "Mind-mapping software";
homepage = http://freemind.sourceforge.net/wiki/index.php/Main_Page;
license = "GPL";
};
license = licenses.gpl2Plus;
platforms = platforms.linux;
};
}

View file

@ -5,11 +5,11 @@ assert withBuildColors -> ncurses != null;
with stdenv.lib;
stdenv.mkDerivation rec {
name = "girara-${version}";
version = "0.2.3";
version = "0.2.4";
src = fetchurl {
url = "http://pwmt.org/projects/girara/download/${name}.tar.gz";
sha256 = "1phfmqp8y17zcy9yi6pm2f80x8ldbk60iswpm4bmjz5217jwqzxh";
sha256 = "0pnfdsg435b5vc4x8l9pgm77aj7ram1q0bzrp9g4a3bh1r64xq1f";
};
preConfigure = ''

View file

@ -1,18 +0,0 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, attoparsec, gtk, hflags, lens, pipes, stm }:
cabal.mkDerivation (self: {
pname = "nc-indicators";
version = "0.3";
sha256 = "0w5nddirsib9vz96dpan9bgdg1mag9gaz7w7ix51l44ls9r8yn3m";
isLibrary = false;
isExecutable = true;
buildDepends = [ attoparsec gtk hflags lens pipes stm ];
meta = {
homepage = "https://github.com/nilcons/nc-indicators";
description = "CPU load and memory usage indicators for i3bar";
license = self.stdenv.lib.licenses.asl20;
platforms = self.ghc.meta.platforms;
};
})

View file

@ -0,0 +1,22 @@
{ stdenv, fetchFromGitHub, cmake, qt4, pythonPackages }:
stdenv.mkDerivation rec {
name = "open-pdf-presenter-git-2014-09-23";
src = fetchFromGitHub {
owner = "olabini";
repo = "open-pdf-presenter";
rev = "f14930871b60b6ba50298c27377605e0a5fdf124";
sha256 = "1lfqb60zmjmsvzpbz29m8yxlzs2fscingyk8jvisng1y921726rr";
};
buildInputs = [ cmake qt4 pythonPackages.poppler-qt4 ];
meta = {
homepage = https://github.com/olabini/open-pdf-presenter;
description = "A program for presenting PDFs on multi-monitor settings (typically a laptop connected to a overhead projector)";
license = stdenv.lib.licenses.gpl3;
maintainers = [ stdenv.lib.maintainers.DamienCassou ];
platforms = stdenv.lib.platforms.all;
};
}

View file

@ -1,30 +1,36 @@
{ pkgs, fetchurl, stdenv, gtk3, udev, desktop_file_utils, shared_mime_info
, intltool, pkgconfig, makeWrapper
}:
{ pkgs, fetchurl, stdenv, gtk3, udev, desktop_file_utils, shared_mime_info , intltool, pkgconfig, makeWrapper, ffmpegthumbnailer, jmtpfs, ifuse, lsof, udisks }:
let
version = "0.9.2";
in stdenv.mkDerivation rec {
stdenv.mkDerivation rec {
name = "spacefm-${version}";
version = "1.0.1";
src = fetchurl {
url = "https://github.com/IgnorantGuru/spacefm/blob/pkg/${version}/${name}.tar.xz?raw=true";
sha256 = "3767137d74aa78597ffb42a6121784e91a4276efcd5d718b3793b9790f82268c";
url = "https://github.com/IgnorantGuru/spacefm/archive/${version}.tar.gz";
sha256 = "0mps6akwzr4mkljgywpimwgqf6ajnd7gq615877h20wyjf4h46vz";
};
buildInputs = [ gtk3 udev desktop_file_utils shared_mime_info intltool pkgconfig makeWrapper ];
configureFlags = [
"--with-bash-path=${pkgs.bash}/bin/bash"
"--with-preferable-sudo=${pkgs.sudo}/bin/sudo"
];
buildInputs = [ gtk3 udev desktop_file_utils shared_mime_info intltool pkgconfig makeWrapper ffmpegthumbnailer jmtpfs ifuse lsof udisks ];
preFixup = ''
wrapProgram "$out/bin/spacefm" \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
'';
meta = {
description = "Multi-panel tabbed file and desktop manager for Linux with built-in VFS, udev- or HAL-based device manager, customizable menu system, and bash integration";
platforms = pkgs.lib.platforms.linux;
license = pkgs.lib.licenses.gpl3;
meta = with stdenv.lib; {
description = "A multi-panel tabbed file manager";
longDescription = "Multi-panel tabbed file and desktop manager for Linux
with built-in VFS, udev- or HAL-based device manager,
customizable menu system, and bash integration
";
homepage = http://ignorantguru.github.io/spacefm/;
platforms = platforms.linux;
license = licenses.gpl3;
maintainers = [ maintainers.jagajaga ];
};
}

View file

@ -1,28 +0,0 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, cairo, dbus, dyre, enclosedExceptions, filepath, gtk
, gtkTraymanager, HStringTemplate, HTTP, mtl, network, networkUri
, parsec, safe, split, stm, text, time, transformers, utf8String
, X11, xdgBasedir, xmonad, xmonadContrib
}:
cabal.mkDerivation (self: {
pname = "taffybar";
version = "0.4.4";
sha256 = "046nfp878mqj9acsid94mqp8q1yqnm1hsdkv88m5qpmn182xljwh";
isLibrary = true;
isExecutable = true;
buildDepends = [
cairo dbus dyre enclosedExceptions filepath gtk gtkTraymanager
HStringTemplate HTTP mtl network networkUri parsec safe split stm
text time transformers utf8String X11 xdgBasedir xmonad
xmonadContrib
];
pkgconfigDepends = [ gtk ];
meta = {
homepage = "http://github.com/travitch/taffybar";
description = "A desktop bar similar to xmobar, but with more GUI";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

View file

@ -1,28 +0,0 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, alsaCore, alsaMixer, dbus, filepath, hinotify, HTTP
, libmpd, libXpm, libXrandr, mtl, parsec, regexCompat, stm, time
, timezoneOlson, timezoneSeries, transformers, utf8String
, wirelesstools, X11, X11Xft
}:
cabal.mkDerivation (self: {
pname = "xmobar";
version = "0.22.1";
sha256 = "0mnwwcfk0xf4fi3cnw19s6lxcg8sbsdlvg7zwvf5xf0y9q365swz";
isLibrary = false;
isExecutable = true;
buildDepends = [
alsaCore alsaMixer dbus filepath hinotify HTTP libmpd mtl parsec
regexCompat stm time timezoneOlson timezoneSeries transformers
utf8String X11 X11Xft
];
extraLibraries = [ libXpm libXrandr wirelesstools ];
configureFlags = "-fall_extensions";
meta = {
homepage = "http://xmobar.org";
description = "A Minimalistic Text Based Status Bar";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.stdenv.lib.platforms.linux;
};
})

View file

@ -1,18 +0,0 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, filepath, strict, time, xdgBasedir }:
cabal.mkDerivation (self: {
pname = "yeganesh";
version = "2.5";
sha256 = "1bgw5v1g5n06jj0lyxpf48mdpaa2s49g0lbagf3jf9q01rb92bvf";
isLibrary = false;
isExecutable = true;
buildDepends = [ filepath strict time xdgBasedir ];
meta = {
homepage = "http://dmwit.com/yeganesh";
description = "small dmenu wrapper";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

View file

@ -1,12 +1,12 @@
{ stdenv, fetchurl, pkgconfig, gtk, girara, ncurses, gettext, docutils, file, makeWrapper, zathura_icon, sqlite }:
stdenv.mkDerivation rec {
version = "0.3.2";
version = "0.3.3";
name = "zathura-core-${version}";
src = fetchurl {
url = "http://pwmt.org/projects/zathura/download/zathura-${version}.tar.gz";
sha256 = "1qk5s7cyqp4l673yhma5igk9g24p5jyqyy81fdk7q7xjqlym19px";
sha256 = "1rywx09qn6ap5hb1z31wxby4lzdrqdbldm51pjk1ifflr37xwirk";
};
buildInputs = [ pkgconfig file gtk girara gettext makeWrapper sqlite ];

View file

@ -1,4 +1,4 @@
{ callPackage, pkgs, fetchurl, stdenv, useMupdf }:
{ callPackage, lib, pkgs, fetchurl, stdenv, useMupdf }:
rec {
inherit stdenv;
@ -40,7 +40,7 @@ rec {
preferLocalBuild = true;
meta = {
meta = with lib; {
homepage = http://pwmt.org/projects/zathura/;
description = "A highly customizable and functional PDF viewer";
longDescription = ''
@ -49,9 +49,9 @@ rec {
is an application that provides a minimalistic and space saving interface
as well as an easy usage that mainly focuses on keyboard interaction.
'';
license = stdenv.lib.licenses.zlib;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.garbas stdenv.lib.maintainers.smironov ];
license = licenses.zlib;
platforms = platforms.linux;
maintainers = with maintainers;[ garbas smironov ];
};
};
}

View file

@ -1,29 +1,32 @@
{ stdenv, fetchurl, pkgconfig, zathura_core, gtk, girara, mupdf, openssl, openjpeg, libjpeg, jbig2dec }:
{ stdenv, lib, fetchgit, pkgconfig, zathura_core, gtk, girara, mupdf, openssl, openjpeg, libjpeg, jbig2dec }:
stdenv.mkDerivation rec {
version = "0.2.7";
name = "zathura-pdf-mupdf-${version}";
src = fetchurl {
url = "http://pwmt.org/projects/zathura/plugins/download/${name}.tar.gz";
sha256 = "0gr5kkk75hn7sz9kmzynhhcdd9xb9sz5gdb8p1iz9g0fjhskyd5i";
src = fetchgit {
url = "https://git.pwmt.org/zathura-pdf-mupdf.git";
rev = "99bff723291f5aa2558e5c8b475f496025105f4a";
sha256 = "14mfp116a8dmazss3dcipvjs6dclazp36vsbcc53lr8lal5ccfnf";
};
buildInputs = [ pkgconfig zathura_core gtk girara openssl mupdf openjpeg libjpeg jbig2dec ];
makeFlags = "PREFIX=$(out) PLUGINDIR=$(out)/lib";
preConfigure = "patch -p1 < ${./config.patch}";
patches = [
./config.patch
];
meta = {
meta = with lib; {
homepage = http://pwmt.org/projects/zathura/;
description = "A zathura PDF plugin (mupdf)";
longDescription = ''
The zathura-pdf-mupdf plugin adds PDF support to zathura by
using the mupdf rendering library.
'';
license = stdenv.lib.licenses.zlib;
platforms = stdenv.lib.platforms.linux;
# maintainers = [ ];
license = licenses.zlib;
platforms = platforms.linux;
maintainers = with maintainers; [ cstrahan ];
};
}

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, zathura_core, girara, poppler }:
{ stdenv, lib, fetchurl, pkgconfig, zathura_core, girara, poppler }:
stdenv.mkDerivation rec {
version = "0.2.5";
@ -13,15 +13,15 @@ stdenv.mkDerivation rec {
makeFlags = "PREFIX=$(out) PLUGINDIR=$(out)/lib";
meta = {
meta = with lib; {
homepage = http://pwmt.org/projects/zathura/;
description = "A zathura PDF plugin (poppler)";
longDescription = ''
The zathura-pdf-poppler plugin adds PDF support to zathura by
using the poppler rendering library.
'';
license = stdenv.lib.licenses.zlib;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.garbas ];
license = licenses.zlib;
platforms = platforms.linux;
maintainers = with maintainers; [ cstrahan garbas ];
};
}

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, gtk, zathura_core, girara, libspectre, gettext }:
{ stdenv, lib, fetchurl, pkgconfig, gtk, zathura_core, girara, libspectre, gettext }:
stdenv.mkDerivation rec {
name = "zathura-ps-0.2.2";
@ -14,16 +14,16 @@ stdenv.mkDerivation rec {
makeFlags = "PREFIX=$(out) PLUGINDIR=$(out)/lib";
meta = {
meta = with lib; {
homepage = http://pwmt.org/projects/zathura/;
description = "A zathura PS plugin";
longDescription = ''
The zathura-ps plugin adds PS support to zathura by using the
libspectre library.
'';
license = stdenv.lib.licenses.zlib;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.garbas ];
license = licenses.zlib;
platforms = platforms.linux;
maintainers = with maintainers; [ cstrahan garbas ];
};
}

View file

@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
name = "jumanji-${version}";
version = "20140622";
version = "20150107";
src = fetchgit {
url = git://pwmt.org/jumanji.git;
rev = "8f40487304a6a931487c411b25001f2bb5cf8d4f";
sha256 = "1hdk09rayyv2knxzn4n7d41dvh34gdk9ra75x7g9n985w13pkinv";
rev = "f8e04e5b5a9fec47d49ca63a096e5d35be281151";
sha256 = "1xq06iabr4y76faf4w1cx6fhwdksfsxggz1ndny7icniwjzk98h9";
};
buildInputs = [ girara pkgconfig gtk webkitgtk makeWrapper ];

View file

@ -2,11 +2,11 @@
, gettext, libiconv, makeWrapper, perl }:
stdenv.mkDerivation rec {
name = "newsbeuter-2.8";
name = "newsbeuter-2.9";
src = fetchurl {
url = "http://www.newsbeuter.org/downloads/${name}.tar.gz";
sha256 = "013qi8yghpms2qq1b3xbrlmfgpj0ybgk0qhj245ni4kpxila0wn8";
sha256 = "1j1x0hgwxz11dckk81ncalgylj5y5fgw5bcmp9qb5hq9kc0vza3l";
};
@ -22,14 +22,13 @@ stdenv.mkDerivation rec {
export LDFLAGS=-lncursesw
'';
installPhase = ''
DESTDIR=$out prefix=\"\" make install
''
+ stdenv.lib.optionalString stdenv.isDarwin ''
for prog in $out/bin/*; do
wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${stfl}/lib"
done
'';
installFlags = [ "DESTDIR=$(out)" "prefix=" ];
installPhase = stdenv.lib.optionalString stdenv.isDarwin ''
for prog in $out/bin/*; do
wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${stfl}/lib"
done
'';
meta = {
homepage = http://www.newsbeuter.org;
@ -39,4 +38,3 @@ stdenv.mkDerivation rec {
platforms = stdenv.lib.platforms.unix;
};
}

View file

@ -1,12 +1,12 @@
{ stdenv, fetchurl, openssl, pkgconfig, gnutls, gsasl, libidn }:
stdenv.mkDerivation rec {
version = "1.6.1";
version = "1.6.2";
name = "msmtp-${version}";
src = fetchurl {
url = "mirror://sourceforge/msmtp/${name}.tar.xz";
sha256 = "1ws6hdpm8vfq4vwxjwgd8xndx5ax1ppnmxn0fhzlwj3pvkr4fpf4";
sha256 = "12c7ljahb06pgn8yvvw526xvr11vnr6d4nr0apylixddpxycsvig";
};
buildInputs = [ openssl pkgconfig gnutls gsasl libidn ];

View file

@ -11,7 +11,7 @@ stdenv.mkDerivation {
name = "teamviewer-10.0.37742";
src = fetchurl {
url = config.teamviewer10.url or "http://download.teamviewer.com/download/teamviewer_amd64.deb";
sha256 = config.teamviewer10.sha256 or "1j3zbvyj003gk8mm9sv1dld9x30l6fswwlhdyk46mixsqq5ayp6c";
sha256 = config.teamviewer10.sha256 or "0n2lzphvsqnlvm7pd7hjlislqj9rr57lai8jyw4wpqcy9j2xwxd2";
};
buildInputs = [ makeWrapper patchelf ];

View file

@ -1,19 +0,0 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, Cabal, Decimal, hledgerLib, mtl, time }:
cabal.mkDerivation (self: {
pname = "hledger-interest";
version = "1.4.4";
sha256 = "16knk1cwrpg5jn6vgcab7hqpjzg33ysz57x1f2glrmhhv1slmbfn";
isLibrary = false;
isExecutable = true;
buildDepends = [ Cabal Decimal hledgerLib mtl time ];
meta = {
homepage = "http://github.com/peti/hledger-interest";
description = "computes interest for a given account";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = with self.stdenv.lib.maintainers; [ simons ];
};
})

View file

@ -1,18 +0,0 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, Cabal, hledgerLib, statistics, time }:
cabal.mkDerivation (self: {
pname = "hledger-irr";
version = "0.1.1.4";
sha256 = "0nqd8br86d71dpwq7p8956q74pgqdimid42xikp9zvf632x2s8ax";
isLibrary = false;
isExecutable = true;
buildDepends = [ Cabal hledgerLib statistics time ];
meta = {
description = "computes the internal rate of return of an investment";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
broken = true;
};
})

View file

@ -1,28 +0,0 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, ansiTerminal, cereal, downloadCurl, filepath, HTTP
, network, optparseApplicative, terminalSize, text, zlib
}:
cabal.mkDerivation (self: {
pname = "sloane";
version = "1.9.3";
sha256 = "0xl3dmi6czwfbi17742hqxf3d6sl9dci08qszrkdmasnvivakg78";
isLibrary = false;
isExecutable = true;
buildDepends = [
ansiTerminal cereal downloadCurl filepath HTTP network
optparseApplicative terminalSize text zlib
];
postInstall = ''
mkdir -p $out/share/man/man1
cp sloane.1 $out/share/man/man1/
'';
meta = {
homepage = "http://github.com/akc/sloane";
description = "A command line interface to Sloane's On-Line Encyclopedia of Integer Sequences";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = with self.stdenv.lib.maintainers; [ akc ];
};
})

View file

@ -1,20 +1,22 @@
args : with args;
{ stdenv, fetchurl, makeWrapper, python2, bazaar }:
rec {
version = "2.5";
stdenv.mkDerivation rec {
name = "bzr-tools-${version}";
version = "2.6.0";
src = fetchurl {
url = "http://launchpad.net/bzrtools/stable/${version}/+download/bzrtools-${version}.tar.gz";
sha256 = "0gzh63vl9006cpklszwmsymrq5ddxxrnxwbv5bwi740jlvxzdkxw";
sha256 = "0n3zzc6jf5866kfhmrnya1vdr2ja137a45qrzsz8vz6sc6xgn5wb";
};
buildInputs = [];
configureFlags = [];
buildInputs = [ makeWrapper python2 ];
/* doConfigure should be specified separately */
phaseNames = [(simplyShare "bzrtools")];
installPhase = ''
${python2}/bin/python ./setup.py install --prefix=$out
'';
name = "bzr-tools-${version}";
meta = {
description = "Bazaar plugins";
homepage = http://wiki.bazaar.canonical.com/BzrTools;
};
}

View file

@ -1,56 +0,0 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, aeson, async, aws, blazeBuilder, bloomfilter, bup
, byteable, caseInsensitive, clientsession, conduit, conduitExtra
, cryptoApi, cryptohash, curl, dataDefault, dataenc, DAV, dbus
, dlist, dns, editDistance, exceptions, fdoNotify, feed, filepath
, git, gnupg1, gnutls, hamlet, hinotify, hslogger, httpClient
, httpConduit, httpTypes, IfElse, json, lsof, MissingH
, monadControl, mtl, network, networkInfo, networkMulticast
, networkProtocolXmpp, networkUri, openssh, optparseApplicative
, pathPieces, perl, QuickCheck, random, regexTdfa, resourcet, rsync
, SafeSemaphore, securemem, SHA, shakespeare, stm, tasty
, tastyHunit, tastyQuickcheck, tastyRerun, text, time, torrent
, transformers, unixCompat, utf8String, uuid, wai, waiExtra, warp
, warpTls, wget, which, xmlTypes, yesod, yesodCore, yesodDefault
, yesodForm, yesodStatic
}:
cabal.mkDerivation (self: {
pname = "git-annex";
version = "5.20141231";
sha256 = "0rrwaclc3mpn39087fs5pgn0axjp5mki0nhj9a3fjjchdwd8wzyf";
isLibrary = false;
isExecutable = true;
buildDepends = [
aeson async aws blazeBuilder bloomfilter byteable caseInsensitive
clientsession conduit conduitExtra cryptoApi cryptohash dataDefault
dataenc DAV dbus dlist dns editDistance exceptions fdoNotify feed
filepath gnutls hamlet hinotify hslogger httpClient httpConduit
httpTypes IfElse json MissingH monadControl mtl network networkInfo
networkMulticast networkProtocolXmpp networkUri optparseApplicative
pathPieces QuickCheck random regexTdfa resourcet SafeSemaphore
securemem SHA shakespeare stm tasty tastyHunit tastyQuickcheck
tastyRerun text time torrent transformers unixCompat utf8String
uuid wai waiExtra warp warpTls xmlTypes yesod yesodCore
yesodDefault yesodForm yesodStatic
];
buildTools = [
bup curl git gnupg1 lsof openssh perl rsync wget which
];
configureFlags = "-fAssistant -fProduction";
preConfigure = "export HOME=$TEMPDIR";
installPhase = "./Setup install";
checkPhase = ''
cp dist/build/git-annex/git-annex git-annex
./git-annex test
'';
propagatedUserEnvPkgs = [git lsof];
meta = {
homepage = "http://git-annex.branchable.com/";
description = "manage files with git, without checking their contents into git";
license = self.stdenv.lib.licenses.gpl3;
platforms = self.ghc.meta.platforms;
maintainers = with self.stdenv.lib.maintainers; [ simons ];
};
})

View file

@ -1,5 +1,5 @@
{ stdenv, fetchgit, mercurial, makeWrapper,
asciidoc, xmlto, dbus, docbook_xsl, docbook_xml_dtd_45, libxslt, libxml2
asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt, libxml2
}:
stdenv.mkDerivation rec {
@ -14,12 +14,12 @@ stdenv.mkDerivation rec {
};
buildInputs = [ mercurial.python mercurial makeWrapper
asciidoc xmlto dbus docbook_xsl docbook_xml_dtd_45 libxslt libxml2
asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt libxml2
];
doCheck = false;
installFlags = "HOME=\${out}";
installFlags = "HOME=\${out} install-doc";
postInstall = ''
wrapProgram $out/bin/git-remote-hg \

View file

@ -1,26 +0,0 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, exceptions, filepath, git, github, hslogger, IfElse
, MissingH, mtl, network, networkUri, optparseApplicative
, prettyShow, text, transformers, unixCompat
}:
cabal.mkDerivation (self: {
pname = "github-backup";
version = "1.20141204";
sha256 = "0asj0ix81k6vi95rwlhs7ikk936lzfsav4gw0gvyzf31ggmf4j4c";
isLibrary = false;
isExecutable = true;
buildDepends = [
exceptions filepath github hslogger IfElse MissingH mtl network
networkUri optparseApplicative prettyShow text transformers
unixCompat
];
buildTools = [ git ];
meta = {
homepage = "https://github.com/joeyh/github-backup";
description = "backs up everything github knows about a repository, to the repository";
license = "GPL";
platforms = self.ghc.meta.platforms;
};
})

View file

@ -1,30 +0,0 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, extensibleExceptions, filepath, mtl, utf8String, X11 }:
cabal.mkDerivation (self: {
pname = "xmonad";
version = "0.11";
sha256 = "1nsv88y2b206n3s5hrsp5ginvz1bj818ns7jmikavb2g33akdgg5";
isLibrary = true;
isExecutable = true;
buildDepends = [
extensibleExceptions filepath mtl utf8String X11
];
postInstall = ''
shopt -s globstar
mkdir -p $out/share/man/man1
mv "$out/"**"/man/"*.1 $out/share/man/man1/
'';
patches = [
# Patch to make xmonad use XMONAD_{GHC,XMESSAGE} (if available).
../../../development/haskell-modules/xmonad-nix.patch
];
meta = {
homepage = "http://xmonad.org";
description = "A tiling window manager";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

View file

@ -1,21 +0,0 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, extensibleExceptions, mtl, random, utf8String, X11, X11Xft
, xmonad
}:
cabal.mkDerivation (self: {
pname = "xmonad-contrib";
version = "0.11.3";
sha256 = "14h9vr33yljymswj50wbimav263y9abdcgi07mvfis0zd08rxqxa";
buildDepends = [
extensibleExceptions mtl random utf8String X11 X11Xft xmonad
];
meta = {
homepage = "http://xmonad.org/";
description = "Third party extensions for xmonad";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = with self.stdenv.lib.maintainers; [ simons ];
};
})

View file

@ -1,24 +0,0 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, hint, libmpd, mtl, network, parsec, random, regexPosix
, split, X11, xmonad, xmonadContrib
}:
cabal.mkDerivation (self: {
pname = "xmonad-extras";
version = "0.12";
sha256 = "1gyj9j6x21rvs6kg6g74wr0jdd36c5ml63a670456fhjr96s8y0g";
buildDepends = [
hint libmpd mtl network parsec random regexPosix split X11 xmonad
xmonadContrib
];
configureFlags = "-f-with_hlist -fwith_split -fwith_parsec";
jailbreak = true;
meta = {
homepage = "http://projects.haskell.org/xmonad-extras";
description = "Third party extensions for xmonad with wacky dependencies";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = with self.stdenv.lib.maintainers; [ simons ];
};
})

View file

@ -1,330 +0,0 @@
# generic builder for Cabal packages
{ stdenv, fetchurl, lib, pkgconfig, ghc, Cabal, jailbreakCabal, glibcLocales
, gnugrep, coreutils, hscolour, cpphs
, enableLibraryProfiling ? false
, enableSharedLibraries ? false
, enableSharedExecutables ? false
, enableStaticLibraries ? true
, enableCheckPhase ? stdenv.lib.versionOlder "7.4" ghc.version
, enableHyperlinkSource ? true
, enableCpphs ? false
, extension ? (self : super : {})
}:
let
enableFeature = stdenv.lib.enableFeature;
versionOlder = stdenv.lib.versionOlder;
optional = stdenv.lib.optional;
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.
assert enableCheckPhase -> versionOlder "7" ghc.version;
# GHC prior to 7.4.x doesn't know the "--enable-executable-dynamic" flag.
assert enableSharedExecutables -> versionOlder "7.4" ghc.version;
# Our GHC 6.10.x builds do not provide sharable versions of their core libraries.
assert enableSharedLibraries -> versionOlder "6.12" ghc.version;
# Pure shared library builds don't work before GHC 7.8.x.
assert !enableStaticLibraries -> versionOlder "7.7" ghc.version;
{
mkDerivation =
args : # arguments for the individual package, can modify the defaults
let # These attributes are removed in the end. This is in order not to spoil the build
# environment overly, but also to keep hash-backwards-compatible with the old cabal.nix.
internalAttrs = [
"internalAttrs" "buildDepends" "buildTools" "extraLibraries" "pkgconfigDepends"
"isLibrary" "isExecutable" "testDepends"
];
# Stuff happening after the user preferences have been processed. We remove
# internal attributes and strip null elements from the dependency lists, all
# in the interest of keeping hashes stable.
postprocess =
x : (removeAttrs x internalAttrs) // {
buildInputs = filter (y : ! (y == null)) x.buildInputs;
propagatedBuildInputs = filter (y : ! (y == null)) x.propagatedBuildInputs;
propagatedUserEnvPkgs = filter (y : ! (y == null)) x.propagatedUserEnvPkgs;
doCheck = enableCheckPhase && x.doCheck;
useCpphs = enableCpphs && x.useCpphs;
hyperlinkSource = enableHyperlinkSource && x.hyperlinkSource;
# Disable Darwin builds: <https://github.com/NixOS/nixpkgs/issues/2689>.
meta = let meta = x.meta or {};
hydraPlatforms = meta.hydraPlatforms or meta.platforms or [];
noElem = p: ps: !stdenv.lib.elem p ps;
noDarwin = p: noElem p stdenv.lib.platforms.darwin;
in
meta // { hydraPlatforms = filter noDarwin hydraPlatforms; };
};
defaults =
self : { # self is the final version of the attribute set
# pname should be defined by the client to be the package basename
# version should be defined by the client to be the package version
# fname is the internal full name of the package
fname = "${self.pname}-${self.version}";
# name is the external full name of the package; usually we prefix
# all packages with haskell- to avoid name clashes for libraries;
# if that is not desired (for applications), name can be set to
# fname.
name = if self.isLibrary then
if enableLibraryProfiling && self.enableSharedLibraries then
"haskell-${self.pname}-ghc${ghc.ghc.version}-${self.version}-profiling-shared"
else if enableLibraryProfiling && !self.enableSharedLibraries then
"haskell-${self.pname}-ghc${ghc.ghc.version}-${self.version}-profiling"
else if !enableLibraryProfiling && self.enableSharedLibraries then
"haskell-${self.pname}-ghc${ghc.ghc.version}-${self.version}-shared"
else
"haskell-${self.pname}-ghc${ghc.ghc.version}-${self.version}"
else
"${self.pname}-${self.version}";
# the default download location for Cabal packages is Hackage,
# you still have to specify the checksum
src = fetchurl {
url = "mirror://hackage/${self.pname}/${self.fname}.tar.gz";
inherit (self) sha256;
};
# default buildInputs are just ghc, if more buildInputs are required
# buildInputs can be extended by the client by using extraBuildInputs,
# but often propagatedBuildInputs is preferable anyway
buildInputs = [ghc Cabal] ++ self.extraBuildInputs;
extraBuildInputs = self.buildTools ++
(optionals self.doCheck self.testDepends) ++
(optional self.hyperlinkSource hscolour) ++
(optional self.useCpphs cpphs) ++
(if self.pkgconfigDepends == [] then [] else [pkgconfig]) ++
(if self.isLibrary then [] else self.buildDepends ++ self.extraLibraries ++ self.pkgconfigDepends);
# we make sure that propagatedBuildInputs is defined, so that we don't
# have to check for its existence
propagatedBuildInputs = if self.isLibrary then self.buildDepends ++ self.extraLibraries ++ self.pkgconfigDepends else [];
# By default, also propagate all dependencies to the user environment. This is required, otherwise packages would be broken, because
# GHC also needs all dependencies to be available.
propagatedUserEnvPkgs = if self.isLibrary then self.buildDepends else [];
# library directories that have to be added to the Cabal files
extraLibDirs = [];
# build-depends Cabal field
buildDepends = [];
# target(s) passed to the cabal build phase as an argument
buildTarget = "";
# build-depends Cabal fields stated in test-suite stanzas
testDepends = [];
# target(s) passed to the cabal test phase as an argument
testTarget = "";
# build-tools Cabal field
buildTools = [];
# extra-libraries Cabal field
extraLibraries = [];
# pkgconfig-depends Cabal field
pkgconfigDepends = [];
isLibrary = ! self.isExecutable;
isExecutable = false;
# ignore version restrictions on the build inputs that the cabal file might specify
jailbreak = false;
# pass the '--enable-split-objs' flag to cabal in the configure stage
enableSplitObjs = !stdenv.isDarwin; # http://hackage.haskell.org/trac/ghc/ticket/4013
# pass the '--enable-tests' flag to cabal in the configure stage
# and run any regression test suites the package might have
doCheck = enableCheckPhase;
# force cpphs instead of the C compiler's preprocessor; sometimes
# needed due to clang's wacky behavior
useCpphs = false;
# pass the '--hyperlink-source' flag to ./Setup haddock
hyperlinkSource = enableHyperlinkSource;
# abort the build if the configure phase detects that the package
# depends on multiple versions of the same build input
strictConfigurePhase = true;
# pass the '--enable-library-vanilla' flag to cabal in the
# configure stage to enable building shared libraries
inherit enableStaticLibraries;
# pass the '--enable-shared' flag to cabal in the configure
# stage to enable building shared libraries
inherit enableSharedLibraries;
# pass the '--enable-executable-dynamic' flag to cabal in
# the configure stage to enable linking shared libraries
inherit enableSharedExecutables;
extraConfigureFlags = [
(enableFeature self.enableSplitObjs "split-objs")
(enableFeature enableLibraryProfiling "library-profiling")
(enableFeature self.enableSharedLibraries "shared")
(optional (versionOlder "7" ghc.version) (enableFeature self.enableStaticLibraries "library-vanilla"))
(optional (versionOlder "7.4" ghc.version) (enableFeature self.enableSharedExecutables "executable-dynamic"))
(optional (versionOlder "7" ghc.version) (enableFeature self.doCheck "tests"))
];
# GHC needs the locale configured during the Haddock phase.
LANG = "en_US.UTF-8";
LOCALE_ARCHIVE = optionalString stdenv.isLinux "${glibcLocales}/lib/locale/locale-archive";
# compiles Setup and configures
configurePhase = ''
eval "$preConfigure"
${let newCabalFile = fetchurl {
url = "http://hackage.haskell.org/package/${self.fname}/${self.pname}.cabal";
sha256 = self.editedCabalFile;
};
in
optionalString (self.editedCabalFile or "" != "") ''
echo "Replace Cabal file with edited version ${newCabalFile}."
cp ${newCabalFile} ${self.pname}.cabal
''
}${optionalString self.jailbreak "${jailbreakCabal}/bin/jailbreak-cabal ${self.pname}.cabal"}
for i in Setup.hs Setup.lhs ${defaultSetupHs}; do
test -f $i && break
done
ghc --make -o Setup -odir $TMPDIR -hidir $TMPDIR $i
for p in $extraBuildInputs $propagatedNativeBuildInputs; do
if [ -d "$p/lib/ghc-${ghc.ghc.version}/package.conf.d" ]; then
# Haskell packages don't need any extra configuration.
continue;
fi
if [ -d "$p/include" ]; then
extraConfigureFlags+=" --extra-include-dirs=$p/include"
fi
for d in lib{,64}; do
if [ -d "$p/$d" ]; then
extraConfigureFlags+=" --extra-lib-dirs=$p/$d"
fi
done
done
configureFlags+=" --with-gcc=$CC"
${optionalString (self.enableSharedExecutables && self.stdenv.isLinux) ''
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"
''}
${optionalString (versionOlder "7.8" ghc.version && !self.isLibrary) ''
configureFlags+=" --ghc-option=-j$NIX_BUILD_CORES"
''}
${optionalString self.useCpphs ''
configureFlags+=" --ghc-option=-pgmPcpphs --ghc-option=-optP--cpp"
''}
${optionalString self.stdenv.isDarwin ''
configureFlags+=" --with-gcc=clang"
''}
echo "configure flags: $extraConfigureFlags $configureFlags"
./Setup configure --verbose --prefix="$out" --libdir='$prefix/lib/$compiler' \
--libsubdir='$pkgid' $extraConfigureFlags $configureFlags 2>&1 \
${optionalString self.strictConfigurePhase ''
| ${coreutils}/bin/tee "$NIX_BUILD_TOP/cabal-configure.log"
if ${gnugrep}/bin/egrep -q '^Warning:.*depends on multiple versions' "$NIX_BUILD_TOP/cabal-configure.log"; then
echo >&2 "*** abort because of serious configure-time warning from Cabal"
exit 1
fi
''}
eval "$postConfigure"
'';
# builds via Cabal
buildPhase = ''
eval "$preBuild"
./Setup build ${self.buildTarget}
export GHC_PACKAGE_PATH=$(${ghc.GHCPackages})
test -n "$noHaddock" || ./Setup haddock --html --hoogle \
${optionalString (stdenv.lib.versionOlder "6.12" ghc.version) "--ghc-options=-optP-P"} \
${optionalString self.hyperlinkSource "--hyperlink-source"} \
${optionalString self.useCpphs ''
--haddock-options="--optghc=-pgmPcpphs --optghc=-optP--cpp"
''}
eval "$postBuild"
'';
checkPhase = optional self.doCheck ''
eval "$preCheck"
./Setup test ${self.testTarget}
eval "$postCheck"
'';
# installs via Cabal; creates a registration file for nix-support
# so that the package can be used in other Haskell-builds; also
# adds all propagated build inputs to the user environment packages
installPhase = ''
eval "$preInstall"
./Setup copy
mkdir -p $out/bin # necessary to get it added to PATH
local confDir=$out/lib/ghc-${ghc.ghc.version}/package.conf.d
local installedPkgConf=$confDir/${self.fname}.installedconf
local pkgConf=$confDir/${self.fname}.conf
mkdir -p $confDir
./Setup register --gen-pkg-config=$pkgConf
if test -f $pkgConf; then
echo '[]' > $installedPkgConf
GHC_PACKAGE_PATH=$installedPkgConf ghc-pkg --global register $pkgConf --force
fi
if test -f $out/nix-support/propagated-native-build-inputs; then
ln -s $out/nix-support/propagated-native-build-inputs $out/nix-support/propagated-user-env-packages
fi
${optionalString (self.enableSharedExecutables && self.isExecutable && self.stdenv.isDarwin) ''
for exe in "$out/bin/"* ; do
install_name_tool -add_rpath \
$out/lib/${ghc.ghc.name}/${self.pname}-${self.version} $exe
done
''}
eval "$postInstall"
'';
# We inherit stdenv and ghc so that they can be used
# in Cabal derivations.
inherit stdenv ghc;
};
in
stdenv.mkDerivation (postprocess (let super = defaults self // args self;
self = super // extension self super;
in self));
}

View file

@ -3,7 +3,7 @@ header "getting $url${rev:+ ($rev)} into $out"
hg clone --insecure "$url" hg-clone
hg archive -q -y ${rev:+-r "$rev"} --cwd hg-clone $out
hg archive -q$subrepoClause -y ${rev:+-r "$rev"} --cwd hg-clone $out
rm -f $out/.hg_archival.txt
stopNest

View file

@ -1,4 +1,4 @@
{stdenv, mercurial, nix}: {name ? null, url, rev ? null, md5 ? null, sha256 ? null}:
{stdenv, mercurial, nix}: {name ? null, url, rev ? null, md5 ? null, sha256 ? null, fetchSubrepos ? false}:
# TODO: statically check if mercurial as the https support if the url starts woth https.
stdenv.mkDerivation {
@ -13,6 +13,8 @@ stdenv.mkDerivation {
# Nix <= 0.7 compatibility.
id = md5;
subrepoClause = if fetchSubrepos then "S" else "";
outputHashAlgo = if md5 != null then "md5" else "sha256";
outputHashMode = "recursive";
outputHash = if md5 != null then md5 else sha256;

View file

@ -17,6 +17,12 @@ if test -z "$url"; then
exit 1
fi
if test "$fetchSubrepos" == 1; then
subrepoClause=S
else
subrepoClause=
fi
test -n "$rev" || rev="tip"
@ -47,7 +53,7 @@ if test -z "$finalPath"; then
else
tmpClone=$url
fi
hg archive -q -y -r "$rev" --cwd $tmpClone $tmpArchive
hg archive -q$subrepoClause -y -r "$rev" --cwd $tmpClone $tmpArchive
rm -f $tmpArchive/.hg_archival.txt
echo "hg revision is $(cd $tmpClone; hg id -r "$rev" -i)"

View file

@ -0,0 +1,31 @@
{stdenv, fetchurl, unzip}:
stdenv.mkDerivation rec {
name = "font-awesome-4.3.0";
src = fetchurl {
url = "http://fortawesome.github.io/Font-Awesome/assets/${name}.zip";
sha256 = "018syfvkj01jym60mpys93xv84ky9l2x90gprnm9npzwkw5169jc";
};
buildCommand = ''
${unzip}/bin/unzip $src
mkdir -p $out/share/fonts/truetype
cp */fonts/*.ttf $out/share/fonts/truetype
'';
meta = {
description = "Font Awesome - TTF font";
longDescription = ''
Font Awesome gives you scalable vector icons that can instantly be customized.
This package includes only the TTF font. For full CSS etc. see the project website.
'';
homepage = "http://fortawesome.github.io/Font-Awesome/";
license = stdenv.lib.licenses.ofl;
platforms = stdenv.lib.platforms.all;
maintainers = [ stdenv.lib.maintainers.abaldeau ];
};
}

View file

@ -8,23 +8,23 @@ let
# Annoyingly, these files are updated without a change in URL. This means that
# builds will start failing every month or so, until the hashes are updated.
version = "2015-04-21";
version = "2015-05-07";
in
stdenv.mkDerivation {
name = "geolite-legacy-${version}";
srcGeoIP = fetchDB "GeoLiteCountry/GeoIP.dat.gz"
"15c7j6yyjl0k42ij7smdz2j451y3hhfbmxwkx8kp5ja0afrlw41k";
"15p8is7jml8xsy7a8afsjq7q20pkisbk5b7nj465ljaz5svq6rgv";
srcGeoIPv6 = fetchDB "GeoIPv6.dat.gz"
"0kz6yjprzqr2pi4rczbmw7489gdjzf957azahdqjai8fx0s5w93i";
"0apiypf500k9k89x6zm1109gw6j9xs83c80iyl17rxlik1hhqf8g";
srcGeoLiteCity = fetchDB "GeoLiteCity.dat.xz"
"1z40kfjwn90fln7nfnk5pwcn1wl9imw5jz6bcdy8yr552m2n31y7";
"12j44586jmvk1jnxs345lgdgl9izn51xgh1m2jm7lklsyw13b2nk";
srcGeoLiteCityv6 = fetchDB "GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz"
"1k8sig8w43cdm19rpwndr1akj1d3mxl5sch60qbinjrb05l6xbgv";
"1jlxd60l7ic7md0d93fhiyd2vqms1fcirp6wkm0glh347j64srsb";
srcGeoIPASNum = fetchDB "asnum/GeoIPASNum.dat.gz"
"0r4v2zs4alxb46kz679hw4w34s7n9pxw32wcfs5x4nhnq051y6ms";
"1y5b68s1giw01vw98c99qdhjiaxx6l4hrc2mx4rdaja46zic4maz";
srcGeoIPASNumv6 = fetchDB "asnum/GeoIPASNumv6.dat.gz"
"04ciwh5gaxja4lzlsgbg1p7rkrhnn637m4nj9ld8sb36bl2ph6gc";
"0crl31yc11w4jzgvbr9pgqd7x6ivpsgsip19s1g5xl71qbpmmjxm";
meta = with stdenv.lib; {
inherit version;

View file

@ -1,36 +0,0 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, alex, binary, boxes, cpphs, dataHash, deepseq, emacs
, equivalence, filepath, geniplate, happy, hashable, hashtables
, haskeline, haskellSrcExts, mtl, parallel, QuickCheck
, STMonadTrans, strict, text, time, transformers
, unorderedContainers, xhtml, zlib
}:
cabal.mkDerivation (self: {
pname = "Agda";
version = "2.4.2.2";
sha256 = "1hxvapnvlkx6imifswc70ng869zll0zfsygivhc2mjyhaiv10i13";
isLibrary = true;
isExecutable = true;
buildDepends = [
binary boxes dataHash deepseq equivalence filepath geniplate
hashable hashtables haskeline haskellSrcExts mtl parallel
QuickCheck STMonadTrans strict text time transformers
unorderedContainers xhtml zlib
];
buildTools = [ alex cpphs emacs happy ];
noHaddock = true;
jailbreak = true;
postInstall = ''
$out/bin/agda -c --no-main $(find $out/share -name Primitive.agda)
$out/bin/agda-mode compile
'';
meta = {
homepage = "http://wiki.portal.chalmers.se/agda/";
description = "A dependently typed functional programming language and proof assistant";
license = "unknown";
platforms = self.ghc.meta.platforms;
maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
};
})

View file

@ -1,33 +0,0 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, bifunctors, clashLib, clashPrelude, filepath, ghcPaths
, hashable, haskeline, lens, makeWrapper, mtl, text, transformers, unbound
, unorderedContainers, thLift
}:
cabal.mkDerivation (self: {
pname = "clash-ghc";
version = "0.4";
sha256 = "0pyv8snrmy7x9gv6xna5rd5chacrdvczcjs7854b80pifhag5c2g";
isLibrary = false;
isExecutable = true;
buildDepends = [
bifunctors clashLib clashPrelude filepath ghcPaths hashable
haskeline lens mtl text transformers unbound unorderedContainers
thLift
];
buildTools = [ makeWrapper ];
postInstall = ''
echo ${clashPrelude}
wrapProgram $out/bin/clash \
--add-flags "-package-db ${clashPrelude}/lib/ghc-${self.ghc.version}/package.conf.d/${clashPrelude.fname}.installedconf" \
--add-flags "-package-db ${thLift}/lib/ghc-${self.ghc.version}/package.conf.d/${thLift.fname}.installedconf" \
--add-flags "\$(${self.ghc.GHCGetPackages} ${self.ghc.version} \"\$(dirname \$0)\" \"-package-db\")"
'';
meta = {
homepage = "http://christiaanb.github.io/clash2";
description = "CAES Language for Synchronous Hardware";
license = "unknown";
platforms = self.ghc.meta.platforms;
};
})

View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, patchelf, perl, ncurses, expat, python, zlib
, xlibs, gtk2, glib, fontconfig, freetype, unixODBC, alsaLib
, xlibs, gtk2, glib, fontconfig, freetype, unixODBC, alsaLib, glibc
}:
let version = "6.5.19"; in
@ -23,6 +23,7 @@ stdenv.mkDerivation rec {
buildInputs = [ perl ];
runtimeDependencies = [
glibc
ncurses expat python zlib
xlibs.libX11 xlibs.libXext xlibs.libXrender xlibs.libXt xlibs.libXtst xlibs.libXi xlibs.libXext
gtk2 glib fontconfig freetype unixODBC alsaLib
@ -54,6 +55,9 @@ stdenv.mkDerivation rec {
rm $out/tools/CUDA_Occupancy_Calculator.xls
perl ./install-sdk-linux.pl --prefix="$sdk" --cudaprefix="$out"
mv $out/include $out/usr_include
# let's remove the 32-bit libraries, they confuse the lib64->lib mover
rm -rf $out/lib
'';
setupHook = ./setup-hook.sh;

View file

@ -1,15 +1,20 @@
{ stdenv, fetchurl, unzip, curl }:
stdenv.mkDerivation {
name = "dmd-2.067.0";
name = "dmd-2.067.1";
src = fetchurl {
url = http://downloads.dlang.org/releases/2015/dmd.2.067.0.zip;
sha256 = "0b1b65694846ef3430de1de341c8cf353151a1a39656e6a1065fe56bc90fb60b";
url = http://downloads.dlang.org/releases/2015/dmd.2.067.1.zip;
sha256 = "0ny99vfllvvgcl79pwisxcdnb3732i827k9zg8c0j4s0n79k5z94";
};
buildInputs = [ unzip curl ];
# Allow to use "clang++", commented in Makefile
postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
substituteInPlace src/dmd/posix.mak --replace g++ clang++
'';
buildPhase = ''
cd src/dmd
make -f posix.mak INSTALL_DIR=$out
@ -34,8 +39,9 @@ stdenv.mkDerivation {
cd ../phobos
mkdir $out/lib
${let bits = if stdenv.is64bit then "64" else "32"; in
"cp generated/linux/release/${bits}/libphobos2.a $out/lib"
${let bits = if stdenv.is64bit then "64" else "32";
osname = if stdenv.isDarwin then "osx" else "linux"; in
"cp generated/${osname}/release/${bits}/libphobos2.a $out/lib"
}
cp -r std $out/include/d2
@ -55,4 +61,3 @@ stdenv.mkDerivation {
platforms = platforms.unix;
};
}

View file

@ -1,34 +0,0 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, aeson, aesonPretty, binary, blazeHtml, blazeMarkup
, cmdargs, filemanip, filepath, HUnit, indents, languageEcmascript
, languageGlsl, mtl, parsec, QuickCheck, testFramework
, testFrameworkHunit, testFrameworkQuickcheck2, text, transformers
, unionFind, unorderedContainers
}:
cabal.mkDerivation (self: {
pname = "elm-compiler";
version = "0.14.1";
sha256 = "0my04mipgia5qw02nzzrzc4kq3vl7bv75rzrsmd2bdb2wll1k94f";
isLibrary = true;
isExecutable = true;
buildDepends = [
aeson aesonPretty binary blazeHtml blazeMarkup cmdargs filepath
indents languageEcmascript languageGlsl mtl parsec text
transformers unionFind unorderedContainers
];
testDepends = [
aeson aesonPretty binary blazeHtml blazeMarkup cmdargs filemanip
filepath HUnit indents languageEcmascript languageGlsl mtl parsec
QuickCheck testFramework testFrameworkHunit
testFrameworkQuickcheck2 text transformers unionFind
unorderedContainers
];
meta = {
homepage = "http://elm-lang.org";
description = "Values to help with elm-package, elm-make, and elm-lang.org";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

View file

@ -1,25 +0,0 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, aeson, aesonPretty, ansiWlPprint, binary, Elm, filepath
, HTTP, httpClient, httpClientTls, httpTypes, mtl, network
, optparseApplicative, vector
}:
cabal.mkDerivation (self: {
pname = "elm-get";
version = "0.1.3";
sha256 = "1did7vjd1h2kh5alndd2b63zi8b1m9hf6k1k75yxwvw6f6mz5i4q";
isLibrary = true;
isExecutable = true;
buildDepends = [
aeson aesonPretty ansiWlPprint binary Elm filepath HTTP httpClient
httpClientTls httpTypes mtl network optparseApplicative vector
];
jailbreak = true;
meta = {
homepage = "http://github.com/elm-lang/elm-get";
description = "Tool for sharing and using Elm libraries";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

View file

@ -1,23 +0,0 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, ansiWlPprint, binary, blazeHtml, blazeMarkup, elmCompiler
, elmPackage, filepath, mtl, optparseApplicative, text
}:
cabal.mkDerivation (self: {
pname = "elm-make";
version = "0.1.1";
sha256 = "02mqr6v146piwrhycnmlxnky5bmsl7ap7781qmcwkfmc89wfa4zl";
isLibrary = false;
isExecutable = true;
buildDepends = [
ansiWlPprint binary blazeHtml blazeMarkup elmCompiler elmPackage
filepath mtl optparseApplicative text
];
meta = {
homepage = "http://elm-lang.org";
description = "A build tool for Elm projects";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

View file

@ -1,26 +0,0 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, aeson, aesonPretty, ansiWlPprint, binary, elmCompiler
, filepath, HTTP, httpClient, httpClientTls, httpTypes, mtl
, network, optparseApplicative, text, time, unorderedContainers
, vector, zipArchive
}:
cabal.mkDerivation (self: {
pname = "elm-package";
version = "0.4";
sha256 = "0vsq87imyvs1sa2n4z41b6qswy2cknxsg4prhwc9r7lvyljkmn03";
isLibrary = true;
isExecutable = true;
buildDepends = [
aeson aesonPretty ansiWlPprint binary elmCompiler filepath HTTP
httpClient httpClientTls httpTypes mtl network optparseApplicative
text time unorderedContainers vector zipArchive
];
meta = {
homepage = "http://github.com/elm-lang/elm-package";
description = "Package manager for Elm libraries";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

View file

@ -1,6 +0,0 @@
{
"evancz/virtual-dom": "1.1.0",
"evancz/elm-markdown": "1.1.2",
"evancz/elm-html": "1.1.0",
"elm-lang/core": "1.1.0"
}

View file

@ -1,68 +0,0 @@
{ unzip, fetchurl, fetchFromGitHub, cabal, blazeHtml, blazeMarkup, cmdargs, elmCompiler, elmMake, filepath
, fsnotify, HTTP, mtl, snapCore, snapServer, systemFilepath, text
, time, transformers, unorderedContainers, websockets
, websocketsSnap
}:
cabal.mkDerivation (self: rec {
pname = "elm-reactor";
version = "0.3";
isLibrary = false;
isExecutable = true;
buildTools = [ unzip ];
src = fetchFromGitHub {
owner = "elm-lang";
repo = "elm-reactor";
rev = "176ff8e05e4bb7474752da1b3455c83d6181d594";
sha256 = "1marjqlmmq3a74g9f3ngk90h9mkhillcdwfsys6x0nqj6qirw4ph";
};
elmLangCore = fetchurl {
url = "https://github.com/elm-lang/core/archive/1.1.0.zip";
sha256 = "1fhvghjsay1p82k13039wbd02k439yplv2rh9zr77zvcbih6a31j";
};
elmHtml = fetchurl {
url = "https://github.com/evancz/elm-html/archive/1.1.0.zip";
sha256 = "01wshabxsdrxcxs2nn3dhk7n8720sp3prpkahhx36vvprdh05l4q";
};
elmMarkdown = fetchurl {
url = "https://github.com/evancz/elm-markdown/archive/1.1.2.zip";
sha256 = "14y1wp28za50zypdzyvl5d57hkm0v3rgnzm5klv3jcbd625kr9bg";
};
virtualDom = fetchurl {
url = "https://github.com/evancz/virtual-dom/archive/1.1.0.zip";
sha256 = "08dr7q0x1ycgj5b15s2kn1a45iw350gzq65c3lxp47xfffq1vz91";
};
elmStuff = ./elm-reactor-exact-dependencies.json;
preConfigure = ''
unzip -d $TEMPDIR -q ${elmLangCore}
mkdir -p elm-stuff/packages/elm-lang/core/1.1.0
cp -pr $TEMPDIR/core-1.1.0/* elm-stuff/packages/elm-lang/core/1.1.0/
unzip -d $TEMPDIR -q ${elmHtml}
mkdir -p elm-stuff/packages/evancz/elm-html/1.1.0
cp -pr $TEMPDIR/elm-html-1.1.0/* elm-stuff/packages/evancz/elm-html/1.1.0
unzip -d $TEMPDIR -q ${elmMarkdown}
mkdir -p elm-stuff/packages/evancz/elm-markdown/1.1.2
cp -pr $TEMPDIR/elm-markdown-1.1.2/* elm-stuff/packages/evancz/elm-markdown/1.1.2
unzip -d $TEMPDIR -q ${virtualDom}
mkdir -p elm-stuff/packages/evancz/virtual-dom/1.1.0
cp -pr $TEMPDIR/virtual-dom-1.1.0/* elm-stuff/packages/evancz/virtual-dom/1.1.0
cp ${elmStuff} elm-stuff/exact-dependencies.json
'';
buildDepends = [
blazeHtml blazeMarkup cmdargs elmCompiler filepath fsnotify HTTP
mtl snapCore snapServer systemFilepath text time transformers
unorderedContainers websockets websocketsSnap elmMake
];
meta = {
homepage = "http://elm-lang.org";
description = "Interactive development tool for Elm programs";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

View file

@ -1,28 +0,0 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, bytestringTrie, cmdargs, Elm, filepath, haskeline, HUnit
, mtl, parsec, QuickCheck, testFramework, testFrameworkHunit
, testFrameworkQuickcheck2
}:
cabal.mkDerivation (self: {
pname = "elm-repl";
version = "0.3";
sha256 = "10a4a2ybg5dlshpklnisb957lknb0w8s3ppaq5p5y6ylqik8ak0a";
isLibrary = false;
isExecutable = true;
buildDepends = [
bytestringTrie cmdargs Elm filepath haskeline mtl parsec
];
testDepends = [
bytestringTrie cmdargs Elm filepath haskeline HUnit mtl parsec
QuickCheck testFramework testFrameworkHunit
testFrameworkQuickcheck2
];
meta = {
homepage = "https://github.com/elm-lang/elm-repl";
description = "a REPL for Elm";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

View file

@ -1,23 +0,0 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, cmdargs, Elm, filepath, mtl, snapCore, snapServer
, unorderedContainers
}:
cabal.mkDerivation (self: {
pname = "elm-server";
version = "0.11.0.1";
sha256 = "0nnkhmmm4cl6a314xxh5qwxkjsc3k3vcwdfar62578ykarxb53g1";
isLibrary = false;
isExecutable = true;
buildDepends = [
cmdargs Elm filepath mtl snapCore snapServer unorderedContainers
];
jailbreak = true;
meta = {
homepage = "http://elm-lang.org";
description = "Server for developing Elm projects";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

View file

@ -1,40 +0,0 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, aeson, aesonPretty, binary, blazeHtml, blazeMarkup
, cheapskate, cmdargs, filemanip, filepath, highlightingKate, HUnit
, indents, languageEcmascript, languageGlsl, mtl, parsec
, QuickCheck, testFramework, testFrameworkHunit
, testFrameworkQuickcheck2, text, transformers, unionFind
, unorderedContainers
}:
cabal.mkDerivation (self: {
pname = "Elm";
version = "0.13";
sha256 = "1l6p00h0717blwvia0gvqpsakq8jy44fxc6brr4qxs5g4yjcjnmh";
isLibrary = true;
isExecutable = true;
buildDepends = [
aeson aesonPretty binary blazeHtml blazeMarkup cheapskate cmdargs
filepath highlightingKate indents languageEcmascript languageGlsl
mtl parsec text transformers unionFind unorderedContainers
];
testDepends = [
aeson aesonPretty binary blazeHtml blazeMarkup cheapskate cmdargs
filemanip filepath highlightingKate HUnit indents
languageEcmascript languageGlsl mtl parsec QuickCheck testFramework
testFrameworkHunit testFrameworkQuickcheck2 text transformers
unionFind unorderedContainers
];
doCheck = false;
preConfigure = ''
rm -f Setup.hs
echo -e "import Distribution.Simple\nmain=defaultMain\n" > Setup.hs
'';
meta = {
homepage = "http://elm-lang.org";
description = "The Elm language module";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

View file

@ -1,20 +0,0 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, boehmgc, Cabal, gmp, happy, mtl }:
cabal.mkDerivation (self: {
pname = "epic";
version = "0.9.3.2";
sha256 = "1l73absns4ci20brkdjg1r1l9p4xxx88vax736diqik7rl7zrx9h";
isLibrary = true;
isExecutable = true;
buildDepends = [ Cabal mtl ];
buildTools = [ happy ];
extraLibraries = [ boehmgc gmp ];
meta = {
homepage = "http://www.dcs.st-and.ac.uk/~eb/epic.php";
description = "Compiler for a simple functional language";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

View file

@ -35,6 +35,15 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
patches = [
# Fix user pkg db location for GHCJS:
# https://ghc.haskell.org/trac/ghc/ticket/10232
(fetchpatch {
url = "https://git.haskell.org/ghc.git/patch/c46e4b184e0abc158ad8f1eff6b3f0421acaf984";
sha256 = "0fkdyqd4bqp742rydwmqq8d2n7gf61bgdhaiw8xf7jy0ix7lr60w";
})
];
postPatch = ''
pushd libraries/Cabal
patch -p1 < ${cabalPatch}

View file

@ -1,86 +0,0 @@
{ stdenv, ghc, makeWrapper, coreutils, writeScript }:
let
ghc761OrLater = !stdenv.lib.versionOlder ghc.version "7.6.1";
packageDBFlag = if ghc761OrLater then "-package-db" else "-package-conf";
GHCGetPackages = writeScript "ghc-get-packages.sh" ''
#! ${stdenv.shell}
# Usage:
# $1: version of GHC
# $2: invocation path of GHC
# $3: prefix
version="$1"
if test -z "$3"; then
prefix="${packageDBFlag} "
else
prefix="$3"
fi
PATH="$2:$PATH"
IFS=":"
for p in $PATH; do
PkgDir="$p/../lib/ghc-$version/package.conf.d"
for i in "$PkgDir/"*.installedconf; do
# output takes place here
test -f $i && echo -n " $prefix$i"
done
done
test -f "$2/../lib/ghc-$version/package.conf" && echo -n " $prefix$2/../lib/ghc-$version/package.conf"
'';
GHCPackages = writeScript "ghc-packages.sh" ''
#! ${stdenv.shell} -e
declare -A GHC_PACKAGES_HASH # using bash4 hashs to get uniq paths
for arg in $(${GHCGetPackages} ${ghc.version} "$(dirname $0)"); do
case "$arg" in
${packageDBFlag}) ;;
*)
CANONICALIZED="$(${coreutils}/bin/readlink -f -- "$arg")"
GHC_PACKAGES_HASH["$CANONICALIZED"]= ;;
esac
done
for path in ''${!GHC_PACKAGES_HASH[@]}; do
echo -n "$path:"
done
'';
in
stdenv.mkDerivation {
name = "ghc-${ghc.version}-wrapper";
buildInputs = [makeWrapper];
propagatedBuildInputs = [ghc];
unpackPhase = "true";
installPhase = ''
runHook preInstall
mkdir -p $out/bin
for prg in ghc ghci ghc-${ghc.version} ghci-${ghc.version}; do
makeWrapper $ghc/bin/$prg $out/bin/$prg --add-flags "\$(${GHCGetPackages} ${ghc.version} \"\$(dirname \$0)\")"
done
for prg in runghc runhaskell; do
makeWrapper $ghc/bin/$prg $out/bin/$prg --add-flags "\$(${GHCGetPackages} ${ghc.version} \"\$(dirname \$0)\" \" ${packageDBFlag} --ghc-arg=\")"
done
for prg in ghc-pkg ghc-pkg-${ghc.version}; do
makeWrapper $ghc/bin/$prg $out/bin/$prg --add-flags "\$(${GHCGetPackages} ${ghc.version} \"\$(dirname \$0)\" -${packageDBFlag}=)"
done
for prg in hp2ps hpc hasktags hsc2hs; do
test -x $ghc/bin/$prg && ln -s $ghc/bin/$prg $out/bin/$prg
done
mkdir -p $out/nix-support
ln -s $out/nix-support/propagated-build-inputs $out/nix-support/propagated-user-env-packages
mkdir -p $out/share/doc
ln -s $ghc/lib $out/lib
ln -s $ghc/share/doc/ghc $out/share/doc/ghc-${ghc.version}
runHook postInstall
'';
inherit ghc GHCGetPackages GHCPackages;
inherit (ghc) meta version;
}

View file

@ -59,8 +59,8 @@ in mkDerivation (rec {
inherit version;
src = fetchgit {
url = git://github.com/ghcjs/ghcjs.git;
rev = "64c3768186d73d8c185b42d4d14dfb943919ee56"; # master branch
sha256 = "1w7rwcqzihg6h2j0khar7kjn8vdjg9ngjk6bndpiqcgf3kwfmvhf";
rev = "d4322c2ae4467420b28eca99f0c0abd00caf5d4a"; # master branch
sha256 = "12mvl4l1i993j86n9wkwcs567jm13javghbxapjjsc7493xpmya5";
};
isLibrary = true;
isExecutable = true;

View file

@ -3,12 +3,12 @@
stdenv.mkDerivation rec {
name = "icedtea-web-${version}";
version = "1.5.2";
version = "1.6";
src = fetchurl {
url = "http://icedtea.wildebeest.org/download/source/${name}.tar.gz";
sha256 = "1wrvl66qj0yhaqqhcq24005ci5sc3w005809cld55iiwagr8z7mj";
sha256 = "0z8iirvpciai55s4vhpfkhyx4h4hm6dqy4pg4c61pia3innqd4qn";
};
buildInputs = [ gtk2 xulrunner zip pkgconfig npapi_sdk ];

View file

@ -1,34 +0,0 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, annotatedWlPprint, ansiTerminal, ansiWlPprint
, base64Bytestring, binary, blazeHtml, blazeMarkup, boehmgc
, cheapskate, deepseq, filepath, fingertree, gmp, happy, haskeline
, lens, libffi, mtl, network, optparseApplicative, parsers, split
, text, time, transformers, trifecta, unorderedContainers
, utf8String, vector, vectorBinaryInstances, xml, zlib
}:
cabal.mkDerivation (self: {
pname = "idris";
version = "0.9.15.1";
sha256 = "0r31jcqs9kgknm66v7bbcgj9md7z49sgvn0nhk1dwg8jj2rmfll8";
isLibrary = true;
isExecutable = true;
buildDepends = [
annotatedWlPprint ansiTerminal ansiWlPprint base64Bytestring binary
blazeHtml blazeMarkup cheapskate deepseq filepath fingertree
haskeline lens libffi mtl network optparseApplicative parsers split
text time transformers trifecta unorderedContainers utf8String
vector vectorBinaryInstances xml zlib
];
buildTools = [ happy ];
extraLibraries = [ boehmgc gmp ];
configureFlags = "-fgmp -fffi";
jailbreak = true;
meta = {
homepage = "http://www.idris-lang.org/";
description = "Functional Programming Language with Dependent Types";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

View file

@ -1,11 +0,0 @@
{ stdenv, gmp, makeWrapper, runCommand, idris_plain, boehmgc}:
runCommand "idris-wrapper" {} ''
source ${makeWrapper}/nix-support/setup-hook
mkdir -p $out/bin
ln -s ${idris_plain}/bin/idris $out/bin
wrapProgram $out/bin/idris \
--suffix NIX_CFLAGS_COMPILE : '"-I${gmp}/include -L${gmp}/lib -L${boehmgc}/lib"' \
--suffix PATH : ${stdenv.cc}/bin \
--suffix PATH : ${idris_plain}/bin
''

View file

@ -1,5 +1,9 @@
{ stdenv, fetchurl, perl, ghc, binary, zlib, utf8String, readline, fgl,
regexCompat, HsSyck, random }:
{ stdenv, fetchurl, perl, ghcWithPackages }:
let ghc = ghcWithPackages (hpkgs: with hpkgs; [
binary zlib utf8-string readline fgl regex-compat HsSyck random
]);
in
stdenv.mkDerivation rec {
name = "jhc-${version}";
@ -10,10 +14,7 @@ stdenv.mkDerivation rec {
sha256 = "0lrgg698mx6xlrqcylba9z4g1f053chrzc92ri881dmb1knf83bz";
};
buildInputs =
[ perl ghc binary zlib utf8String
readline fgl regexCompat HsSyck random
];
buildInputs = [ perl ghc ];
meta = {
description = "Whole-program, globally optimizing Haskell compiler";

View file

@ -1,18 +1,19 @@
{ stdenv, fetchurl, unzip }:
stdenv.mkDerivation rec {
name = "nim-0.10.2";
name = "nim-0.11.0";
buildInputs = [ unzip ];
src = fetchurl {
url = "http://nim-lang.org/download/${name}.zip";
sha256 = "1jkrf8wgva7kfl0vqs1f3scidi6a85r6bkz2zf90k8gdpin9idrg";
sha256 = "0l19rrp6nhwhr2z33np4x32c35iba0hhv6w3qwj1sk8bjfpvz4cw";
};
buildPhase = "sh build.sh";
installPhase =
''
installBin bin/nim
substituteInPlace install.sh --replace '$1/nim' "$out"
sh install.sh $out
'';

View file

@ -1,43 +0,0 @@
diff -Naur pakcs-1.11.4-upstream/Makefile pakcs-1.11.4/Makefile
--- pakcs-1.11.4-upstream/Makefile 2014-10-24 05:12:37.000000000 -0430
+++ pakcs-1.11.4/Makefile 2015-01-05 16:26:39.256709080 -0430
@@ -94,7 +94,6 @@
install: cleanoldinfos installscripts copylibs
@echo "PAKCS installation configuration (file pakcsinitrc):"
@cat pakcsinitrc
- $(MAKE) frontend
# pre-compile all libraries:
@cd lib && $(MAKE) fcy
# install the Curry2Prolog compiler as a saved system:
@@ -145,10 +144,6 @@
# compile the tools:
.PHONY: tools
tools:
- # compile the Curry Port Name Server demon:
- @if [ -r bin/pakcs ] ; then cd cpns && $(MAKE) ; fi
- # compile the event handler demon for dynamic web pages:
- @if [ -r bin/pakcs ] ; then cd www && $(MAKE) ; fi
@if [ -r bin/pakcs ] ; then cd currytools && $(MAKE) ; fi
@if [ -r bin/pakcs ] ; then cd tools && $(MAKE) ; fi
diff -Naur pakcs-1.11.4-upstream/scripts/pakcs.sh pakcs-1.11.4/scripts/pakcs.sh
--- pakcs-1.11.4-upstream/scripts/pakcs.sh 2014-10-24 05:06:07.000000000 -0430
+++ pakcs-1.11.4/scripts/pakcs.sh 2015-01-05 16:26:15.697982791 -0430
@@ -16,7 +16,7 @@
# use readline wrapper rlwrap if it is installed and we have tty as stdin:
USERLWRAP=no
if tty -s ; then
- RLWRAP=`which rlwrap`
+ RLWRAP=`type -P rlwrap`
if [ -x "$RLWRAP" ] ; then
USERLWRAP=yes
fi
@@ -29,7 +29,7 @@
done
if [ $USERLWRAP = yes ] ; then
- exec rlwrap -c -f "$PAKCSHOME/tools/rlwrap" "$REPL" ${1+"$@"}
+ exec rlwrap -a -c -f "$PAKCSHOME/tools/rlwrap" "$REPL" ${1+"$@"}
else
exec "$REPL" ${1+"$@"}
fi

View file

@ -1,111 +0,0 @@
{ stdenv, fetchurl, cabal, swiProlog, either, mtl, syb
, glibcLocales, makeWrapper, rlwrap, tk, which }:
let
fname = "pakcs-1.11.4";
fsrc = fetchurl {
url = "http://www.informatik.uni-kiel.de/~pakcs/download/${fname}-src.tar.gz";
sha256 = "1xsn8h58pi1jp8wr4abyrqdps840j8limyv5i812z49npf91fy5c";
};
in
stdenv.mkDerivation rec {
name = fname;
curryBase = cabal.mkDerivation(self: {
pname = "curryBase";
version = "local";
src = fsrc;
sourceRoot = "${name}/frontend/curry-base";
isLibrary = true;
buildDepends = [ mtl syb ];
});
curryFront = cabal.mkDerivation(self: {
pname = "curryFront";
version = "local";
src = fsrc;
sourceRoot = "${name}/frontend/curry-frontend";
isLibrary = true;
isExecutable = true;
buildDepends = [ either mtl syb curryBase ];
});
src = fsrc;
buildInputs = [ swiProlog makeWrapper glibcLocales rlwrap tk which ];
patches = [ ./adjust-buildsystem.patch ];
configurePhase = ''
# Phony HOME.
mkdir phony-home
export HOME=$(pwd)/phony-home
# SWI Prolog
sed -i 's@SWIPROLOG=@SWIPROLOG='${swiProlog}/bin/swipl'@' pakcsinitrc
'';
buildPhase = ''
# Some comments in files are in UTF-8, so include the locale needed by GHC runtime.
export LC_ALL=en_US.UTF-8
# PAKCS must be build in place due to embedded filesystem references placed by swi.
# Prepare PAKCSHOME directory.
mkdir -p $out/pakcs/bin
# Set up link to cymake, which has been built already.
ln -s ${curryFront}/bin/cymake $out/pakcs/bin/
# Prevent embedding the derivation build directory as temp.
export TEMP=/tmp
# Copy to in place build location and run the build.
cp -r * $out/pakcs
(cd $out/pakcs ; make)
'';
installPhase = ''
# Install bin.
mkdir -p $out/bin
for b in $(ls $out/pakcs/bin) ; do
ln -s $out/pakcs/bin/$b $out/bin/ ;
done
# Place emacs lisp files in expected locations.
mkdir -p $out/share/emacs/site-lisp/curry-pakcs
for e in "$out/tools/emacs/"*.el ; do
cp $e $out/share/emacs/site-lisp/curry-pakcs/ ;
done
# Wrap for rlwrap and tk support.
wrapProgram $out/pakcs/bin/pakcs \
--prefix PATH ":" "${rlwrap}/bin" \
--prefix PATH ":" "${tk}/bin" \
'';
meta = {
homepage = "http://www.informatik.uni-kiel.de/~pakcs/";
description = "An implementation of the multi-paradigm declarative language Curry";
license = stdenv.lib.licenses.bsd3;
longDescription = ''
PAKCS is an implementation of the multi-paradigm declarative language
Curry jointly developed by the Portland State University, the Aachen
University of Technology, and the University of Kiel. Although this is
not a highly optimized implementation but based on a high-level
compilation of Curry programs into Prolog programs, it is not a toy
implementation but has been used for a variety of applications (e.g.,
graphical programming environments, an object-oriented front-end for
Curry, partial evaluators, database applications, HTML programming
with dynamic web pages, prototyping embedded systems).
'';
maintainers = [ stdenv.lib.maintainers.kkallio ];
platforms = stdenv.lib.platforms.linux;
hydraPlatforms = stdenv.lib.platforms.none;
};
}

View file

@ -1,22 +1,19 @@
{ stdenv, coreutils, fetchgit, m4, libtool, clang, ghcWithPackages,
shuffle,
hashable, mtl, network, uhc-util, uulib
}:
{ stdenv, coreutils, fetchgit, m4, libtool, clang, ghcWithPackages }:
let wrappedGhc = ghcWithPackages ( self: [hashable mtl network uhc-util uulib] );
let wrappedGhc = ghcWithPackages (hpkgs: with hpkgs; [shuffle hashable mtl network uhc-util uulib] );
in stdenv.mkDerivation rec {
version = "1.1.8.10";
version = "1.1.9.0";
name = "uhc-${version}";
src = fetchgit {
url = "https://github.com/UU-ComputerScience/uhc.git";
rev = "449d9578e06af1362d7f746798f0aed57ab6ca88";
sha256 = "0f8abhl9idbc2qlnb7ynrb11yvm3y07vksyzs1yg6snjvlhfj5az";
rev = "0363bbcf4cf8c47d30c3a188e3e53b3f8454bbe4";
sha256 = "0sa9b341mm5ggmbydc33ja3h7k9w65qnki9gsaagb06gkvvqc7c2";
};
postUnpack = "sourceRoot=\${sourceRoot}/EHC";
buildInputs = [ m4 wrappedGhc clang libtool shuffle ];
buildInputs = [ m4 wrappedGhc clang libtool ];
configureFlags = [ "--with-gcc=${clang}/bin/clang" ];
@ -25,8 +22,8 @@ in stdenv.mkDerivation rec {
# want that, and hack the build process to use a temporary package
# configuration file instead.
preConfigure = ''
p=`pwd`/uhc-local-packages
echo '[]' > $p
p=`pwd`/uhc-local-packages/
ghc-pkg init $p
sed -i "s|--user|--package-db=$p|g" mk/shared.mk.in
sed -i "s|-fglasgow-exts|-fglasgow-exts -package-conf=$p|g" mk/shared.mk.in
sed -i "s|/bin/date|${coreutils}/bin/date|g" mk/dist.mk

View file

@ -0,0 +1,30 @@
{ stdenv, fetchurl, pkgconfig, flex, bison, libxslt
, glib, libiconv, libintlOrEmpty
}:
let
major = "0.28";
minor = "0";
sha256 = "0zwpzhkhfk3piya14m7p2hl2vaabahprphppfm46ci91z39kp7hd";
in
stdenv.mkDerivation rec {
name = "vala-${major}.${minor}";
meta = {
description = "Compiler for GObject type system";
homepage = "http://live.gnome.org/Vala";
license = stdenv.lib.licenses.lgpl21Plus;
platforms = stdenv.lib.platforms.unix;
maintainers = with stdenv.lib.maintainers; [ antono lethalman ];
};
src = fetchurl {
url = "mirror://gnome/sources/vala/${major}/${name}.tar.xz";
inherit sha256;
};
nativeBuildInputs = [ pkgconfig flex bison libxslt ];
buildInputs = [ glib libiconv ]
++ libintlOrEmpty;
}

File diff suppressed because it is too large Load diff

View file

@ -118,6 +118,9 @@ self: super: {
# Agda-2.4.2.2 needs these overrides to compile.
Agda = super.Agda.override { equivalence = self.equivalence_0_2_5; cpphs = self.cpphs_1_18_9; };
# Help libconfig find it's C language counterpart.
libconfig = (dontCheck super.libconfig).override { config = pkgs.libconfig; };
# The Haddock phase fails for one reason or another.
attoparsec-conduit = dontHaddock super.attoparsec-conduit;
blaze-builder-conduit = dontHaddock super.blaze-builder-conduit;
@ -349,6 +352,7 @@ self: super: {
conduit-connection = dontCheck super.conduit-connection;
craftwerk = dontCheck super.craftwerk;
damnpacket = dontCheck super.damnpacket; # http://hydra.cryp.to/build/496923/log
data-hash = dontCheck super.data-hash;
Deadpan-DDP = dontCheck super.Deadpan-DDP; # http://hydra.cryp.to/build/496418/log/raw
DigitalOcean = dontCheck super.DigitalOcean;
directory-layout = dontCheck super.directory-layout;
@ -787,4 +791,27 @@ self: super: {
# https://github.com/ndmitchell/shake/issues/206
shake = overrideCabal super.shake (drv: { doCheck = !pkgs.stdenv.isDarwin; });
# https://github.com/nushio3/doctest-prop/issues/1
doctest-prop = dontCheck super.doctest-prop;
# https://github.com/goldfirere/singletons/issues/116
# https://github.com/goldfirere/singletons/issues/117
# https://github.com/goldfirere/singletons/issues/118
singletons = markBroken super.singletons;
singleton-nats = dontDistribute super.singleton-nats;
hgeometry = dontDistribute super.hgeometry;
hipe = dontDistribute super.hipe;
clash-lib = dontDistribute super.clash-lib;
# https://github.com/anton-k/temporal-music-notation/issues/1
temporal-music-notation = markBroken super.temporal-music-notation;
temporal-music-notation-demo = dontDistribute super.temporal-music-notation-demo;
temporal-music-notation-western = dontDistribute super.temporal-music-notation-western;
# https://github.com/ivanperez-keera/Yampa/issues/10
Yampa = dontCheck super.Yampa;
# https://github.com/adamwalker/sdr/issues/1
sdr = dontCheck super.sdr;
}

View file

@ -50,11 +50,18 @@ self: super: {
# transformers is not a core library for this compiler.
transformers = self.transformers_0_4_3_0;
# Newer versions don't compile.
Cabal_1_18_1_6 = dontJailbreak super.Cabal_1_18_1_6;
# We have no working cabal-install at the moment.
cabal-install_1_18_0_8 = markBroken super.cabal-install_1_18_0_8;
cabal-install = self.cabal-install_1_18_0_8;
# https://github.com/tibbe/hashable/issues/85
hashable = dontCheck super.hashable;
# Needs Cabal >= 1.18.x.
jailbreak-cabal = super.jailbreak-cabal.override { Cabal = dontJailbreak self.Cabal_1_18_1_6; };
jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_18_1_6; };
# Haddock chokes on the prologue from the cabal file.
ChasingBottoms = dontHaddock super.ChasingBottoms;

View file

@ -46,8 +46,13 @@ self: super: {
# https://github.com/tibbe/hashable/issues/85
hashable = dontCheck super.hashable;
# Newer versions don't compile.
Cabal_1_18_1_6 = dontJailbreak super.Cabal_1_18_1_6;
cabal-install_1_18_0_8 = super.cabal-install_1_18_0_8.override { Cabal = self.Cabal_1_18_1_6; };
cabal-install = self.cabal-install_1_18_0_8;
# Needs Cabal >= 1.18.x.
jailbreak-cabal = super.jailbreak-cabal.override { Cabal = dontJailbreak self.Cabal_1_18_1_6; };
jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_18_1_6; };
# Haddock chokes on the prologue from the cabal file.
ChasingBottoms = dontHaddock super.ChasingBottoms;

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