Merge master into x-updates

This commit is contained in:
Vladimír Čunát 2014-03-27 21:34:06 +01:00
commit 576e9289dd
206 changed files with 1509 additions and 619 deletions

View File

@ -4,16 +4,20 @@
/* Add your name and email address here. Keep the list
alphabetically sorted. */
_1126 = "Christian Lask <mail@elfsechsundzwanzig.de>";
aforemny = "Alexander Foremny <alexanderforemny@googlemail.com>";
akc = "Anders Claesson <akc@akc.is>";
algorith = "Dries Van Daele <dries_van_daele@telenet.be>";
all = "Nix Committers <nix-commits@lists.science.uu.nl>";
amiddelk = "Arie Middelkoop <amiddelk@gmail.com>";
amorsillo = "Andrew Morsillo <andrew.morsillo@gmail.com>";
AndersonTorres = "Anderson Torres <torres.anderson.85@gmail.com>";
andres = "Andres Loeh <ksnixos@andres-loeh.de>";
antono = "Antono Vasiljev <self@antono.info>";
astsmtl = "Alexander Tsamutali <astsmtl@yandex.ru>";
aszlig = "aszlig <aszlig@redmoonstudios.org>";
bbenoist = "Baptist BENOIST <return_0@live.com>";
bennofs = "Benno Fünfstück <benno.fuenfstueck@gmail.com>";
bjg = "Brian Gough <bjg@gnu.org>";
bjornfor = "Bjørn Forsman <bjorn.forsman@gmail.com>";
bluescreen303 = "Mathijs Kwik <mathijs@bluescreen303.nl>";

View File

@ -154,7 +154,8 @@ in {
description = "Almir web app";
wantedBy = [ "multi-user.target" ];
path = [ pkgs.pythonPackages.almir ];
serviceConfig.ExecStart = "${pkgs.pythonPackages.almir}/bin/pserve ${productionini}";
environment.PYTHONPATH = "${pkgs.pythonPackages.almir}/lib/${pkgs.pythonPackages.python.libPrefix}/site-packages";
serviceConfig.ExecStart = "${pkgs.pythonPackages.pyramid}/bin/pserve ${productionini}";
};
environment.systemPackages = [ pkgs.pythonPackages.almir ];

View File

@ -40,6 +40,8 @@ with pkgs.lib;
'';
services.udev.packages = [ pkgs.udisks ];
systemd.packages = [ pkgs.udisks ];
};
}

View File

@ -1,7 +1,9 @@
{ config, pkgs, ... }:
with pkgs.lib;
let
diskSize = "100G";
in
{
imports = [ ../profiles/headless.nix ../profiles/qemu-guest.nix ];
@ -12,7 +14,7 @@ with pkgs.lib;
''
mkdir $out
diskImage=$out/$diskImageBase
truncate $diskImage --size 10G
truncate $diskImage --size ${diskSize}
mv closure xchg/
'';
@ -20,8 +22,9 @@ with pkgs.lib;
''
PATH=$PATH:${pkgs.gnutar}/bin:${pkgs.gzip}/bin
pushd $out
tar -Szcf $diskImageBase.tar.gz $diskImageBase
rm $out/$diskImageBase
mv $diskImageBase disk.raw
tar -Szcf $diskImageBase.tar.gz disk.raw
rm $out/disk.raw
popd
'';
diskImageBase = "nixos-${config.system.nixosVersion}-${pkgs.stdenv.system}.raw";
@ -32,7 +35,7 @@ with pkgs.lib;
''
# Create partition table
${pkgs.parted}/sbin/parted /dev/vda mklabel msdos
${pkgs.parted}/sbin/parted /dev/vda mkpart primary ext4 1 10G
${pkgs.parted}/sbin/parted /dev/vda mkpart primary ext4 1 ${diskSize}
${pkgs.parted}/sbin/parted /dev/vda print
. /sys/class/block/vda1/uevent
mknod /dev/vda1 b $MAJOR $MINOR

View File

@ -0,0 +1,22 @@
{ stdenv, fetchurl, pkgconfig, glib, ncurses, mpd_clientlib }:
stdenv.mkDerivation rec {
version = "0.21";
name = "ncmpc-${version}";
src = fetchurl {
url = "http://www.musicpd.org/download/ncmpc/0/ncmpc-${version}.tar.bz2";
sha256 = "648e846e305c867cb937dcb467393c2f5a30bf460bdf77b63de7af69fba1fd07";
};
buildInputs = [ pkgconfig glib ncurses mpd_clientlib ];
meta = with stdenv.lib; {
description = "Curses-based interface for MPD (music player daemon)";
homepage = http://www.musicpd.org/clients/ncmpc/;
license = licenses.gpl2Plus;
maintainers = with maintainers; [ _1126 ];
platforms = platforms.all;
};
}

View File

@ -3,12 +3,12 @@
, libtool, libvorbis, pkgconfig, qt4, rubberband, stdenv }:
stdenv.mkDerivation rec {
version = "0.5.12";
version = "0.6.0";
name = "qtractor-${version}";
src = fetchurl {
url = "mirror://sourceforge/qtractor/${name}.tar.gz";
sha256 = "0yf2p9l3hj8pd550v3rbbjqkvxnvn8p6nsnm4aj2v5q4mgg2c8cc";
sha256 = "0aw6g0biqzysnsk5vd6wx3q1khyav6krhjz7bzk0v7d2160bn40r";
};
buildInputs =

View File

@ -6,11 +6,11 @@ assert stdenv ? glibc;
stdenv.mkDerivation rec {
name = "yoshimi-${version}";
version = "1.1.0";
version = "1.2.0";
src = fetchurl {
url = "mirror://sourceforge/yoshimi/${name}.tar.bz2";
sha256 = "0rb0q0bqsaaj3imdjgfaigj1kbjqkx1gm91nh2mdgy9i09rygsbv";
sha256 = "0p4v39kxxzzfvaazzxarx54i164ghpfxq0ljkavlgr8fnix5v3mx";
};
buildInputs = [

View File

@ -5,10 +5,10 @@
let
buildIdea =
{ name, src, description, license }:
{ name, version, build, src, description, license }:
stdenv.mkDerivation rec {
inherit name src license;
inherit name build src license;
ideaItem = makeDesktopItem {
name = "IDEA";
exec = "idea";
@ -23,26 +23,26 @@ let
buildCommand = ''
tar xvzf $src
mkdir -p $out
cp -a $name $out
cp -a idea-$build $out
interpreter=$(echo ${stdenv.glibc}/lib/ld-linux*.so.2)
7z x $out/$name/lib/snappy-java-1.0.5.jar
rm $out/$name/lib/snappy-java-1.0.5.jar
7z x $out/idea-$build/lib/snappy-java-1.0.5.jar
rm $out/idea-$build/lib/snappy-java-1.0.5.jar
if [ "${stdenv.system}" == "x86_64-linux" ];then
patchelf --set-interpreter $interpreter $out/$name/bin/fsnotifier64
patchelf --set-interpreter $interpreter $out/idea-$build/bin/fsnotifier64
patchelf --set-rpath ${stdenv.gcc.gcc}/lib64/ org/xerial/snappy/native/Linux/amd64/libsnappyjava.so
else
patchelf --set-interpreter $interpreter $out/$name/bin/fsnotifier
patchelf --set-interpreter $interpreter $out/idea-$build/bin/fsnotifier
patchelf --set-rpath ${stdenv.gcc.gcc}/lib/ org/xerial/snappy/native/Linux/i386/libsnappyjava.so
fi
7z a -tzip $out/$name/lib/snappy-java-1.0.5.jar .
7z a -tzip $out/idea-$build/lib/snappy-java-1.0.5.jar .
mkdir -p $out/bin
jdk=${jdk}/lib/openjdk
makeWrapper $out/$name/bin/idea.sh $out/bin/idea \
makeWrapper $out/idea-$build/bin/idea.sh $out/bin/idea \
--prefix PATH : ${jdk}/bin:${coreutils}/bin:${gnugrep}/bin:${which}/bin:${git}/bin \
--prefix LD_RUN_PATH : ${stdenv.gcc.gcc}/lib/ \
--prefix JDK_HOME : $jdk \
@ -64,23 +64,27 @@ let
in {
idea_community_1302 = buildIdea {
name = "idea-IC-133.696";
idea_community_1311 = buildIdea rec {
name = "idea-community-${version}";
version = "13.1.1";
build = "IC-135.480";
description = "IntelliJ IDEA 13 Community Edition";
license = stdenv.lib.licenses.asl20.shortName;
src = fetchurl {
url = http://download-ln.jetbrains.com/idea/ideaIC-13.0.2.tar.gz;
sha256 = "a776878c2dba877761b74d2886d006f64eec3c9694dbd1578380287a9c8cbd53";
url = "http://download-ln.jetbrains.com/idea/ideaIC-${version}.tar.gz";
sha256 = "9e28d3e5682b037c9d6190622ab2a47112fa792539083cc7a4cb24f3f7bf7d22";
};
};
idea_ultimate_1302 = buildIdea {
name = "idea-IU-133.696";
idea_ultimate_1311 = buildIdea rec {
name = "idea-ultimate-${version}";
version = "13.1.1";
build = "IU-135.480";
description = "IntelliJ IDEA 13 Ultimate Edition";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = http://download-ln.jetbrains.com/idea/ideaIU-13.0.2.tar.gz;
sha256 = "7ba9499ecc82029470712d6ead520db1e2cf520e4f86d382cbdea1d0052712d0";
url = "http://download-ln.jetbrains.com/idea/ideaIU-${version}.tar.gz";
sha256 = "d699abcdcace387105a465049e015c1367dedf42f7a5f5a1f7b3d840e98b2658";
};
};

View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "yi-contrib";
version = "0.7.1";
sha256 = "0915ikck01kc5npbvywd9r7azylqrhfymzc72rf4iaghz4w939li";
version = "0.7.2";
sha256 = "074cq1y0pp66r2fqqszd8w2pws8jbfwq9g39w3rsgjnw83058fr8";
buildDepends = [ dataAccessor filepath mtl split yi ];
meta = {
homepage = "http://haskell.org/haskellwiki/Yi";

View File

@ -9,8 +9,8 @@
cabal.mkDerivation (self: {
pname = "yi";
version = "0.7.1";
sha256 = "111xg7qpjhsqf6pfr136wh8km3lrgpzghd9h5rlypafr61w59vly";
version = "0.7.2";
sha256 = "0g0hvr4zqcrmdl6mbdmrfxd5m51fhkhslvl9piwq83g2wirxqbvm";
isLibrary = true;
isExecutable = true;
buildDepends = [

View File

@ -1,6 +1,6 @@
{ fetchurl, stdenv, m4, glibc, gtk3, libexif, libgphoto2, libsoup, libxml2, vala, sqlite, webkit
, pkgconfig, gnome3, gst_all_1, which, udev, libraw, glib, json_glib, gettext, desktop_file_utils
, lcms2, gdk_pixbuf, librsvg, makeWrapper }:
, lcms2, gdk_pixbuf, librsvg, makeWrapper, gnome_doc_utils }:
# for dependencies see http://www.yorba.org/projects/shotwell/install/
@ -18,12 +18,12 @@ let
buildInputs = [ pkgconfig glib libsoup ];
};
in stdenv.mkDerivation rec {
version = "0.15.1";
version = "0.18.0";
name = "shotwell-${version}";
src = fetchurl {
url = "mirror://gnome/sources/shotwell/0.15/${name}.tar.xz";
sha256 = "12qbqba226q9wb0m31xx8w0m968sr1n18qa4mbz75wblhwws0j7b";
url = "mirror://gnome/sources/shotwell/0.18/${name}.tar.xz";
sha256 = "0cq0zs13f3f4xyz46yvj4qfpm5nh4ypds7r53pkqm4a3n8ybf5v7";
};
NIX_CFLAGS_COMPILE = "-I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include";
@ -37,14 +37,14 @@ in stdenv.mkDerivation rec {
postInstall = ''
wrapProgram "$out/bin/shotwell" \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:$out/share"
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gsettings_desktop_schemas}/share:${gtk3}/share:$out/share"
'';
buildInputs = [ m4 glibc gtk3 libexif libgphoto2 libsoup libxml2 vala sqlite webkit pkgconfig
gst_all_1.gstreamer gst_all_1.gst-plugins-base gnome3.libgee which udev gnome3.gexiv2
libraw rest json_glib gettext desktop_file_utils glib lcms2 gdk_pixbuf librsvg
makeWrapper ];
makeWrapper gnome_doc_utils ];
meta = with stdenv.lib; {
description = "Popular photo organizer for the GNOME desktop";

View File

@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
installPhase = ''
make install
for file in "$out"/bin/* "$out"/sbin/*; do
wrapProgram $file --prefix LD_LIBRARY_PATH ":" "$out/lib:${openssl}/lib:${gcc.gcc}/lib:${libedit}/lib:${qt4}/lib"
wrapProgram $file --prefix LD_LIBRARY_PATH ":" "$out/lib:${openssl}/lib:${gcc.gcc}/lib:${stdenv.glibc}/lib::${gcc.gcc}/lib64:${stdenv.glibc}/lib64:${libedit}/lib:${qt4}/lib"
done
'';

View File

@ -1,48 +1,31 @@
{ composableDerivation, lib, fetchurl, alsaLib, libao, lame, libmad }:
let inherit (composableDerivation) edf; in
composableDerivation.composableDerivation {} {
name = "sox-14.3.0";
{ stdenv, fetchurl
, enableAlsa ? true, alsaLib ? null
, enableLibao ? true, libao ? null
, enableLame ? false, lame ? null
, enableLibmad ? true, libmad ? null
, enableLibogg ? true, libogg ? null, libvorbis ? null
}:
let
inherit (stdenv.lib) optional optionals;
in stdenv.mkDerivation rec {
name = "sox-14.4.1";
src = fetchurl {
url = mirror://sourceforge/sox/sox-14.3.0.tar.gz;
sha256 = "15r39dq9nlwrypm0vpxmbxyqqv0bd6284djbi1fdfrlkjhf43gws";
url = "mirror://sourceforge/sox/${name}.tar.gz";
sha256 = "16x8gykfjdhxg0kdxwzcwgwpm5caa08y2mx18siqsq0ywmpjr34s";
};
flags =
# are these options of interest? We'll see
#--disable-fftw disable usage of FFTW
#--enable-debug enable debugging
#--disable-cpu-clip disable tricky cpu specific clipper
edf { name = "alsa"; enable = { buildInputs = [alsaLib]; }; }
// edf { name = "libao"; enable = { buildInputs = [libao]; }; }
// edf { name = "oss"; }
// edf { name = "sun_audio"; }
// edf { name = "dl-lame"; enable.buildInputs = [ lame ]; } # use shared library
// edf { name = "lame"; enable.buildInputs = [ lame ]; }
// edf { name = "dl-mad"; enable.buildInputs = [ libmad ]; } # use shared library
// edf { name = "mad"; enable.buildInputs =[ libmad ]; }
;
cfg = {
ossSupport = false;
sun_audioSupport = false;
} // lib.listToAttrs
[ { name = "dl-lameSupport"; value = true; }
{ name = "dl-madSupport"; value = true; }
];
configureFlags = ["-enable-dl-lame"];
optionals = [ "libsndfile" "libogg" "flac" "ffmpeg" "libmad" "lame"
/* "amr-wb" "amr-nb" */
"libsamplerate" /* "ladspa" */ ];
buildInputs =
(optional enableAlsa alsaLib) ++
(optional enableLibao libao) ++
(optional enableLame lame) ++
(optional enableLibmad libmad) ++
(optionals enableLibogg [ libogg libvorbis ]);
meta = {
description = "Sample Rate Converter for audio";
homepage = http://www.mega-nerd.com/SRC/index.html;
maintainers = [lib.maintainers.marcweber];
maintainers = [stdenv.lib.maintainers.marcweber stdenv.lib.maintainers.shlevy];
# you can choose one of the following licenses:
license = [
"GPL"

View File

@ -5,11 +5,11 @@
}:
stdenv.mkDerivation rec {
name = "blender-2.69";
name = "blender-2.70";
src = fetchurl {
url = "http://download.blender.org/source/${name}.tar.gz";
sha256 = "02ffakkbax1kl4ycakxq20yp9hmw1qj1qndjjqxnhhhdxifpyjn9";
sha256 = "0j73yfpavcrzg5v54kcha7sig6179g5ykrlhih8d288pnb5c7596";
};
buildInputs = [

View File

@ -0,0 +1,71 @@
{ stdenv, python27Packages, curaengine, makeDesktopItem, fetchgit }:
let
py = python27Packages;
in
stdenv.mkDerivation rec {
name = "cura";
src = fetchgit {
url = "https://github.com/daid/Cura";
rev = "58414695269d60ca9b165e8cbc3424933ed79403";
sha256 = "1nxrrz8sjjx9i9cyvz15vay6yarnywp3vlk7qzr65sw88lzxgq23";
fetchSubmodules = false;
};
desktopItem = makeDesktopItem {
name = "Cura";
exec = "cura";
icon = "cura";
comment = "Cura";
desktopName = "Cura";
genericName = "3D printing host software";
categories = "GNOME;GTK;Utility;";
};
python_deps = [ py.pyopengl py.pyserial py.numpy py.wxPython30 py.power py.setuptools ];
pythonPath = python_deps;
propagatedBuildInputs = python_deps;
buildInputs = [ curaengine py.wrapPython ];
configurePhase = "";
buildPhase = "";
installPhase = ''
# Install Python code.
site_packages=$out/lib/python2.7/site-packages
mkdir -p $site_packages
cp -r Cura $site_packages/
# Install resources.
resources=$out/share/cura
mkdir -p $resources
cp -r resources/* $resources/
sed -i 's|os.path.join(os.path.dirname(__file__), "../../resources")|"'$resources'"|g' $site_packages/Cura/util/resources.py
# Install executable.
mkdir -p $out/bin
cp Cura/cura.py $out/bin/cura
chmod +x $out/bin/cura
sed -i 's|#!/usr/bin/python|#!/usr/bin/env python|' $out/bin/cura
wrapPythonPrograms
# Make it find CuraEngine.
echo "def getEngineFilename(): return '${curaengine}/bin/CuraEngine'" >> $site_packages/Cura/util/sliceEngine.py
# Install desktop item.
mkdir -p "$out"/share/applications
cp "$desktopItem"/share/applications/* "$out"/share/applications/
mkdir -p "$out"/share/icons
ln -s "$resources/images/c.png" "$out"/share/icons/cura.png
'';
meta = with stdenv.lib; {
description = "3D printing host software";
homepage = https://github.com/daid/Cura;
license = licenses.agpl3;
platforms = platforms.linux;
};
}

View File

@ -0,0 +1,22 @@
{ stdenv, fetchgit }:
stdenv.mkDerivation {
name = "curaengine";
src = fetchgit {
url = "https://github.com/Ultimaker/CuraEngine";
rev = "62667ff2e7479b55d75e3d1dc9136242adf4a6a0";
sha256 = "0c68xmnq4c49vzg2cyqb375kc72rcnghj21wp3919w8sfwil00vr";
};
installPhase = ''
mkdir -p $out/bin
cp CuraEngine $out/bin/
'';
meta = with stdenv.lib; {
description = "Engine for processing 3D models into 3D printing instructions";
homepage = https://github.com/Ultimaker/CuraEngine;
license = licenses.agpl3;
platforms = platforms.linux;
};
}

View File

@ -0,0 +1,32 @@
{ stdenv, fetchurl, pythonPackages, slowaes, ecdsa, pyqt4 }:
pythonPackages.buildPythonPackage rec {
name = "electrum-${version}";
version = "1.9.8";
src = fetchurl {
url = "https://download.electrum.org/Electrum-${version}.tar.gz";
sha256 = "8fc144a32013e4a747fea27fff981762a6b9e14cde9ffb405c4c721975d846ff";
};
buildInputs = [ slowaes ecdsa ];
propagatedBuildInputs = [
slowaes
ecdsa
pyqt4
];
postPatch = ''
mkdir -p $out/share
sed -i 's@usr_share = .*@usr_share = os.getenv("out")+"/share"@' setup.py
'';
meta = {
description = "Bitcoin thin-wallet";
long-description = "Electrum is an easy to use Bitcoin client. It protects you from losing coins in a backup mistake or computer failure, because your wallet can be recovered from a secret phrase that you can write on paper or learn by heart. There is no waiting time when you start the client, because it does not download the Bitcoin blockchain.";
homepage = "https://electrum.org";
license = stdenv.lib.licenses.gpl3;
maintainers = [ "emery@vfemail.net" ];
};
}

View File

@ -246,6 +246,9 @@ in stdenv.mkDerivation rec {
installPhase = ''
ensureDir "${libExecPath}"
cp -v "${buildPath}/"*.pak "${libExecPath}/"
${optionalString (!versionOlder src.version "34.0.0.0") ''
cp -v "${buildPath}/icudtl.dat" "${libExecPath}/"
''}
cp -vR "${buildPath}/locales" "${buildPath}/resources" "${libExecPath}/"
cp -v ${buildPath}/libffmpegsumo.so "${libExecPath}/"

View File

@ -1,12 +1,12 @@
{ stdenv, fetchgit, unzip, xulrunner, makeWrapper }:
stdenv.mkDerivation {
name = "conkeror-1.0pre-20131116-1";
name = "conkeror-1.0pre-20140212";
src = fetchgit {
url = git://repo.or.cz/conkeror.git;
rev = "refs/tags/debian-1.0--pre+git131116-1";
sha256 = "6fe0f30487c5bb8f2183dc7c2e15cf29df7cc8b1950b5fc15c26510c74a1f7d3";
rev = "07064d76d10e0978c6de535e21f4597d44560fbd";
sha256 = "b03a7debee8583ff7a3f2d95474f60e956f0e24dbd1a8fd22412de1d6627f322";
};
buildInputs = [ unzip makeWrapper ];

View File

@ -11,7 +11,8 @@ stdenv.mkDerivation {
buildInputs = [ openssl curl ];
# Add support for CURL_CA_BUNDLE variable.
patches = [ ./find-ca-bundle.patch ];
# Fix <http://sourceforge.net/p/esniper/bugs/648/>.
patches = [ ./find-ca-bundle.patch ./fix-ebay-login.patch ];
postInstall = ''
sed <"frontends/snipe" >"$out/bin/snipe" \

View File

@ -0,0 +1,13 @@
--- esniper-orig/auction.c 2014-03-23 22:28:46.684289574 +0100
+++ esniper/auction.c 2014-03-23 22:24:00.540568653 +0100
@@ -424,7 +424,9 @@
if ((pp->srcId && !strcmp(pp->srcId, "SignInAlertSupressor"))||
(pp->pageName &&
(!strncasecmp(pp->pageName, "MyeBay", 6) ||
- !strncasecmp(pp->pageName, "My eBay", 7))
+ !strncasecmp(pp->pageName, "My eBay", 7) ||
+ !strncasecmp(pp->pageName, "Watch list", 10) ||
+ !strncasecmp(pp->pageName, "User Agreement", 10))
))
loginTime = time(NULL);
else if (pp->pageName &&

View File

@ -1,23 +1,24 @@
{ stdenv, fetchurl, sqlite, curl, pkgconfig, libxml2, stfl, json_c, ncurses
{ stdenv, fetchurl, sqlite, curl, pkgconfig, libxml2, stfl, json-c-0-11, ncurses
, gettext, libiconvOrEmpty, makeWrapper, perl }:
stdenv.mkDerivation rec {
name = "newsbeuter-2.7";
name = "newsbeuter-2.8";
src = fetchurl {
url = "http://www.newsbeuter.org/downloads/${name}.tar.gz";
sha256 = "0flhzzlbdirjmrq738gmcxqqnifg3kb7plcwqcxshpizmjkhswp6";
sha256 = "013qi8yghpms2qq1b3xbrlmfgpj0ybgk0qhj245ni4kpxila0wn8";
};
buildInputs
# use gettext instead of libintlOrEmpty so we have access to the msgfmt
# command
= [ pkgconfig sqlite curl libxml2 stfl json_c ncurses gettext perl ]
= [ pkgconfig sqlite curl libxml2 stfl json-c-0-11 ncurses gettext perl ]
++ libiconvOrEmpty
++ stdenv.lib.optional stdenv.isDarwin makeWrapper;
preBuild = ''
sed -i -e 104,108d config.sh
sed -i -e 110,114d config.sh
sed -i "1 s%^.*$%#!${perl}/bin/perl%" txt2h.pl
export LDFLAGS=-lncursesw
'';

View File

@ -2,11 +2,12 @@
, gettext, libiconvOrEmpty, makeWrapper, perl }:
stdenv.mkDerivation rec {
name = "newsbeuter-dev-20131118";
name = "newsbeuter-dev-20140309";
src = fetchgit {
url = "https://github.com/akrennmair/newsbeuter.git";
rev = "18b73f7d44a99a698d4878fe7d226f55842132c2";
rev = "1427bdb0705806368db39576a9b803df82fa0415";
sha256 = "b29a304a46bf56b439d0d35ea586f7fd0fbf1a5565dca95de76e774885d8b64b";
};
buildInputs
@ -17,7 +18,7 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional stdenv.isDarwin makeWrapper;
preBuild = ''
sed -i -e 104,108d config.sh
sed -i -e 110,114d config.sh
sed -i "1 s%^.*$%#!${perl}/bin/perl%" txt2h.pl
export LDFLAGS=-lncursesw
'';

View File

@ -12,12 +12,12 @@ let
in with stdenv; mkDerivation rec {
version = "0.9.2";
version = "0.10.0";
name = "quassel${tag}-${version}";
src = fetchurl {
url = "http://quassel-irc.org/pub/quassel-${version}.tar.bz2";
sha256 = "1h2kzi4pgfv3qmvhxix9fffdjixs3bsya0i5c18dkh894mh02kgh";
sha256 = "08vwxkwnzlgnxn0wi6ga9fk8qgc6nklb236hsfnr5ad37bi8q8k8";
};
enableParallelBuilding = true;

View File

@ -6,14 +6,14 @@
}:
let pname = "liferea";
version = "1.10.7";
version = "1.10.8";
in
stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${name}.tar.bz2";
sha256 = "17kvg44brdz99firr5h5qx8icvadlr7p1cz3xr3437sf5rhj25wh";
sha256 = "1d3icma90mj0nai20pfhxp4k4l33iwkkkcddb9vg5hi4yq4wpmwx";
};
buildInputs = with gst_all_1; [

View File

@ -0,0 +1,31 @@
{ stdenv, fetchurl,
slang, ncurses
}:
let version = "1.0.1"; in
stdenv.mkDerivation {
name = "slrn-${version}";
src = fetchurl {
url = "http://www.jedsoft.org/slrn/download/slrn-1.0.1.tar.gz";
sha256 = "1rmaprfwvshzkv0c5vi43839cz3laqjpl306b9z0ghwyjdha1d06";
};
preConfigure = ''
sed -i -e "s|-ltermcap|-lncurses|" configure
sed -i autoconf/Makefile.in src/Makefile.in \
-e "s|/bin/cp|cp|" \
-e "s|/bin/rm|rm|"
'';
configureFlags = "--with-slang=${slang}";
buildInputs = [ slang ncurses ];
meta = {
description = "The slrn (S-Lang read news) newsreader";
homepage = http://slrn.sourceforge.net/index.html;
license = stdenv.lib.licenses.gpl2;
};
}

View File

@ -1,11 +1,11 @@
{stdenv, fetchurl, ocaml, zlib, bzip2, ncurses, file, gd, libpng }:
stdenv.mkDerivation (rec {
name = "mldonkey-3.1.3";
name = "mldonkey-3.1.5";
src = fetchurl {
url = "mirror://sourceforge/mldonkey/${name}.tar.bz2";
sha256 = "1qnr0qzliw4aynf2zhmm5hmrc9bd5vhdq3bi8n88j4nc86gry9bw";
sha256 = "1jqik6b09p27ckssppfiqpph7alxbgpnf9w1s0lalmi3qyyd9ybl";
};
meta = {

View File

@ -0,0 +1,19 @@
{ stdenv, fetchurl, ncurses, zlib, bzip2, sqlite, pkgconfig, glib, gnutls }:
stdenv.mkDerivation rec {
name = "ncdc-${version}";
version = "1.19";
src = fetchurl {
url = "http://dev.yorhel.nl/download/ncdc-1.19.tar.gz";
sha256 = "1wgvqwfxq9kc729h2r528n55821w87sfbm4h21mr6pvkpfw30hf2";
};
buildInputs = [ ncurses zlib bzip2 sqlite pkgconfig glib gnutls ];
meta = {
description = "modern and lightweight direct connect client with a friendly ncurses interface";
homepage = http://dev.yorhel.nl/ncdc;
license = stdenv.lib.licenses.mit;
};
}

View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk3, json_glib, curl }:
{ stdenv, makeWrapper, fetchurl, pkgconfig, intltool, gtk3, json_glib, curl }:
stdenv.mkDerivation rec {
@ -9,7 +9,12 @@ stdenv.mkDerivation rec {
sha256 = "1jbh2pm4i740cmzqd2r7zxnqqipvv2v2ndmnmk53nqrxcbgc4nlz";
};
buildInputs = [ pkgconfig intltool gtk3 json_glib curl ];
buildInputs = [ makeWrapper pkgconfig intltool gtk3 json_glib curl ];
postInstall = ''
wrapProgram "$out/bin/transmission-remote-gtk" \
--prefix XDG_DATA_DIRS : "${gtk3}/share"
'';
meta = {
description = "GTK remote control for the Transmission BitTorrent client";

View File

@ -3,10 +3,10 @@
stdenv.mkDerivation (rec {
name = "unison-2.40.63";
name = "unison-2.40.102";
src = fetchurl {
url = "http://www.seas.upenn.edu/~bcpierce/unison/download/releases/${name}/${name}.tar.gz";
sha256 = "17fd2bg5jxwbib87j6j2bjpwdm66whqm1fq46v70hfby79j00vkf";
url = "http://www.seas.upenn.edu/~bcpierce/unison/download/releases/stable/${name}.tar.gz";
sha256 = "0m78q5vnsric1virvkmxxx32ipaq0cnj0kbirdbg36395gq94jix";
};
buildInputs = [ ocaml makeWrapper ncurses ];

View File

@ -0,0 +1,21 @@
{ cabal, ansiTerminal, cmdargs, HTTP, terminalSize, url }:
cabal.mkDerivation (self: {
pname = "sloane";
version = "1.6";
sha256 = "0my3j53bda3s8zxnm6is1align4k082wwsfg2y1i75js5z9kwmzy";
isLibrary = false;
isExecutable = true;
buildDepends = [ ansiTerminal cmdargs HTTP terminalSize url ];
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,4 +1,4 @@
{ cabal, aeson, async, blazeBuilder, bloomfilter, bup
{ cabal, aeson, async, blazeBuilder, bloomfilter, bup, byteable
, caseInsensitive, clientsession, cryptoApi, cryptohash, curl
, dataDefault, dataenc, DAV, dbus, dlist, dns, editDistance
, extensibleExceptions, feed, filepath, git, gnupg1, gnutls, hamlet
@ -7,31 +7,31 @@
, MonadCatchIOTransformers, monadControl, mtl, network
, networkConduit, networkInfo, networkMulticast
, networkProtocolXmpp, openssh, optparseApplicative, perl
, QuickCheck, random, regexTdfa, rsync, SafeSemaphore, SHA, stm
, tasty, tastyHunit, tastyQuickcheck, tastyRerun, text, time
, transformers, unixCompat, utf8String, uuid, wai, waiLogger, warp
, warpTls, which, xmlTypes, yesod, yesodCore, yesodDefault
, QuickCheck, random, regexTdfa, rsync, SafeSemaphore, securemem
, SHA, stm, tasty, tastyHunit, tastyQuickcheck, tastyRerun, text
, time, transformers, unixCompat, utf8String, uuid, wai, waiLogger
, warp, warpTls, which, xmlTypes, yesod, yesodCore, yesodDefault
, yesodForm, yesodStatic
}:
cabal.mkDerivation (self: {
pname = "git-annex";
version = "5.20140306";
sha256 = "1kjgqrz0wnccylrbdiwj1yndg7v2k09f5h2vkk06bnx02xmwvjl9";
version = "5.20140320";
sha256 = "0jhg5nbvdsiaprpj4h57fpfskhx0nqva4yx6krfd90i9gwgkm8l5";
isLibrary = false;
isExecutable = true;
buildDepends = [
aeson async blazeBuilder bloomfilter caseInsensitive clientsession
cryptoApi cryptohash dataDefault dataenc DAV dbus dlist dns
editDistance extensibleExceptions feed filepath gnutls hamlet
hinotify hS3 hslogger HTTP httpClient httpConduit httpTypes IfElse
json liftedBase MissingH MonadCatchIOTransformers monadControl mtl
network networkConduit networkInfo networkMulticast
networkProtocolXmpp optparseApplicative QuickCheck random regexTdfa
SafeSemaphore SHA stm tasty tastyHunit tastyQuickcheck tastyRerun
text time transformers unixCompat utf8String uuid wai waiLogger
warp warpTls xmlTypes yesod yesodCore yesodDefault yesodForm
yesodStatic
aeson async blazeBuilder bloomfilter byteable caseInsensitive
clientsession cryptoApi cryptohash dataDefault dataenc DAV dbus
dlist dns editDistance extensibleExceptions feed filepath gnutls
hamlet hinotify hS3 hslogger HTTP httpClient httpConduit httpTypes
IfElse json liftedBase MissingH MonadCatchIOTransformers
monadControl mtl network networkConduit networkInfo
networkMulticast networkProtocolXmpp optparseApplicative QuickCheck
random regexTdfa SafeSemaphore securemem SHA stm tasty tastyHunit
tastyQuickcheck tastyRerun text time transformers unixCompat
utf8String uuid wai waiLogger warp warpTls xmlTypes yesod yesodCore
yesodDefault yesodForm yesodStatic
];
buildTools = [ bup curl git gnupg1 lsof openssh perl rsync which ];
configureFlags = "-fS3

View File

@ -5,7 +5,7 @@
, libass, fftw, ffms
, ffmpeg, pkgconfig, zlib # Undocumented (?) dependencies
, spellChecking ? true, hunspell ? null
, automationSupport ? true, lua ? null
, automationSupport ? true, lua ? null
, openalSupport ? false, openal ? null
, alsaSupport ? true, alsaLib ? null
, pulseaudioSupport ? true, pulseaudio ? null
@ -39,11 +39,11 @@ stdenv.mkDerivation rec {
;
NIX_LDFLAGS = "-liconv -lavutil -lavformat -lavcodec -lswscale -lz -lm";
preConfigure = "cd aegisub";
preConfigure = "cd aegisub";
postInstall = "ln -s $out/bin/aegisub-3.0 $out/bin/aegisub";
meta = {
description = "An advanced subtitle editor";
longDescription = ''
@ -53,7 +53,12 @@ stdenv.mkDerivation rec {
built-in real-time video preview.
'';
homepage = http://www.aegisub.org/;
license = "BSD"; # The Aegisub sources are itself BSD/ISC, but they are linked against GPL'd softwares
license = stdenv.lib.licenses.bsd3;
# The Aegisub sources are itself BSD/ISC,
# but they are linked against GPL'd softwares
# - so the resulting program will be GPL
maintainers = [ stdenv.lib.maintainers.AndersonTorres ];
platforms = stdenv.lib.platforms.linux;
};
}

View File

@ -46,7 +46,7 @@ assert cacaSupport -> libcaca != null;
# but by purity reasons it should be avoided; thanks the-kenny to point it out!
# Now, it will just download and package Waf, mimetizing bootstrap.py behaviour
let
let
waf = fetchurl {
url = https://waf.googlecode.com/files/waf-1.7.13;
sha256 = "03cc750049350ee01cdbc584b70924e333fcc17ba4a2d04648dab1535538a873";
@ -109,7 +109,7 @@ stdenv.mkDerivation rec {
python3 ${waf} install
# Maybe not needed, but it doesn't hurt anyway: a standard font
mkdir -p $out/share/mpv
ln -s ${freefont_ttf}/share/fonts/truetype/FreeSans.ttf $out/share/mpv/subfont.ttf
ln -s ${freefont_ttf}/share/fonts/truetype/FreeSans.ttf $out/share/mpv/subfont.ttf
'';
meta = {
@ -118,7 +118,8 @@ stdenv.mkDerivation rec {
mpv is a free and open-source general-purpose video player, based on the MPlayer and mplayer2 projects, with great improvements above both.
'';
homepage = "http://mpv.io";
license = "GPLv2+";
license = stdenv.lib.licenses.gpl2Plus;
maintainers = [ stdenv.lib.maintainers.AndersonTorres ];
platforms = stdenv.lib.platforms.linux;
};
}

View File

@ -0,0 +1,26 @@
{ stdenv, fetchurl, alsaLib, ffmpeg, jackaudio, libX11, libXext
, libXfixes, mesa, pkgconfig, pulseaudio, qt4
}:
stdenv.mkDerivation rec {
name = "simplescreenrecorder-${version}";
version = "0.2.2";
src = fetchurl {
url = "https://github.com/MaartenBaert/ssr/archive/${version}.tar.gz";
sha256 = "0k1r1ilpk05qmwpnld95zxxk57qvyaq2r9f4i3la7y0xh9bz1gls";
};
buildInputs = [
alsaLib ffmpeg jackaudio libX11 libXext libXfixes mesa pkgconfig
pulseaudio qt4
];
meta = with stdenv.lib; {
description = "A screen recorder for Linux";
homepage = http://www.maartenbaert.be/simplescreenrecorder;
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = [ maintainers.goibhniu ];
};
}

View File

@ -33,6 +33,7 @@ stdenv.mkDerivation rec {
[ "--enable-alsa"
"--with-kde-solid=$out/share/apps/solid/actions"
"--enable-dc1394"
"--enable-ncurses"
];
preConfigure = ''sed -e "s@/bin/echo@echo@g" -i configure'';

View File

@ -13,12 +13,12 @@ stdenv.mkDerivation rec {
version = "1.20";
src = fetchurl {
url ="http://www.megalith.co.uk/8086tiny/downloads/8086tiny_120.tar.bz2";
url ="http://www.megalith.co.uk/8086tiny/downloads/8086tiny_120.tar.bz2";
sha256 = "0yapnr8wvlx7h1q1w98yfy2vsbf0rlp4wd99r3xb0b7l70b36mpw";
};
buildInputs = with stdenv.lib;
optionals localBios [ nasm ]
optionals localBios [ nasm ]
++ optionals sdlSupport [ SDL ];
builder = ./builder.sh;
@ -27,11 +27,14 @@ stdenv.mkDerivation rec {
description = "An open-source 8086 emulator";
longDescription = ''
8086tiny is a tiny, open source (MIT), portable (little-endian hosts) Intel PC emulator, powerful enough to run DOS, Windows 3.0, Excel, MS Flight Simulator, AutoCAD, Lotus 1-2-3, and similar applications. 8086tiny emulates a "late 80's era" PC XT-type machine.
8086tiny is based on an IOCCC 2013 winning entry. In fact that is the "unobfuscated" version :)
'';
homepage = http://www.megalith.co.uk/8086tiny/index.html;
license = "MIT";
license = stdenv.lib.licenses.mit;
maintainers = [ stdenv.lib.maintainers.AndersonTorres ];
platforms = stdenv.lib.platforms.linux;
};
}
# TODO: add support for a locally made BIOS

View File

@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
url = "http://downloads.sourceforge.net/project/bochs/bochs/${version}/${name}.tar.gz";
sha256 = "042blm1xb9ig4fh2bv8nrrfpgkcxy4hq8yrkx7mrdpm5g4mvfwyr";
};
buildInputs = with stdenv.lib;
[ libX11 mesa ]
++ optionals sdlSupport [ SDL ]
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
++ optionals curlSupport [ curl ];
configureFlags = ''
--with-x11
--with-x11
--with-term=${if termSupport then "yes" else "no"}
--with-sdl=${if sdlSupport then "yes" else "no"}
--with-svga=no
@ -42,11 +42,11 @@ stdenv.mkDerivation rec {
--enable-plugins=no
--enable-disasm
--enable-debugger
--enable-ne2000
--enable-e1000
--enable-sb16
--enable-voodoo
--enable-usb
--enable-ne2000
--enable-e1000
--enable-sb16
--enable-voodoo
--enable-usb
--enable-pnic
'';
@ -56,7 +56,8 @@ stdenv.mkDerivation rec {
Bochs is an open-source (LGPL), highly portable IA-32 PC emulator, written in C++, that runs on most popular platforms. It includes emulation of the Intel x86 CPU, common I/O devices, and a custom BIOS.
'';
homepage = http://bochs.sourceforge.net/;
license = "LGPL";
license = stdenv.lib.licenses.lgpl2Plus;
maintainers = [ stdenv.lib.maintainers.AndersonTorres ];
platforms = stdenv.lib.platforms.linux;
};
}

View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig
, libxml2, libXinerama, libXcursor, libXau, libXrandr
, imlib2, pango, libstartup_notification }:
, imlib2, pango, libstartup_notification, makeWrapper}:
stdenv.mkDerivation rec {
name = "openbox-3.5.2";
@ -9,6 +9,7 @@ stdenv.mkDerivation rec {
pkgconfig libxml2
libXinerama libXcursor libXau libXrandr
imlib2 pango libstartup_notification
makeWrapper
];
src = fetchurl {
@ -16,6 +17,14 @@ stdenv.mkDerivation rec {
sha256 = "0cxgb334zj6aszwiki9g10i56sm18i7w1kw52vdnwgzq27pv93qj";
};
# Openbox needs XDG_DATA_DIRS set or it can't find its default theme
postInstall = ''
wrapProgram "$out/bin/openbox" --prefix XDG_DATA_DIRS : "$out/share"
wrapProgram "$out/bin/openbox-session" --prefix XDG_DATA_DIRS : "$out/share"
wrapProgram "$out/bin/openbox-gnome-session" --prefix XDG_DATA_DIRS : "$out/share"
wrapProgram "$out/bin/openbox-kde-session" --prefix XDG_DATA_DIRS : "$out/share"
'';
meta = {
description = "X window manager for non-desktop embedded systems";
homepage = http://openbox.org/;

View File

@ -0,0 +1,9 @@
{ stdenv, php, autoreconfHook }:
args: stdenv.mkDerivation (args // {
buildInputs = [ php autoreconfHook ] ++ args.buildInputs or [];
makeFlags = [ "EXTENSION_DIR=$(out)/lib/php/extensions" ] ++ args.makeFlags or [];
autoreconfPhase = "phpize";
})

View File

@ -6,6 +6,8 @@ source $stdenv/setup
header "exporting $url (rev $rev) into $out"
$fetcher --builder --url "$url" --out "$out" --rev "$rev" ${leaveDotGit:+--leave-dotGit}
$fetcher --builder --url "$url" --out "$out" --rev "$rev" \
${leaveDotGit:+--leave-dotGit} \
${fetchSubmodules:+--fetch-submodules}
stopNest

View File

@ -1,5 +1,5 @@
{stdenv, git, cacert}:
{url, rev ? "HEAD", md5 ? "", sha256 ? "", leaveDotGit ? false }:
{url, rev ? "HEAD", md5 ? "", sha256 ? "", leaveDotGit ? false, fetchSubmodules ? true}:
/* NOTE:
fetchgit has one problem: git fetch only works for refs.
@ -35,7 +35,7 @@ stdenv.mkDerivation {
outputHashMode = "recursive";
outputHash = if sha256 == "" then md5 else sha256;
inherit url rev leaveDotGit;
inherit url rev leaveDotGit fetchSubmodules;
GIT_SSL_CAINFO = "${cacert}/etc/ca-bundle.crt";

View File

@ -6,6 +6,7 @@ expHash=
hashType=$NIX_HASH_ALGO
deepClone=$NIX_PREFETCH_GIT_DEEP_CLONE
leaveDotGit=$NIX_PREFETCH_GIT_LEAVE_DOT_GIT
fetchSubmodules=
builder=
if test -n "$deepClone"; then
@ -33,6 +34,7 @@ for arg; do
--deepClone) deepClone=true;;
--no-deepClone) deepClone=false;;
--leave-dotGit) leaveDotGit=true;;
--fetch-submodules) fetchSubmodules=true;;
--builder) builder=true;;
*)
argi=$(($argi + 1))
@ -66,6 +68,7 @@ Options:
--deepClone Clone submodules recursively.
--no-deepClone Do not clone submodules.
--leave-dotGit Keep the .git directories.
--fetch-submodules Fetch submodules.
--builder Clone as fetchgit does, but url, rev, and out option are mandatory.
"
exit 1
@ -178,7 +181,9 @@ clone(){
)
# Checkout linked sources.
init_submodules;
if test -n "$fetchSubmodules"; then
init_submodules;
fi
if [ -z "$builder" -a -f .topdeps ]; then
if tg help 2>&1 > /dev/null

View File

@ -33,6 +33,7 @@ rec {
# Shorthands for `writeTextFile'.
writeText = name: text: writeTextFile {inherit name text;};
writeTextDir = name: text: writeTextFile {inherit name text; destination = "/${name}";};
writeScript = name: text: writeTextFile {inherit name text; executable = true;};
writeScriptBin = name: text: writeTextFile {inherit name text; executable = true; destination = "/bin/${name}";};

View File

@ -0,0 +1,41 @@
{ stdenv, fetchurl, gmp }:
let version = "0.2.11"; in stdenv.mkDerivation {
name = "ats-anairiats-${version}";
src = fetchurl {
url = "mirror://sourceforge/ats-lang/ats-lang-anairiats-${version}.tgz";
sha256 = "0rqykyx5whichx85jr4l4c9fdan0qsdd4kwd7a81k3l07zbd9fc6";
};
# this is necessary because atxt files usually include some .hats files
patches = [ ./install-atsdoc-hats-files.patch ];
buildInputs = [ gmp ];
meta = {
description = "A statically typed programming language that unifies implementation with formal specification";
homepage = http://www.ats-lang.org/;
license = stdenv.lib.licenses.gpl3Plus;
longDescription =
''
ATS is a programming language with a highly expressive type system
rooted in the framework Applied Type System. In particular, both
dependent types and linear types are available in ATS. The current
implementation of ATS (ATS/Anairiats) is written in ATS itself. It can
be as efficient as C/C++ and supports a variety of programming
paradigms.
In addition, ATS contains a component ATS/LF that supports a form of
(interactive) theorem proving, where proofs are constructed as total
functions. With this component, ATS advocates a programming style that
combines programming with theorem proving. Furthermore, this component
may be used as a logical framework to encode various deduction systems
and their (meta-)properties.
This package contains the compiler atsopt, the frontend atscc,
and the lexer atslex.
'';
};
platforms = stdenv.lib.platforms.all;
}

View File

@ -0,0 +1,38 @@
--- ats-lang-anairiats-0.2.11/Makefile 2013-12-10 00:43:52.000000000 +0100
+++ ats-lang-anairiats-0.2.11/Makefile 2014-03-02 07:49:06.985837425 +0100
@@ -97,7 +97,7 @@
cd $(abs_top_srcdir)
[ -d $(bindir2) ] || $(MKDIR_P) $(bindir2)
$(MKDIR_P) $(ATSLIBHOME2)/bin
- find ccomp contrib doc libats libc prelude -type d \
+ find ccomp contrib doc libats libatsdoc libc prelude -type d \
-exec $(MKDIR_P) $(ATSLIBHOME2)/\{} \; \
-print
@@ -105,7 +105,7 @@
#
# recursively install all files in the list except .svn control files.
#
- for d in ccomp/runtime contrib doc libats libc prelude; do \
+ for d in ccomp/runtime contrib doc libats libatsdoc libc prelude; do \
cd $(abs_top_srcdir) && \
$(INSTALL) -d $(ATSLIBHOME2)/"$$d" && \
find "$$d" -name .svn -prune -o -type f \
@@ -143,6 +143,17 @@
$(INSTALL) -m 755 ats_env.sh $(bindir2)/"$$b" && \
echo [ats_env.sh] is installed into $(bindir2)/"$$b"; \
done
+#
+# install atsdoc headers
+#
+ for f in \
+ utils/atsdoc/SATS/*.sats utils/atsdoc/DATS/*.dats utils/atsdoc/HATS/*.hats; \
+ do \
+ [ -f "$$f" ] || continue; \
+ cd $(abs_top_srcdir) && \
+ $(INSTALL) -m 644 -D "$$f" $(ATSLIBHOME2)/"$$f" && \
+ echo "$$f"; \
+ done
install:: install_files

View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, gmp }:
let version = "0.0.5"; in stdenv.mkDerivation {
let version = "0.0.6"; in stdenv.mkDerivation {
name = "ats2-postiats-${version}";
src = fetchurl {
url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-${version}.tgz";
sha256 = "1rzcqc7fwqf0y4cc14lr282r25s66jygf6cxrnf5l8p5p550l0dl";
sha256 = "110a4drzf656j9s5yfvxj1cwgh5g9ysnh40cv8y9qfjjkki8vd5b";
};
buildInputs = [ gmp ];
@ -15,4 +15,6 @@ let version = "0.0.5"; in stdenv.mkDerivation {
homepage = http://www.ats-lang.org/;
license = stdenv.lib.licenses.gpl3Plus;
};
platforms = stdenv.lib.platforms.all;
}

View File

@ -1,21 +1,20 @@
{ cabal, blazeHtml, deepseq, Elm, filepath, happstackServer, HTTP
, mtl, parsec, transformers
{ cabal, cmdargs, Elm, filepath, mtl, snapCore, snapServer
, unorderedContainers
}:
cabal.mkDerivation (self: {
pname = "elm-server";
version = "0.10.1";
sha256 = "0rh01jm9h9zbslnzy6xg7bin76gdmypannh3ly40azplw9xmf2dn";
version = "0.11";
sha256 = "1977fa03n2m2apxhbzpcn6b5y5gf7ksnpigibi8djlpp76rliaz2";
isLibrary = false;
isExecutable = true;
buildDepends = [
blazeHtml deepseq Elm filepath happstackServer HTTP mtl parsec
transformers
cmdargs Elm filepath mtl snapCore snapServer unorderedContainers
];
jailbreak = true;
meta = {
homepage = "http://elm-lang.org";
description = "The Elm language server";
description = "Server for developing Elm projects";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};

View File

@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "Elm";
version = "0.11";
sha256 = "1rg1dbd2ag63in6069p6v88h1yx0snap2gdhz81lk9l66qns3f4s";
version = "0.12";
sha256 = "1gmhnpcfv49bdifvz70fif71947q482pd1dbs5c84m8sn7c5n3ss";
isLibrary = true;
isExecutable = true;
buildDepends = [

View File

@ -2,16 +2,19 @@
stdenv.mkDerivation rec {
name = "fsharp-${version}";
version = "3.0";
version = "3.1";
src = fetchgit {
url = "https://github.com/fsharp/fsharp";
rev = "refs/heads/fsharp_30";
sha256 = "59639c76ff401c9ddb1af7a2f5a53a5aef4ec0d62317aeb33429f3eb009f771f";
rev = "refs/heads/fsharp_31";
sha256 = "0d41ae31c57ec9ac8a4ea149b615ae085f3774b8877d8e53ddbf68856c32eda0";
};
buildInputs = [ mono pkgconfig autoconf automake which ];
configurePhase = "./autogen.sh --prefix $out";
configurePhase = ''
substituteInPlace ./autogen.sh "/usr/bin/env sh" "/bin/sh"
./autogen.sh --prefix $out
'';
# Make sure the executables use the right mono binary,
# and set up some symlinks for backwards compatibility.

View File

@ -21,6 +21,7 @@ stdenv.mkDerivation rec {
preConfigure = ''
echo "${buildMK}" > mk/build.mk
sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
'' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}"
'';

View File

@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
preConfigure = ''
echo "${buildMK}" > mk/build.mk
sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
'' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}"
'';

View File

@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
preConfigure = ''
echo "${buildMK}" > mk/build.mk
sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
'' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}"
'';

View File

@ -7,11 +7,11 @@ let
in
stdenv.mkDerivation {
name = "go-1.2";
name = "go-1.2.1";
src = fetchurl {
url = http://go.googlecode.com/files/go1.2.src.tar.gz;
sha1 = "7dd2408d40471aeb30a9e0b502c6717b5bf383a5";
url = http://go.googlecode.com/files/go1.2.1.src.tar.gz;
sha1 = "6a4b9991eddd8039438438d6aa25126ab7e07f2f";
};
buildInputs = [ bison glibc bash makeWrapper ];
@ -79,7 +79,7 @@ stdenv.mkDerivation {
homepage = http://golang.org/;
description = "The Go Programming language";
license = "BSD";
maintainers = with stdenv.lib.maintainers; [ pierron viric ];
maintainers = with stdenv.lib.maintainers; [ pierron viric wizeman ];
platforms = stdenv.lib.platforms.linux;
};
}

View File

@ -3,6 +3,7 @@
, db
, gdbm
, libX11, xproto
, lzma
, ncurses
, openssl
, readline
@ -20,7 +21,7 @@ let
version = "${majorVersion}.5";
buildInputs = filter (p: p != null) [
zlib bzip2 gdbm sqlite db readline ncurses openssl tcl tk libX11 xproto
zlib bzip2 lzma gdbm sqlite db readline ncurses openssl tcl tk libX11 xproto
];
in
stdenv.mkDerivation {

View File

@ -3,6 +3,7 @@
, db
, gdbm
, libX11, xproto
, lzma
, ncurses
, openssl
, readline
@ -21,7 +22,7 @@ let
fullVersion = "${version}";
buildInputs = filter (p: p != null) [
zlib bzip2 gdbm sqlite db readline ncurses openssl tcl tk libX11 xproto
zlib bzip2 lzma gdbm sqlite db readline ncurses openssl tcl tk libX11 xproto
];
in
stdenv.mkDerivation {

View File

@ -140,12 +140,21 @@ in {
};
};
pt = buildDict {
shortName = "pt-0.50-1";
pt_BR = buildDict {
shortName = "pt_BR-20090702";
fullName = "Brazilian Portuguese";
src = fetchurl {
url = mirror://gnu/aspell/dict/pt_BR/aspell6-pt_BR-20090702-0.tar.bz2;
sha256 = "1y09lx9zf2rnp55r16b2vgj953l3538z1vaqgflg9mdvm555bz3p";
};
};
pt_PT = buildDict {
shortName = "pt_PT-20070510";
fullName = "Portuguese";
src = fetchurl {
url = mirror://gnu/aspell/dict/pt/aspell-pt-0.50-1.tar.bz2;
sha256 = "07xzlnxxzadqsapng29p2gdwj0bijv10wpjnqlwzmkxnx6fxzkcy";
url = mirror://gnu/aspell/dict/pt_PT/aspell6-pt_PT-20070510-0.tar.bz2;
sha256 = "1mnr994cwlag6shy8865ky99lymysiln07mbldcncahg90dagdxq";
};
};

View File

@ -1,28 +1,32 @@
{stdenv, fetchurl }:
{ stdenv, fetchurl }:
stdenv.mkDerivation {
name = "fmod-42204";
src = if stdenv.system == "i686-linux" then
fetchurl {
url = http://www.fmod.org/index.php/release/version/fmodapi42204linux.tar.gz;
sha256 = "64eedc5b37c597eb925de446106d75cab0b5a79697d5ec048d34702812c08563";
} else if stdenv.system == "x86_64-linux" then
fetchurl {
url = http://www.fmod.org/index.php/release/version/fmodapi42204linux64.tar.gz;
sha256 = "3f2eec8265838a1005febe07c4971660e85010e4622911890642dc438746edf3";
} else throw "unsupported platform ${stdenv.system} (only i686-linux and x86_64 linux supported yet)";
assert (stdenv.system == "x86_64-linux") || (stdenv.system == "i686-linux");
let
bits = stdenv.lib.optionalString (stdenv.system == "x86_64-linux") "64";
in
stdenv.mkDerivation rec {
name = "fmod-${version}";
version = "4.44.32";
preInstall = ''
sed -e /ldconfig/d -i Makefile
sed -e s@/usr/local@$out@ -i Makefile
sed -e s@/include/fmodex@/include@ -i Makefile
mkdir -p $out/lib
mkdir -p $out/include
src = fetchurl {
url = "http://www.fmod.org/download/fmodex/api/Linux/fmodapi44432linux.tar.gz";
sha256 = "071m2snzz5vc5ca7dvsf6w31nrgk5k9xb6mp7yzqdj4bkjad2hyd";
};
buildPhase = "true";
installPhase = ''
mkdir -p $out/lib $out/include/fmodex
cd api/inc && cp * $out/include/fmodex && cd ../lib
cp libfmodex${bits}-${version}.so $out/lib/libfmodex.so
cp libfmodexL${bits}-${version}.so $out/lib/libfmodexL.so
'';
meta = {
homepage = http://www.fmod.org/;
description = "Programming library and toolkit for the creation and playback of interactive audio";
license = "unfree";
homepage = "http://www.fmod.org/";
license = stdenv.lib.licenses.unfreeRedistributable;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
};
}

View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "Glob";
version = "0.7.3";
sha256 = "0yl0wxbd03dv0hfr2aqwm9f3xnhjkdicymqv3nmhjjslqq3a59zd";
version = "0.7.4";
sha256 = "00f6xznqh27vbr8rggsrdphqsq1cvv931pa06b1grs7w01dcmw8s";
buildDepends = [ dlist filepath transformers ];
meta = {
homepage = "http://iki.fi/matti.niemenmaa/glob/";

View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "HaXml";
version = "1.24";
sha256 = "18kvavqa84k2121ppxngn39fjz4w63chngb3255w1fhdz13v3ydn";
version = "1.24.1";
sha256 = "1pvqgczksxasayvdb6d4g7ya7g7w1v9hsa35kaxm9bcic9y8q9az";
isLibrary = true;
isExecutable = true;
buildDepends = [ filepath polyparse random ];

View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "JuicyPixels";
version = "3.1.4.1";
sha256 = "12yq6wv0hs8kdckw1wgfssvnl8nvfanic8ciz8r2cjcwnlidh324";
version = "3.1.5";
sha256 = "1dcqqmj7skx17mwaf0sayqdknnz9w6q2y8z3c8ixmbjyg4jh6a66";
buildDepends = [
binary deepseq mtl primitive transformers vector zlib
];

View File

@ -0,0 +1,16 @@
{ cabal, random, testFramework, tfRandom }:
cabal.mkDerivation (self: {
pname = "QuickCheck";
version = "2.7.3";
sha256 = "196pz0b32m84ydwm4wk7m8512bmsxw7nsqpxbyfxsyi3ykq220yh";
buildDepends = [ random tfRandom ];
testDepends = [ testFramework ];
meta = {
homepage = "http://code.haskell.org/QuickCheck";
description = "Automatic testing of Haskell programs";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "adjunctions";
version = "4.0.2";
sha256 = "0c9168jmnfpzv3025n05b80b9p7jzkdzs0hzymjmh1qvz3iximq5";
version = "4.0.3";
sha256 = "0rh3vffbq407k9g95dingw6zqq3fk87pknyrqj1mrbmgrnllr8k0";
buildDepends = [
comonad contravariant distributive free mtl semigroupoids
semigroups tagged transformers void

View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "arithmoi";
version = "0.4.0.3";
sha256 = "0idn312xzly636h13zmm7cw7ki64bpnniqc97nshqzgp8if5ycrc";
version = "0.4.0.4";
sha256 = "1v8qn0gjvlds6ljm9sfzzi5w3gsf7x63z0r7hcs1rvn0n3acwz6y";
buildDepends = [ mtl random ];
meta = {
homepage = "https://bitbucket.org/dafis/arithmoi";

View File

@ -3,15 +3,15 @@
cabal.mkDerivation (self: {
pname = "base64-conduit";
version = "1.0.0";
sha256 = "10wjgdixk5da48jpm2i91vy3ckdqpbpgba6hzn7ak6d3qac22m9q";
version = "1.0.0.1";
sha256 = "07zhvn3fy60q04a5g5mzhkl17rap9jlh00vb4f6565bjha2k16g9";
buildDepends = [ base64Bytestring conduit ];
testDepends = [
base64Bytestring conduit hspec QuickCheck transformers
];
meta = {
homepage = "http://github.com/snoyberg/conduit";
description = "Base64-encode and decode streams of bytes";
description = "Base64-encode and decode streams of bytes. (deprecated)";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};

View File

@ -1,15 +0,0 @@
{ cabal, binary }:
cabal.mkDerivation (self: {
pname = "bmp";
version = "1.2.2.1";
sha256 = "0yxkkvpgavk9im9i9f6zpzc1n5nj2g4qsk4ck51aqz2fv6z1rhiy";
buildDepends = [ binary ];
meta = {
homepage = "http://code.ouroborus.net/bmp";
description = "Read and write uncompressed BMP image files";
license = self.stdenv.lib.licenses.mit;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

View File

@ -1,12 +1,19 @@
{ cabal, filepath, languageC }:
{ cabal, filepath, HUnit, languageC, shelly, testFramework
, testFrameworkHunit, text
}:
cabal.mkDerivation (self: {
pname = "c2hs";
version = "0.16.5";
sha256 = "19h4zppn7ry7p3f7qw1kgsrf6h2bjnknycfrj3ibxys82qpv8m8y";
version = "0.16.6";
sha256 = "1yf7mcslkf6m1nizifqva8j5sxnw87bg60dw8mfgpmqvrzpbxizm";
isLibrary = false;
isExecutable = true;
buildDepends = [ filepath languageC ];
testDepends = [
filepath HUnit shelly testFramework testFrameworkHunit text
];
jailbreak = true;
doCheck = false;
meta = {
homepage = "https://github.com/haskell/c2hs";
description = "C->Haskell FFI tool that gives some cross-language type safety";

View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "chunked-data";
version = "0.1.0.0";
sha256 = "1wdgvhf170rv557dwsiqy6nhys965xhs6w24ays273fv8hn3yk9l";
version = "0.1.0.1";
sha256 = "0kdq79mxi9nhy3dqw283f5ffx4rxwfrdq9cfw46ql5wmqrg2qw7r";
buildDepends = [
blazeBuilder monoTraversable semigroups systemFilepath text
transformers vector

View File

@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "classy-prelude";
version = "0.8.0.1";
sha256 = "0mj6zz53w6irs16w1pk65imhvnhp1rq3vq8s1n1xkf9gr13v3y9r";
version = "0.8.1.1";
sha256 = "14iq0zdmw4f2i3c282hs89c4a763wcm7vn5n0f6kcvcpjgjyahgi";
buildDepends = [
basicPrelude chunkedData enclosedExceptions hashable liftedBase
monoTraversable semigroups systemFilepath text time transformers

View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "comonad";
version = "4.0";
sha256 = "1f57wqxy1la59kippbj924prnj53a5hwc2ppg48n9xx2wfr63iha";
version = "4.0.1";
sha256 = "1ib3spgyjbdsnpbz4alaqb1m13v48l5dpv7s68c0mi2nyjkli7lx";
buildDepends = [
contravariant distributive mtl semigroups tagged transformers
];

View File

@ -1,19 +1,21 @@
{ cabal, basicPrelude, chunkedData, conduit, hspec, monoTraversable
{ cabal, base16Bytestring, base64Bytestring, basicPrelude
, chunkedData, conduit, hspec, monoTraversable, mwcRandom
, primitive, silently, systemFileio, systemFilepath, text
, transformers, transformersBase, vector
, transformers, transformersBase, unixCompat, vector, void
}:
cabal.mkDerivation (self: {
pname = "conduit-combinators";
version = "0.2.0.1";
sha256 = "0hmy398kk37n5l4pacb2a0z9h9f1kl6vva9gsph1kiqnnz7sbr4r";
version = "0.2.3";
sha256 = "05sb1v6rciaj7cj6lxv6pf9ai0k3q6cvvflcb4a7q6ql9xr3j7pr";
buildDepends = [
chunkedData conduit monoTraversable primitive systemFileio
systemFilepath text transformers transformersBase vector
base16Bytestring base64Bytestring chunkedData conduit
monoTraversable mwcRandom primitive systemFileio systemFilepath
text transformers transformersBase unixCompat vector void
];
testDepends = [
basicPrelude chunkedData hspec monoTraversable silently text
transformers vector
base16Bytestring base64Bytestring basicPrelude chunkedData hspec
monoTraversable mwcRandom silently text transformers vector
];
meta = {
homepage = "https://github.com/fpco/conduit-combinators";

View File

@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "conduit";
version = "1.0.15.1";
sha256 = "0pbrsa00x8qr856532iinw9lyliwh7gwzyd1pshdmj3gkbqpf2bv";
version = "1.0.17.1";
sha256 = "0s2cszwfmz7j249bdydh0d97r5br1p6nizw7ycbkxlmpcrmdvifk";
buildDepends = [
liftedBase mmorph monadControl mtl resourcet text textStreamDecode
transformers transformersBase void
@ -14,6 +14,7 @@ cabal.mkDerivation (self: {
testDepends = [
hspec mtl QuickCheck resourcet text transformers void
];
doCheck = false;
meta = {
homepage = "http://github.com/snoyberg/conduit";
description = "Streaming data processing library";

View File

@ -0,0 +1,14 @@
{ cabal, conduit, cryptohash, transformers }:
cabal.mkDerivation (self: {
pname = "cryptohash-conduit";
version = "0.1.0";
sha256 = "08x45dy5crxc63gd4psryrzprz7lc5hbzjl23q56c3iqbvrx2r7w";
buildDepends = [ conduit cryptohash transformers ];
meta = {
homepage = "http://github.com/vincenthz/hs-cryptohash-conduit";
description = "cryptohash conduit";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "css-text";
version = "0.1.2.0.1";
sha256 = "0j8d9kfs9j01gqlapaahyziphkx0f55g9bbz2wwix1si7954xxhp";
version = "0.1.2.1";
sha256 = "1xi1n2f0g8y43p95lynhcg50wxbq7hqfzbfzm7fy8mn7gvd920nw";
buildDepends = [ attoparsec text ];
testDepends = [ attoparsec hspec QuickCheck text ];
meta = {

View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "data-lens-template";
version = "2.1.7";
sha256 = "108xvk5glsw016vdvjb1p3a9zh7rgbkjv5xashs1hj25f8k4cw49";
version = "2.1.8";
sha256 = "0w8x5zn3d98z0q74bqfgkb9s0ca9hd1xc53gjl759s77wm4iwa0q";
buildDepends = [ dataLens ];
meta = {
homepage = "http://github.com/roconnor/data-lens-template/";

View File

@ -6,6 +6,7 @@ cabal.mkDerivation (self: {
sha256 = "13gajqbayar7x8sq3rw93i277gqd0bx1i34spshlj4b41fraxc8w";
isLibrary = true;
isExecutable = true;
jailbreak = true;
meta = {
homepage = "http://www.haskell.org/haskellwiki/Library/Data_encoding";
description = "Data encoding library";

View File

@ -12,11 +12,11 @@ cabal.mkDerivation (self: {
configurator fgl filepath HDBC HDBCPostgresql HDBCSqlite3 HUnit mtl
random text time yamlLight
];
jailbreak = true;
meta = {
description = "An implementation of relational database \"migrations\"";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.ocharles ];
};
jailbreak = true;
})

View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "derive";
version = "2.5.13";
sha256 = "0lmwj66s4krh29qqmkyc3cn3j4b4mhyqvlngvmy1xaigmgib5aci";
version = "2.5.14";
sha256 = "1fihcd8l4z8d6rad8h39pg5gdb75h895c2xld9574fwp3bm0zl0c";
isLibrary = true;
isExecutable = true;
buildDepends = [

View File

@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "diagrams-cairo";
version = "1.1";
sha256 = "0x66qdwni3pwc2lrqy5jnyz7nqbfpr1086g1ndy6cxx8hp632zaf";
version = "1.1.0.2";
sha256 = "0y36cx89rlbmj470a6g11wlzkwzznjkjmkcpm7dzbxvfxw4pp70z";
buildDepends = [
cairo colour dataDefaultClass diagramsCore diagramsLib filepath
hashable JuicyPixels lens mtl optparseApplicative split statestack

View File

@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "diagrams-contrib";
version = "1.1.1.1";
sha256 = "1b91scy96zf2njikfyr2ir2ckiib4dlvjazrlbri6f5ds40gnhna";
version = "1.1.1.2";
sha256 = "09dfnvriih4lkici34bj9nvww245hzl95crldblwyjwi2c8qcy69";
buildDepends = [
arithmoi circlePacking colour dataDefault dataDefaultClass
diagramsCore diagramsLib forceLayout lens MonadRandom mtl parsec

View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "diagrams-core";
version = "1.1";
sha256 = "0prklz6s5zcainpkawibdg3bidmvsd2xsc1xxrmfp7lscmim736v";
version = "1.1.0.1";
sha256 = "1jr827cd3qa631glwc9h247w0wnrx84gj2iwxj18b4y78d0ajz69";
buildDepends = [
dualTree lens MemoTrie monoidExtras newtype semigroups vectorSpace
vectorSpacePoints

View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "diagrams";
version = "1.1";
sha256 = "1fdacsa57w64hkcsrriwdgdxddd7gps97fyaz2rl8wfxcl96vclr";
version = "1.1.0.1";
sha256 = "0cxmrikcxgnrki9z8i33z7fbjpkx0vw849zj1cbq1zh8ry8xhhvg";
buildDepends = [
diagramsContrib diagramsCore diagramsLib diagramsSvg
];

View File

@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "diagrams-lib";
version = "1.1.0.1";
sha256 = "0zkxkncz8ayvahr57fgq44vgir3yghxs2y1rrp138951fcy2g3a7";
version = "1.1.0.3";
sha256 = "1g4kcmpqsnb25yqvd6yv026znp7s5jhnqg1nvfxcaq0zz84w9ckh";
buildDepends = [
active colour dataDefaultClass diagramsCore filepath fingertree
hashable intervals lens MemoTrie monoidExtras optparseApplicative

View File

@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "diagrams-postscript";
version = "1.0.2";
sha256 = "14y8wivgxs3qvybzqk1bfqsrs5457qd5br7nk1924si5gpsgp1xx";
version = "1.0.2.2";
sha256 = "00xzzx6dvraa8gbk3agqvrmxjnpvq4hik7kahidw4k37hxyyvwm3";
buildDepends = [
dataDefaultClass diagramsCore diagramsLib dlist filepath hashable
lens monoidExtras mtl semigroups split vectorSpace

View File

@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "diagrams-svg";
version = "1.0.2";
sha256 = "1pbkr5qg3cjk2c23aas5y9f0bk5nsding4r4c4fdkxj49ipi4ys1";
version = "1.0.2.1";
sha256 = "1qm4vk67knl4bpp84kwm95blshf7slarpl620m8irslsq3yag507";
buildDepends = [
blazeMarkup blazeSvg colour diagramsCore diagramsLib filepath
hashable lens monoidExtras mtl split time vectorSpace

View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "digestive-functors-aeson";
version = "1.1.5";
sha256 = "1mxi8zbv3hxy2crj6h6p1a885k8rd0fqhmwq7l7w7d7d73h8bmm3";
version = "1.1.6";
sha256 = "1zhw0zksl48q9y699phadf6ixsyll52clr3yyhqghki6l820xwci";
buildDepends = [ aeson digestiveFunctors lens safe text vector ];
testDepends = [
aeson digestiveFunctors HUnit mtl tasty tastyHunit text

View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "distributive";
version = "0.4";
sha256 = "11zln3h7pflv1f6jfma5b505p4wnr9xrs711mhh3a8xi20n4r318";
version = "0.4.1";
sha256 = "0izsgasml3didklkk6z274fzfd1c6qnn0wlzprcz0bnd07zkh814";
buildDepends = [ tagged transformers transformersCompat ];
testDepends = [ doctest filepath ];
meta = {

View File

@ -0,0 +1,14 @@
{ cabal, dlist, semigroups }:
cabal.mkDerivation (self: {
pname = "dlist-instances";
version = "0.1";
sha256 = "0r1j7djywqd7c224wc9ixkplj3m2mbf9k3ra7n92ja2kfpksm615";
buildDepends = [ dlist semigroups ];
meta = {
homepage = "https://github.com/gregwebs/dlist-instances";
description = "Difference lists instances";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

View File

@ -1,9 +1,10 @@
{ cabal, Cabal, QuickCheck }:
{ cabal, Cabal, deepseq, QuickCheck }:
cabal.mkDerivation (self: {
pname = "dlist";
version = "0.6.0.1";
sha256 = "08q8dsczh59a0ii3nqk6yqz70msd0pndjjcg9dzq8iyknbbqbi45";
version = "0.7.0.1";
sha256 = "197k608ja69xc531r7h3gmy1mf6dsk27b3mkpgp4zdw46z6lcb5l";
buildDepends = [ deepseq ];
testDepends = [ Cabal QuickCheck ];
meta = {
homepage = "https://github.com/spl/dlist";

View File

@ -1,17 +1,17 @@
{ cabal, deepseq, filepath, ghcPaths, hspec, HUnit, QuickCheck
, setenv, silently, stringbuilder, syb, transformers
{ cabal, baseCompat, deepseq, filepath, ghcPaths, hspec, HUnit
, QuickCheck, setenv, silently, stringbuilder, syb, transformers
}:
cabal.mkDerivation (self: {
pname = "doctest";
version = "0.9.10.2";
sha256 = "1vrhfbw59vfypylkr2ica2wx1vm62r40s4165syy76r8cyy0i554";
version = "0.9.11";
sha256 = "04y6y5hixqh8awl37wrss20c2drvx070w7wd6icfx7r0jqds97jr";
isLibrary = true;
isExecutable = true;
buildDepends = [ deepseq filepath ghcPaths syb transformers ];
testDepends = [
deepseq filepath ghcPaths hspec HUnit QuickCheck setenv silently
stringbuilder syb transformers
baseCompat deepseq filepath ghcPaths hspec HUnit QuickCheck setenv
silently stringbuilder syb transformers
];
doCheck = false;
noHaddock = self.stdenv.lib.versionOlder self.ghc.version "7.4";

View File

@ -2,8 +2,10 @@
cabal.mkDerivation (self: {
pname = "dsp";
version = "0.2.2";
sha256 = "0vb71z8iky3xl40b9d79z7krq960ykcgn3y8lks3wzgiabbh2d89";
version = "0.2.3";
sha256 = "1h7y3b2gwbkq97lv6f9a4zssyqs422g5zj2bi9mq1a5fzy5i4v4v";
isLibrary = true;
isExecutable = true;
buildDepends = [ random ];
meta = {
homepage = "http://www.haskell.org/haskellwiki/DSP";

View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "errors";
version = "1.4.5";
sha256 = "16m4psk1150319bd2hrswpp2h90l1hhh7w13arfhy4ylh8vscm4q";
version = "1.4.6";
sha256 = "1h8va76rhvs76ljdccxbmb659qk1slzkal118m85bw6lpy5wv6fi";
buildDepends = [ either safe transformers ];
jailbreak = true;
meta = {

View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "exceptions";
version = "0.3.3";
sha256 = "1gng8zvsljm6xrb5gy501f1dl47z171wkic8bsivhn4rgp9lby9l";
version = "0.3.3.1";
sha256 = "091frx3hmx7lq10z7f8q98pz0sa1lj23i7z4z98gh1980r525fah";
buildDepends = [ mtl transformers ];
testDepends = [
mtl QuickCheck testFramework testFrameworkQuickcheck2 transformers
@ -13,7 +13,7 @@ cabal.mkDerivation (self: {
meta = {
homepage = "http://github.com/ekmett/exceptions/";
description = "Extensible optionally-pure exceptions";
license = "unknown";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.ocharles ];
};

View File

@ -8,8 +8,8 @@
cabal.mkDerivation (self: {
pname = "fay";
version = "0.19.1";
sha256 = "05h4jmwy1wzgps1an1df5b4gic91xlm884mv6nqnazvpbnn23d5b";
version = "0.19.1.1";
sha256 = "1jjv7l4x1bxr4whhcn4vh4b3ac4wfnb6l322jmdj60nh9sj8dzpf";
isLibrary = true;
isExecutable = true;
buildDepends = [

View File

@ -1,9 +1,10 @@
{ cabal }:
{ cabal, QuickCheck, random }:
cabal.mkDerivation (self: {
pname = "filepath";
version = "1.3.0.1";
sha256 = "1ny8dz8rv883vg6hkzg3zank771cr2z9sfhii7aw4rfb71k29g5p";
version = "1.3.0.2";
sha256 = "0wvvz6cs5fh4f04a87b9s7xrnzypmnzzkn149p6xk8xi7gcvcpy2";
testDepends = [ QuickCheck random ];
meta = {
homepage = "http://www-users.cs.york.ac.uk/~ndm/filepath/";
description = "Library for manipulating FilePaths in a cross platform way";

View File

@ -8,7 +8,7 @@ cabal.mkDerivation (self: {
sha256 = "1la30bimcjngcv5dyx1a9x8lr8c4zs0dp4kzh8y5mjf8snky1avf";
buildDepends = [ Diff filepath parsec split time utf8String xml ];
testDepends = [ Diff filepath HUnit mtl time ];
doCheck = false;
jailbreak = true;
meta = {
description = "Interface for versioning file stores";
license = self.stdenv.lib.licenses.bsd3;

View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "filesystem-conduit";
version = "1.0.0.1";
sha256 = "04l8i97mr0jzkc7vc77j885n45qd2qyn5kmzxyckp3za96sjsqqw";
version = "1.0.0.2";
sha256 = "05dsl3bgyjciq6sgmba0hki7imilrjq3ddp9ip5gxl9884j1f4a1";
buildDepends = [
conduit systemFileio systemFilepath text transformers
];
@ -14,7 +14,7 @@ cabal.mkDerivation (self: {
];
meta = {
homepage = "http://github.com/snoyberg/conduit";
description = "Use system-filepath data types with conduits";
description = "Use system-filepath data types with conduits. (deprecated)";
license = self.stdenv.lib.licenses.mit;
platforms = self.ghc.meta.platforms;
};

View File

@ -1,10 +1,10 @@
{ cabal, primitive, text, vector }:
{ cabal, primitive, text, transformers, vector }:
cabal.mkDerivation (self: {
pname = "foldl";
version = "1.0.2";
sha256 = "11cqmw102m2bskaknl8qr7hwyn94hfv2ind5fgvjw4hwgllr8v84";
buildDepends = [ primitive text vector ];
version = "1.0.3";
sha256 = "0jl50bh7k8wp0nz0s0sb2zwh92yrgsm2l6szib41g7zq34mwamn9";
buildDepends = [ primitive text transformers vector ];
meta = {
description = "Composable, streaming, and efficient left folds";
license = self.stdenv.lib.licenses.bsd3;

View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "force-layout";
version = "0.3.0.2";
sha256 = "0zrvsrqwl0wjv38l6zl1pa09572njdbcfbvimhpp930629zk4yb7";
version = "0.3.0.3";
sha256 = "0xix9syfiya5wx0iwzs7sp3ksqyp15vjlpir71x8md8v0hkrnh5a";
buildDepends = [
dataDefaultClass lens vectorSpace vectorSpacePoints
];

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