diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix index a60ecdcb866f4203afa2caa17a970623be51529c..8a330800b9e1110d956efbd376ce4c07b275ce1b 100644 --- a/pkgs/applications/audio/amarok/default.nix +++ b/pkgs/applications/audio/amarok/default.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { libxml2 mysql taglib taglib_extras loudmouth kdelibs automoc4 phonon strigi soprano qca2 libmtp liblastfm libgpod pkgconfig qjson ffmpeg libofa ]; + cmakeFlags = "-DKDE4_BUILD_TESTS=OFF"; + postInstall = '' mkdir -p $out/nix-support echo ${qtscriptgenerator} > $out/nix-support/propagated-user-env-packages diff --git a/pkgs/applications/audio/monkeys-audio/buildfix.diff b/pkgs/applications/audio/monkeys-audio/buildfix.diff new file mode 100644 index 0000000000000000000000000000000000000000..3c48f6ad828f02c2c9a2a2ac558d725144862261 --- /dev/null +++ b/pkgs/applications/audio/monkeys-audio/buildfix.diff @@ -0,0 +1,27 @@ +diff -ru monkeys-audio-3.99-u4-b5/src/MACLib/APELink.cpp monkeys-audio-3.99-u4-b5.patched/src/MACLib/APELink.cpp +--- monkeys-audio-3.99-u4-b5/src/MACLib/APELink.cpp 2006-06-01 11:00:57.000000000 +0200 ++++ monkeys-audio-3.99-u4-b5.patched/src/MACLib/APELink.cpp 2012-01-05 14:51:47.000000000 +0100 +@@ -63,10 +63,10 @@ + if (pData != NULL) + { + // parse out the information +- char * pHeader = strstr(pData, APE_LINK_HEADER); +- char * pImageFile = strstr(pData, APE_LINK_IMAGE_FILE_TAG); +- char * pStartBlock = strstr(pData, APE_LINK_START_BLOCK_TAG); +- char * pFinishBlock = strstr(pData, APE_LINK_FINISH_BLOCK_TAG); ++ const char * pHeader = strstr(pData, APE_LINK_HEADER); ++ const char * pImageFile = strstr(pData, APE_LINK_IMAGE_FILE_TAG); ++ const char * pStartBlock = strstr(pData, APE_LINK_START_BLOCK_TAG); ++ const char * pFinishBlock = strstr(pData, APE_LINK_FINISH_BLOCK_TAG); + + if (pHeader && pImageFile && pStartBlock && pFinishBlock) + { +@@ -81,7 +81,7 @@ + + // get the path + char cImageFile[MAX_PATH + 1]; int nIndex = 0; +- char * pImageCharacter = &pImageFile[strlen(APE_LINK_IMAGE_FILE_TAG)]; ++ const char * pImageCharacter = &pImageFile[strlen(APE_LINK_IMAGE_FILE_TAG)]; + while ((*pImageCharacter != 0) && (*pImageCharacter != '\r') && (*pImageCharacter != '\n')) + cImageFile[nIndex++] = *pImageCharacter++; + cImageFile[nIndex] = 0; diff --git a/pkgs/applications/audio/monkeys-audio/default.nix b/pkgs/applications/audio/monkeys-audio/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..48b0b52c5ea7db8465ecb444b7a28685968f3e59 --- /dev/null +++ b/pkgs/applications/audio/monkeys-audio/default.nix @@ -0,0 +1,14 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation rec { + version = "3.99-u4-b5"; + pname = "monkeys-audio"; + name = pname + "-" + version; + + patches = [ ./buildfix.diff ]; + + src = fetchurl { + url = "http://deb-multimedia.org/pool/main/m/${pname}/${pname}_${version}.orig.tar.gz"; + sha256 = "0kjfwzfxfx7f958b2b1kf8yj655lp0ppmn0sh57gbkjvj8lml7nz"; + }; +} diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..8b99988f07b4a58ed45b06a9077bc555f7911709 --- /dev/null +++ b/pkgs/applications/audio/qmmp/default.nix @@ -0,0 +1,59 @@ +{ stdenv, fetchurl, cmake, qt4, pkgconfig, x11 +# transports +, curl, libmms +# input plugins +, libmad, taglib, libvorbis, libogg, flac, libmpcdec, libmodplug, libsndfile +, libcdio, cdparanoia, libcddb, faad2, ffmpeg, wildmidi +# output plugins +, alsaLib, pulseaudio +# effect plugins +, libsamplerate +}: + +# Additional plugins that can be added: +# wavpack (http://www.wavpack.com/) +# gme (Game music support) +# Ogg Opus support +# BS2B effect plugin (http://bs2b.sourceforge.net/) +# JACK audio support +# ProjectM visualization plugin + +# To make MIDI work we must tell Qmmp what instrument configuration to use (and +# this can unfortunately not be set at configure time): +# Go to settings (ctrl-p), navigate to the WildMidi plugin and click on +# Preferences. In the instrument configuration field, type the path to +# /nix/store/*wildmidi*/etc/wildmidi.cfg (or your own custom cfg file). + +# Qmmp installs working .desktop file(s) all by itself, so we don't need to +# handle that. + +stdenv.mkDerivation rec { + name = "qmmp-0.7.0"; + + src = fetchurl { + url = "http://qmmp.ylsoftware.com/files/${name}.tar.bz2"; + sha256 = "0g8qcs82y3dy06lsgam2w6gh2ccx0frlw9fp4xg947vi3a16g6ig"; + }; + + buildInputs = + [ # basic requirements + cmake qt4 pkgconfig x11 + # transports + curl libmms + # input plugins + libmad taglib libvorbis libogg flac libmpcdec libmodplug libsndfile + libcdio cdparanoia libcddb faad2 ffmpeg wildmidi + # output plugins + alsaLib pulseaudio + # effect plugins + libsamplerate + ]; + + meta = with stdenv.lib; { + description = "Qt-based audio player that looks like Winamp"; + homepage = http://qmmp.ylsoftware.com/; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [maintainers.bjornfor]; + }; +} diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index 3be08f4496c8fc007168dd8c2b9a9b9999c5590d..a11cbf349c023e61494536260034a36c51c47aeb 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -86,12 +86,12 @@ in { src = if stdenv.system == "x86_64-linux" then fetchurl { - url = http://ftp.ing.umu.se/mirror/eclipse/eclipse/downloads/drops/R-3.6.2-201102101200/eclipse-SDK-3.6.2-linux-gtk-x86_64.tar.gz; + url = http://archive.eclipse.org/eclipse/downloads/drops/R-3.6.2-201102101200/eclipse-SDK-3.6.2-linux-gtk-x86_64.tar.gz; sha256 = "0dfcfadcd6337c897fbfd5b292de481931dfce12d43289ecb93691fd27dd47f4"; } else fetchurl { - url = http://ftp.ing.umu.se/mirror/eclipse/eclipse/downloads/drops/R-3.6.2-201102101200/eclipse-SDK-3.6.2-linux-gtk.tar.gz; + url = http://archive.eclipse.org/eclipse/downloads/drops/R-3.6.2-201102101200/eclipse-SDK-3.6.2-linux-gtk.tar.gz; sha256 = "1bh8ykliqr8wbciv13vpiy50rvm7yszk7y8dslr796dbwhi5b1cj"; }; }; @@ -102,12 +102,12 @@ in { src = if stdenv.system == "x86_64-linux" then fetchurl { - url = http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/technology/epp/downloads/release/helios/SR2/eclipse-cpp-helios-SR2-linux-gtk-x86_64.tar.gz; + url = http://eclipse.ialto.com/technology/epp/downloads/release/helios/SR2/eclipse-cpp-helios-SR2-linux-gtk-x86_64.tar.gz; sha1 = "6f914e11fa15a900c46825e4aa8299afd76e7e65"; } else fetchurl { - url = http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/technology/epp/downloads/release/helios/SR2/eclipse-cpp-helios-SR2-linux-gtk.tar.gz; + url = http://eclipse.ialto.com/technology/epp/downloads/release/helios/SR2/eclipse-cpp-helios-SR2-linux-gtk.tar.gz; sha1 = "1156e4bc0253ae3a3a4e54839e4944dc64d3108f"; }; }; @@ -134,12 +134,12 @@ in { src = if stdenv.system == "x86_64-linux" then fetchurl { - url = http://eclipse.ialto.com/eclipse/downloads/drops/R-3.7-201106131736/eclipse-SDK-3.7-linux-gtk-x86_64.tar.gz; + url = http://archive.eclipse.org/eclipse/downloads/drops/R-3.7-201106131736/eclipse-SDK-3.7-linux-gtk-x86_64.tar.gz; sha256 = "00ig3ww98r8imf32sx5npm6csn5nx288gvdk6w653nijni0di16j"; } else fetchurl { - url = http://eclipse.ialto.com/eclipse/downloads/drops/R-3.7-201106131736/eclipse-SDK-3.7-linux-gtk.tar.gz; + url = http://archive.eclipse.org/eclipse/downloads/drops/R-3.7-201106131736/eclipse-SDK-3.7-linux-gtk.tar.gz; sha256 = "08rgw85cam51l98mzb39fdc3ykb369v8pap93qhknbs6a3f5dnff"; }; }; @@ -182,12 +182,12 @@ in { src = if stdenv.system == "x86_64-linux" then fetchurl { - url = http://eclipse.ialto.com/eclipse/downloads/drops4/R-4.2.1-201209141800/eclipse-SDK-4.2.1-linux-gtk-x86_64.tar.gz; + url = http://archive.eclipse.org/eclipse/downloads/drops4/R-4.2.1-201209141800/eclipse-SDK-4.2.1-linux-gtk-x86_64.tar.gz; sha256 = "1mlyy90lk08lb2971ynglgi3nqvqfq1k70md2kb39jk160wd1xrk"; } else fetchurl { - url = http://eclipse.ialto.com/eclipse/downloads/drops4/R-4.2.1-201209141800/eclipse-SDK-4.2.1-linux-gtk.tar.gz; + url = http://archive.eclipse.org/eclipse/downloads/drops4/R-4.2.1-201209141800/eclipse-SDK-4.2.1-linux-gtk.tar.gz; sha256 = "1av6qm9wkbyk123qqf38f0jq4jv2bj9wp6fmpnl55zg6qr463c1w"; }; }; diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix index 6d43cc279975083dcf28a8a646de5cd0bb1d73ff..289cf7ff8d63bf8553ed19238dbc0d962fa2ea1d 100644 --- a/pkgs/applications/editors/geany/default.nix +++ b/pkgs/applications/editors/geany/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, gtk2, which, pkgconfig, intltool }: let - version = "1.23"; + version = "1.22"; in stdenv.mkDerivation rec { name = "geany-${version}"; src = fetchurl { - url = "http://download.geany.org/${name}.tar.bz2"; - sha256 = "1c78rggjaz9fa8gj25wka1sa3argvixnzrarmqvwh0s8d5ragm6d"; + url = "http://download.geany.org/${name}.tar.gz"; + md5 = "1cb7f6cea8e301c416211786cec474fa"; }; buildInputs = [ gtk2 which pkgconfig intltool ]; diff --git a/pkgs/applications/editors/leksah/default.nix b/pkgs/applications/editors/leksah/default.nix index 5c17a6c1815558907fed5997f48dd83b0f2c5a72..86f0106ed050412fd4df9a2ea9a0d5544d329a28 100644 --- a/pkgs/applications/editors/leksah/default.nix +++ b/pkgs/applications/editors/leksah/default.nix @@ -23,9 +23,6 @@ cabal.mkDerivation (self: { description = "Haskell IDE written in Haskell"; license = "GPL"; platforms = self.stdenv.lib.platforms.linux; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/applications/graphics/k3d/default.nix b/pkgs/applications/graphics/k3d/default.nix index 8920d243dbf0b793dab04d622b08c8bd934d4b1f..058d0f79a2f41f0bcb26ec2f5609084b4a2c7619 100644 --- a/pkgs/applications/graphics/k3d/default.nix +++ b/pkgs/applications/graphics/k3d/default.nix @@ -20,7 +20,6 @@ stdenv.mkDerivation rec { preConfigure = '' export LD_LIBRARY_PATH="$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/build/lib" - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo ${gtkglext}/include/gtkglext-*) -I$(echo ${gtkglext}/lib/gtkglext-*/include)" ''; buildInputs = [ diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix index 64cbdb0ca9a01a03a6d3a57a5037f95e602e5308..cf4e7e635d09f5f692041d74a98f4819dcbe2333 100644 --- a/pkgs/applications/graphics/openscad/default.nix +++ b/pkgs/applications/graphics/openscad/default.nix @@ -38,6 +38,6 @@ stdenv.mkDerivation rec { platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; - [raskin]; + [raskin bjornfor]; }; } diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix index 2491b93bbc2052d5c8eb0cbeb72ab75c999ad677..b647c07368ef221de23c2d510e53f897c0650f01 100644 --- a/pkgs/applications/graphics/paraview/default.nix +++ b/pkgs/applications/graphics/paraview/default.nix @@ -7,19 +7,18 @@ }: stdenv.mkDerivation rec { - name = "paraview-3.14.0"; + name = "paraview-3.98.1"; src = fetchurl { - url = "http://www.paraview.org/files/v3.14/ParaView-3.14.0-Source.tar.gz"; - sha256 = "168v8zk64pxcd392kb4zqnkbw540d52bx6fs35aqz88i5jc0x9xv"; + url = "http://paraview.org/files/v3.98/ParaView-3.98.1-source.tar.gz"; + sha256 = "0i7q3jc4lc40l1zw3fdzv108rpxxfmg3dmmq855fpqyp2g2w9nxp"; }; # [ 5%] Generating vtkGLSLShaderLibrary.h # ../../../bin/ProcessShader: error while loading shared libraries: libvtksys.so.pv3.10: cannot open shared object file: No such file or directory preConfigure = '' - export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/paraview-3.10 -rpath ../../../bin -rpath ../../bin" + export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/paraview-3.98 -rpath ../../../../../../lib -rpath ../../../../../lib -rpath ../../../../lib -rpath ../../../lib -rpath ../../lib -rpath ../lib" ''; cmakeFlags = [ -# "-DPARAVIEW_USE_MPI:BOOL=ON" "-DPARAVIEW_USE_SYSTEM_HDF5:BOOL=ON" "-DVTK_USE_SYSTEM_LIBXML2:BOOL=ON" "-DPARAVIEW_ENABLE_PYTHON:BOOL=ON" @@ -28,8 +27,6 @@ stdenv.mkDerivation rec { "-DCMAKE_SKIP_BUILD_RPATH=ON" "-DVTK_USE_RPATH:BOOL=ON" "-DPARAVIEW_INSTALL_DEVELOPMENT=ON" -# "-DPYTHON_INCLUDE_DIR=${python}/include" -# "-DPYTHON_LIBRARY=" ]; enableParallelBuilding = true; @@ -40,7 +37,7 @@ stdenv.mkDerivation rec { homepage = "http://www.paraview.org/"; description = "3D Data analysis and visualization application"; license = "free"; - maintainers = with stdenv.lib.maintainers; [viric]; + maintainers = with stdenv.lib.maintainers; [viric guibert]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix index 34ad7821c8760bbdcc979183e61c2308c794ffdf..bf7e2d3042022e4b48a275583136e4f3a2ffeef0 100644 --- a/pkgs/applications/graphics/rawtherapee/default.nix +++ b/pkgs/applications/graphics/rawtherapee/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gtk, cmake, pixman, libpthreadstubs, gtkmm, libXau -, libXdmcp, lcms2, libiptcdata, libcanberra, fftw, expat +, libXdmcp, lcms2, libiptcdata, libcanberra, fftw , mercurial # Not really needed for anything, but it fails if it does not find 'hg' }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ pkgconfig gtk cmake pixman libpthreadstubs gtkmm libXau libXdmcp - lcms2 libiptcdata mercurial libcanberra fftw expat ]; + lcms2 libiptcdata mercurial libcanberra fftw ]; # Disable the use of the RAWZOR propietary libraries cmakeFlags = [ "-DWITH_RAWZOR=OFF" ]; diff --git a/pkgs/applications/misc/arbtt/default.nix b/pkgs/applications/misc/arbtt/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..92b8cb4f295c6f859578f523d746a93414d2dc06 --- /dev/null +++ b/pkgs/applications/misc/arbtt/default.nix @@ -0,0 +1,23 @@ +{ cabal, binary, bytestringProgress, deepseq, filepath +, libXScrnSaver, parsec, pcreLight, strict, terminalProgressBar +, time, transformers, utf8String, X11 +}: + +cabal.mkDerivation (self: { + pname = "arbtt"; + version = "0.7"; + sha256 = "05q31fsyrbkcx0mlf2r91zgmpma5sl2a7100h7qsa882sijc2ybn"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + binary bytestringProgress deepseq filepath parsec pcreLight strict + terminalProgressBar time transformers utf8String X11 + ]; + extraLibraries = [ libXScrnSaver ]; + meta = { + homepage = "http://www.joachim-breitner.de/projects#arbtt"; + description = "Automatic Rule-Based Time Tracker"; + license = "GPL"; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 1ed51a81f5cc5f34b62f403ab7c0e9b2826ca856..0951340ee94526dcaf3e36f9eb4e5a0246622f5a 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "blender-2.66a"; + name = "blender-2.67"; src = fetchurl { url = "http://download.blender.org/source/${name}.tar.gz"; - sha256 = "0wj8x9xk5irvsjc3rm7wzml1j47xcdpdpy84kidafk02biskcqcb"; + sha256 = "066lwrm85455gs187bxr3jhqidc2f6f0791b4216jkagbszd9a8l"; }; buildInputs = [ diff --git a/pkgs/applications/misc/blender/fix-include.patch b/pkgs/applications/misc/blender/fix-include.patch deleted file mode 100644 index 44e2147d073c2d7001d83918c4bc30deb5478ce8..0000000000000000000000000000000000000000 --- a/pkgs/applications/misc/blender/fix-include.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/intern/smoke/intern/WAVELET_NOISE.h b/intern/smoke/intern/WAVELET_NOISE.h -index fce901b..1f73c5e 100644 ---- a/intern/smoke/intern/WAVELET_NOISE.h -+++ b/intern/smoke/intern/WAVELET_NOISE.h -@@ -43,6 +43,7 @@ - #ifndef WAVELET_NOISE_H - #define WAVELET_NOISE_H - -+#include - #include - - #ifdef WIN32 diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 23b5092cd4d8832f29f44284db097998acb6eadb..562a9dd52ad4d7ab48cfa92625997ac9ec9dcbad 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -1,15 +1,17 @@ { stdenv, fetchurl, python, pyqt4, sip, popplerQt4, pkgconfig, libpng , imagemagick, libjpeg, fontconfig, podofo, qt4, icu, sqlite -, pil, makeWrapper, unrar, chmlib, pythonPackages, xz, udisks, libusb1, libmtp +, pil, makeWrapper, unrar, chmlib, pythonPackages, xz }: stdenv.mkDerivation rec { - name = "calibre-0.8.70"; - # 0.9.* versions won't build: https://bugs.launchpad.net/calibre/+bug/1094719 + name = "calibre-0.8.51"; src = fetchurl { - url = "mirror://sourceforge/calibre/${name}.tar.xz"; - sha256 = "12avwp8r6cnrw6c32gmd2hksa9rszdb76zs6fcmr3n8r1wkwa71g"; + urls = [ + "http://calibre-ebook.googlecode.com/files/${name}.tar.xz" + "mirror://sourceforge/calibre/${name}.tar.xz" + ]; + sha256 = "1grcc0k9qpfpwp863x52rl9wj4wz61hcz67l8h2jmli0wxiq44z1"; }; inherit python; @@ -21,7 +23,7 @@ stdenv.mkDerivation rec { fontconfig podofo qt4 pil chmlib icu pythonPackages.mechanize pythonPackages.lxml pythonPackages.dateutil pythonPackages.cssutils pythonPackages.beautifulsoup - pythonPackages.sqlite3 sqlite udisks libusb1 libmtp + pythonPackages.sqlite3 sqlite ]; installPhase = '' diff --git a/pkgs/applications/misc/djvulibre/default.nix b/pkgs/applications/misc/djvulibre/default.nix index 4a51ec2d1acd65c4106d5603b246f76051c8bceb..e22dce72b6289bc47b0fc84bafb78e2452a05d8c 100644 --- a/pkgs/applications/misc/djvulibre/default.nix +++ b/pkgs/applications/misc/djvulibre/default.nix @@ -1,14 +1,16 @@ -{ stdenv, fetchurl, libjpeg, libtiff, librsvg }: +{ stdenv, fetchurl, libjpeg, libtiff, libpng, ghostscript, libungif, zlib }: stdenv.mkDerivation rec { - name = "djvulibre-3.5.25.3"; + name = "djvulibre-3.5.24"; src = fetchurl { url = "mirror://sourceforge/djvu/${name}.tar.gz"; - sha256 = "1q5i5ha4zmj2ahjfhi8cv1rah80vm43m9ads46ji38rgvpb7x3c9"; + sha256 = "0d1592cmc7scg2jzah47mnvbqldhxb1x9vxm7y64a3iasa0lqwy0"; }; - buildInputs = [ libjpeg libtiff librsvg ]; + buildInputs = [ libjpeg libtiff libpng ghostscript zlib libungif ]; + + patches = [ ./gcc-4.6.patch ]; meta = { description = "A library and viewer for the DJVU file format for scanned images"; diff --git a/pkgs/applications/misc/djvulibre/gcc-4.6.patch b/pkgs/applications/misc/djvulibre/gcc-4.6.patch new file mode 100644 index 0000000000000000000000000000000000000000..48fbc2bc7acac8a761a157c33084d4dc04d7c2d0 --- /dev/null +++ b/pkgs/applications/misc/djvulibre/gcc-4.6.patch @@ -0,0 +1,658 @@ +commit 3341545edba359b292a8ef6db1b7d342caf3dcf1 +Author: Leon Bottou +Date: Wed May 4 21:25:35 2011 -0700 + + Added include for gcc-4.6 + +diff --git a/libdjvu/BSByteStream.cpp b/libdjvu/BSByteStream.cpp +index b762ccf..d662ab0 100644 +--- a/libdjvu/BSByteStream.cpp ++++ b/libdjvu/BSByteStream.cpp +@@ -62,6 +62,7 @@ + + // - Author: Leon Bottou, 07/1998 + ++#include + #include + #include + #include +diff --git a/libdjvu/BSEncodeByteStream.cpp b/libdjvu/BSEncodeByteStream.cpp +index 5d80e51..68bc3e3 100644 +--- a/libdjvu/BSEncodeByteStream.cpp ++++ b/libdjvu/BSEncodeByteStream.cpp +@@ -71,6 +71,7 @@ + #include "GOS.h" + #endif + ++#include + #include + #include + #include +diff --git a/libdjvu/ByteStream.cpp b/libdjvu/ByteStream.cpp +index 158c33c..be01847 100644 +--- a/libdjvu/ByteStream.cpp ++++ b/libdjvu/ByteStream.cpp +@@ -73,6 +73,7 @@ + #include "GOS.h" + #include "GURL.h" + #include "DjVuMessage.h" ++#include + #include + #if defined(WIN32) || defined(__CYGWIN32__) + # include +diff --git a/libdjvu/DjVuFileCache.cpp b/libdjvu/DjVuFileCache.cpp +index 6b1e85d..7d7a192 100644 +--- a/libdjvu/DjVuFileCache.cpp ++++ b/libdjvu/DjVuFileCache.cpp +@@ -63,6 +63,7 @@ + #include "DjVuFileCache.h" + #include "debug.h" + ++#include + #include + + +diff --git a/libdjvu/DjVuGlobal.cpp b/libdjvu/DjVuGlobal.cpp +index e6d3cec..df9278e 100644 +--- a/libdjvu/DjVuGlobal.cpp ++++ b/libdjvu/DjVuGlobal.cpp +@@ -76,6 +76,8 @@ + #include "GThreads.h" + #include "GException.h" + #include "GContainer.h" ++ ++#include + #include + #include + #include +diff --git a/libdjvu/DjVuGlobalMemory.cpp b/libdjvu/DjVuGlobalMemory.cpp +index 3c6012c..c8ba309 100644 +--- a/libdjvu/DjVuGlobalMemory.cpp ++++ b/libdjvu/DjVuGlobalMemory.cpp +@@ -67,6 +67,8 @@ + + #include "DjVuGlobal.h" + #include "GException.h" ++ ++#include + #include + #include + #include "debug.h" +diff --git a/libdjvu/DjVuMessage.cpp b/libdjvu/DjVuMessage.cpp +index 6f5a735..1726025 100644 +--- a/libdjvu/DjVuMessage.cpp ++++ b/libdjvu/DjVuMessage.cpp +@@ -71,6 +71,7 @@ + #include "debug.h" + #include + #include ++#include + #include + #ifdef WIN32 + # include +diff --git a/libdjvu/DjVuMessageLite.cpp b/libdjvu/DjVuMessageLite.cpp +index b8c1010..5daa9d9 100644 +--- a/libdjvu/DjVuMessageLite.cpp ++++ b/libdjvu/DjVuMessageLite.cpp +@@ -73,8 +73,8 @@ + #include "debug.h" + #include + #include ++#include + #include +-// #include + #ifdef WIN32 + #include + #include +diff --git a/libdjvu/DjVuPalette.cpp b/libdjvu/DjVuPalette.cpp +index c489f7b..76b0bf4 100644 +--- a/libdjvu/DjVuPalette.cpp ++++ b/libdjvu/DjVuPalette.cpp +@@ -64,6 +64,8 @@ + #include "ByteStream.h" + #include "BSByteStream.h" + #include "DjVuPalette.h" ++ ++#include + #include + #include + +diff --git a/libdjvu/DjVuPort.h b/libdjvu/DjVuPort.h +index f6a92f6..e2b3125 100644 +--- a/libdjvu/DjVuPort.h ++++ b/libdjvu/DjVuPort.h +@@ -65,6 +65,7 @@ + + #include "GThreads.h" + #include "GURL.h" ++#include "stddef.h" + + #ifdef HAVE_NAMESPACES + namespace DJVU { +diff --git a/libdjvu/DjVuToPS.cpp b/libdjvu/DjVuToPS.cpp +index 5517bf3..6914ff9 100644 +--- a/libdjvu/DjVuToPS.cpp ++++ b/libdjvu/DjVuToPS.cpp +@@ -72,6 +72,7 @@ + #include "GPixmap.h" + #include "debug.h" + #include ++#include + #include + #include + #include +diff --git a/libdjvu/GBitmap.cpp b/libdjvu/GBitmap.cpp +index ab5c0de..797edcc 100644 +--- a/libdjvu/GBitmap.cpp ++++ b/libdjvu/GBitmap.cpp +@@ -66,6 +66,8 @@ + #include "GString.h" + #include "GThreads.h" + #include "GException.h" ++#include ++#include + #include + + // - Author: Leon Bottou, 05/1997 +diff --git a/libdjvu/GException.cpp b/libdjvu/GException.cpp +index 2ea179a..89da70f 100644 +--- a/libdjvu/GException.cpp ++++ b/libdjvu/GException.cpp +@@ -60,6 +60,7 @@ + # pragma implementation + #endif + ++#include + #include + #include + #include +diff --git a/libdjvu/GOS.cpp b/libdjvu/GOS.cpp +index e784932..d2088e2 100644 +--- a/libdjvu/GOS.cpp ++++ b/libdjvu/GOS.cpp +@@ -65,6 +65,7 @@ + #include "GOS.h" + #include "GURL.h" + ++#include + #include + #include + #include +diff --git a/libdjvu/GPixmap.cpp b/libdjvu/GPixmap.cpp +index 392df54..4bf6f57 100644 +--- a/libdjvu/GPixmap.cpp ++++ b/libdjvu/GPixmap.cpp +@@ -75,6 +75,8 @@ + #include "GThreads.h" + #include "Arrays.h" + #include "JPEGDecoder.h" ++ ++#include + #include + #include + #include +diff --git a/libdjvu/GSmartPointer.cpp b/libdjvu/GSmartPointer.cpp +index 6e523e7..58aef5b 100644 +--- a/libdjvu/GSmartPointer.cpp ++++ b/libdjvu/GSmartPointer.cpp +@@ -67,6 +67,7 @@ + // Our original implementation consisted of multiple classes. + // . + ++#include + #include + #if PARANOID_DEBUG + # include +diff --git a/libdjvu/GSmartPointer.h b/libdjvu/GSmartPointer.h +index 82781bd..8a8bb8a 100644 +--- a/libdjvu/GSmartPointer.h ++++ b/libdjvu/GSmartPointer.h +@@ -97,6 +97,8 @@ + #include "DjVuGlobal.h" + #include "atomic.h" + ++#include ++ + #ifdef HAVE_NAMESPACES + namespace DJVU { + # ifdef NOT_DEFINED // Just to fool emacs c++ mode +diff --git a/libdjvu/GString.cpp b/libdjvu/GString.cpp +index 03f6226..350b11b 100644 +--- a/libdjvu/GString.cpp ++++ b/libdjvu/GString.cpp +@@ -73,6 +73,7 @@ + #include "GThreads.h" + #include "debug.h" + ++#include + #include + #include + #include +diff --git a/libdjvu/GString.h b/libdjvu/GString.h +index b63b753..3aa1f76 100644 +--- a/libdjvu/GString.h ++++ b/libdjvu/GString.h +@@ -108,6 +108,7 @@ + #include "DjVuGlobal.h" + #include "GContainer.h" + ++#include + #include + #include + #ifdef WIN32 +diff --git a/libdjvu/GThreads.cpp b/libdjvu/GThreads.cpp +index d81f3c3..253fed8 100644 +--- a/libdjvu/GThreads.cpp ++++ b/libdjvu/GThreads.cpp +@@ -71,6 +71,8 @@ + #include "GThreads.h" + #include "GException.h" + #include "DjVuMessageLite.h" ++ ++#include + #include + #include + +diff --git a/libdjvu/GURL.cpp b/libdjvu/GURL.cpp +index c37bf52..a80078c 100644 +--- a/libdjvu/GURL.cpp ++++ b/libdjvu/GURL.cpp +@@ -72,6 +72,7 @@ + #include "GURL.h" + #include "debug.h" + ++#include + #include + #include + #include +diff --git a/libdjvu/GUnicode.cpp b/libdjvu/GUnicode.cpp +index 415c081..a8b25b8 100644 +--- a/libdjvu/GUnicode.cpp ++++ b/libdjvu/GUnicode.cpp +@@ -62,6 +62,8 @@ + + #include "GString.h" + ++#include ++ + #if HAS_ICONV + #include + #endif +diff --git a/libdjvu/IFFByteStream.h b/libdjvu/IFFByteStream.h +index a653f8c..e31b216 100644 +--- a/libdjvu/IFFByteStream.h ++++ b/libdjvu/IFFByteStream.h +@@ -124,6 +124,7 @@ + + + #include "DjVuGlobal.h" ++#include + #include + #include + #include +diff --git a/libdjvu/IW44EncodeCodec.cpp b/libdjvu/IW44EncodeCodec.cpp +index 8d7b12c..49081b7 100644 +--- a/libdjvu/IW44EncodeCodec.cpp ++++ b/libdjvu/IW44EncodeCodec.cpp +@@ -76,6 +76,7 @@ + #include "IFFByteStream.h" + #include "GRect.h" + ++#include + #include + #include + #include +diff --git a/libdjvu/IW44Image.cpp b/libdjvu/IW44Image.cpp +index 9476726..4a19fb5 100644 +--- a/libdjvu/IW44Image.cpp ++++ b/libdjvu/IW44Image.cpp +@@ -76,6 +76,7 @@ + #include "IFFByteStream.h" + #include "GRect.h" + ++#include + #include + #include + #include +diff --git a/libdjvu/JPEGDecoder.h b/libdjvu/JPEGDecoder.h +index bd430a0..fad1d4c 100644 +--- a/libdjvu/JPEGDecoder.h ++++ b/libdjvu/JPEGDecoder.h +@@ -64,6 +64,7 @@ + + #ifdef NEED_JPEG_DECODER + ++#include + #include + #include + +diff --git a/libdjvu/MMX.cpp b/libdjvu/MMX.cpp +index 5ab60bb..528dab6 100644 +--- a/libdjvu/MMX.cpp ++++ b/libdjvu/MMX.cpp +@@ -62,6 +62,7 @@ + + #include "MMX.h" + #include ++#include + #include + + +diff --git a/libdjvu/UnicodeByteStream.h b/libdjvu/UnicodeByteStream.h +index 0ae112b..9b49a17 100644 +--- a/libdjvu/UnicodeByteStream.h ++++ b/libdjvu/UnicodeByteStream.h +@@ -88,6 +88,7 @@ + #include "GString.h" + #include "ByteStream.h" + ++#include + + #ifdef HAVE_NAMESPACES + namespace DJVU { +diff --git a/libdjvu/XMLParser.cpp b/libdjvu/XMLParser.cpp +index 84386c5..7da923a 100644 +--- a/libdjvu/XMLParser.cpp ++++ b/libdjvu/XMLParser.cpp +@@ -75,6 +75,7 @@ + #include "debug.h" + #include + #include ++#include + #include + + +diff --git a/libdjvu/ZPCodec.cpp b/libdjvu/ZPCodec.cpp +index f6e971d..ff5b9bf 100644 +--- a/libdjvu/ZPCodec.cpp ++++ b/libdjvu/ZPCodec.cpp +@@ -66,6 +66,8 @@ + #include "ZPCodec.h" + #include "ByteStream.h" + #include "GException.h" ++ ++#include + #include + #include + #include +diff --git a/libdjvu/atomic.cpp b/libdjvu/atomic.cpp +index bdc193e..63fd483 100644 +--- a/libdjvu/atomic.cpp ++++ b/libdjvu/atomic.cpp +@@ -28,6 +28,7 @@ + # include "config.h" + #endif + ++#include + #include + #include + #include "atomic.h" +diff --git a/libdjvu/ddjvuapi.cpp b/libdjvu/ddjvuapi.cpp +index b18b84b..f40f5aa 100644 +--- a/libdjvu/ddjvuapi.cpp ++++ b/libdjvu/ddjvuapi.cpp +@@ -60,6 +60,7 @@ + # pragma implementation "ddjvuapi.h" + #endif + ++#include + #include + #include + #include +diff --git a/libdjvu/ddjvuapi.h b/libdjvu/ddjvuapi.h +index d0ed48f..841f223 100644 +--- a/libdjvu/ddjvuapi.h ++++ b/libdjvu/ddjvuapi.h +@@ -64,6 +64,7 @@ extern "C" { + } + #endif + ++#include + #include + #include + +diff --git a/libdjvu/miniexp.cpp b/libdjvu/miniexp.cpp +index e0fb087..fc51297 100644 +--- a/libdjvu/miniexp.cpp ++++ b/libdjvu/miniexp.cpp +@@ -23,6 +23,7 @@ + # pragma implementation "miniexp.h" + #endif + ++#include + #include + #include + #include +diff --git a/libdjvu/miniexp.h b/libdjvu/miniexp.h +index 91e345d..993005b 100644 +--- a/libdjvu/miniexp.h ++++ b/libdjvu/miniexp.h +@@ -38,7 +38,8 @@ extern "C" { + #ifndef MINILISPAPI + # define MINILISPAPI /**/ + #endif +- ++ ++#include + + /* -------------------------------------------------- */ + /* LISP EXPRESSIONS */ +diff --git a/tools/bzz.cpp b/tools/bzz.cpp +index ca092e1..2ebc7b9 100644 +--- a/tools/bzz.cpp ++++ b/tools/bzz.cpp +@@ -94,6 +94,7 @@ + #include "GURL.h" + #include "DjVuMessage.h" + #include ++#include + #include + + static const char *program = "(unknown)"; +diff --git a/tools/c44.cpp b/tools/c44.cpp +index 6f23b53..855504b 100644 +--- a/tools/c44.cpp ++++ b/tools/c44.cpp +@@ -226,6 +226,7 @@ + #include + #include + #include ++#include + #include + + // command line data +diff --git a/tools/cjb2.cpp b/tools/cjb2.cpp +index 8cf89b9..11eb662 100644 +--- a/tools/cjb2.cpp ++++ b/tools/cjb2.cpp +@@ -120,6 +120,7 @@ + #include "jb2tune.h" + + #include ++#include + #include + #if HAVE_TIFF + #include +diff --git a/tools/cpaldjvu.cpp b/tools/cpaldjvu.cpp +index 111cbd3..b640a7a 100644 +--- a/tools/cpaldjvu.cpp ++++ b/tools/cpaldjvu.cpp +@@ -118,6 +118,7 @@ + #include "jb2tune.h" + + #include ++#include + #include + #include + +diff --git a/tools/csepdjvu.cpp b/tools/csepdjvu.cpp +index cd721f8..d5203d5 100644 +--- a/tools/csepdjvu.cpp ++++ b/tools/csepdjvu.cpp +@@ -162,6 +162,7 @@ + #include "jb2tune.h" + + #include ++#include + #include + + #undef MIN +diff --git a/tools/ddjvu.cpp b/tools/ddjvu.cpp +index 817e045..981a270 100644 +--- a/tools/ddjvu.cpp ++++ b/tools/ddjvu.cpp +@@ -62,6 +62,7 @@ + # include "config.h" + #endif + ++#include + #include + #include + #include +diff --git a/tools/djvm.cpp b/tools/djvm.cpp +index 951bd66..6ea88c2 100644 +--- a/tools/djvm.cpp ++++ b/tools/djvm.cpp +@@ -135,9 +135,9 @@ + #include "DjVuMessage.h" + + #include ++#include + #include + #include +-#include + + static const char * progname; + +diff --git a/tools/djvmcvt.cpp b/tools/djvmcvt.cpp +index 9ca1c54..20b468a 100644 +--- a/tools/djvmcvt.cpp ++++ b/tools/djvmcvt.cpp +@@ -144,6 +144,7 @@ + + #include + #include ++#include + #include + + static const char * progname; +diff --git a/tools/djvudump.cpp b/tools/djvudump.cpp +index 6a0215a..2dddbdf 100644 +--- a/tools/djvudump.cpp ++++ b/tools/djvudump.cpp +@@ -119,6 +119,7 @@ xxx + #include + #include + #include ++#include + #include + + void +diff --git a/tools/djvuextract.cpp b/tools/djvuextract.cpp +index 4a9f381..907b99c 100644 +--- a/tools/djvuextract.cpp ++++ b/tools/djvuextract.cpp +@@ -105,6 +105,7 @@ + #include "GOS.h" + #include "DjVuMessage.h" + #include ++#include + #include + + +diff --git a/tools/djvumake.cpp b/tools/djvumake.cpp +index 7020484..4c5fc0f 100644 +--- a/tools/djvumake.cpp ++++ b/tools/djvumake.cpp +@@ -153,6 +153,7 @@ + + #include + #include ++#include + #include + #include + +diff --git a/tools/djvups.cpp b/tools/djvups.cpp +index 51aa999..632b832 100644 +--- a/tools/djvups.cpp ++++ b/tools/djvups.cpp +@@ -57,6 +57,7 @@ + # include "config.h" + #endif + ++#include + #include + #include + #include +diff --git a/tools/djvused.cpp b/tools/djvused.cpp +index de84dcd..687fdca 100644 +--- a/tools/djvused.cpp ++++ b/tools/djvused.cpp +@@ -61,6 +61,7 @@ + #endif + + #include ++#include + #include + #include + #include +diff --git a/tools/djvuserve.cpp b/tools/djvuserve.cpp +index 19a17da..818fe78 100644 +--- a/tools/djvuserve.cpp ++++ b/tools/djvuserve.cpp +@@ -73,6 +73,7 @@ + + #include + #include ++#include + #include + #include + #include +diff --git a/tools/djvutxt.cpp b/tools/djvutxt.cpp +index ba2c745..9e9124c 100644 +--- a/tools/djvutxt.cpp ++++ b/tools/djvutxt.cpp +@@ -61,6 +61,7 @@ + # include "config.h" + #endif + ++#include + #include + #include + #include +diff --git a/tools/tiff2pdf.h b/tools/tiff2pdf.h +index 082f5fb..656dc43 100644 +--- a/tools/tiff2pdf.h ++++ b/tools/tiff2pdf.h +@@ -22,6 +22,7 @@ + # endif + # if HAVE_TIFF + # include ++# include + # include + # include + # include +diff --git a/xmltools/djvutoxml.cpp b/xmltools/djvutoxml.cpp +index 17c769b..b40535e 100644 +--- a/xmltools/djvutoxml.cpp ++++ b/xmltools/djvutoxml.cpp +@@ -71,6 +71,7 @@ + + #include + #include ++#include + #include + #include + #include +diff --git a/xmltools/djvuxmlparser.cpp b/xmltools/djvuxmlparser.cpp +index bdc5768..6679a9d 100644 +--- a/xmltools/djvuxmlparser.cpp ++++ b/xmltools/djvuxmlparser.cpp +@@ -70,6 +70,7 @@ + #include + #include + #include ++#include + #include + + static void diff --git a/pkgs/applications/misc/dunst/default.nix b/pkgs/applications/misc/dunst/default.nix index 457f20b4d441a90ec4eeb15070cea82e3db69455..1eb0949aeb41cb7f90e49e6c5ac720c3b16a56a6 100644 --- a/pkgs/applications/misc/dunst/default.nix +++ b/pkgs/applications/misc/dunst/default.nix @@ -1,19 +1,24 @@ { stdenv, fetchurl, coreutils , unzip, which, pkgconfig , dbus -, freetype, xdg_utils , libXext, glib, pango , cairo, libX11 -, libxdg_basedir , libXScrnSaver, xproto, libXinerama , perl +, freetype, xdg_utils , libXext, glib, pango , cairo, libX11, libnotify +, libxdg_basedir , libXScrnSaver, xproto, libXinerama , perl, gdk_pixbuf }: stdenv.mkDerivation rec { - name = "dunst-0.5.0"; - version = "0.5.0"; + version = "1.0.0"; + name = "dunst-${version}"; src = fetchurl { - url = "https://github.com/knopwob/dunst/archive/v0.5.0.zip"; - sha256 = "08myzhpb1afffcfk3mpmc7gs9305x853b0553fxf3lkgksmg70a6"; + url = "https://github.com/knopwob/dunst/archive/v${version}.zip"; + sha256 = "1x6k6jrf219v8hmhqhnnfjycldvsnp7ag8a2y8adp5rhfmgyn671"; }; + patchPhase = '' + substituteInPlace "settings.c" \ + --replace "xdgConfigOpen(\"dunst/dunstrc\", \"r\", &xdg" "fopen(\"$out/share/dunst/dunstrc\", \"r\"" + ''; + buildInputs = - [ coreutils unzip which pkgconfig dbus freetype + [ coreutils unzip which pkgconfig dbus freetype libnotify gdk_pixbuf xdg_utils libXext glib pango cairo libX11 libxdg_basedir libXScrnSaver xproto libXinerama perl]; @@ -29,5 +34,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.bsd3; # NOTE: 'unix' or even 'all' COULD work too, I'm not sure platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.iElectric ]; }; } diff --git a/pkgs/applications/misc/evince/default.nix b/pkgs/applications/misc/evince/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..793c7bda29948cf5173c2f884a15959eb96d7f13 --- /dev/null +++ b/pkgs/applications/misc/evince/default.nix @@ -0,0 +1,59 @@ +{ fetchurl, stdenv, perl, perlXMLParser, gettext, intltool +, pkgconfig, glib, gtk, gnomedocutils, gnomeicontheme +, libgnome, libgnomeui, scrollkeeper, libxslt +, libglade, libgnome_keyring, dbus, dbus_glib +, poppler, libspectre, djvulibre, shared_mime_info +, makeWrapper, which, ghostscript +, recentListSize ? null # 5 is not enough, allow passing a different number +}: + +stdenv.mkDerivation rec { + name = "evince-2.32.0"; + + src = fetchurl { + url = "http://ftp.gnome.org/pub/GNOME/sources/evince/2.32/${name}.tar.bz2"; + sha256 = "2a4c91ae38f8b5028cebb91b9da9ddc50ea8ae3f3d429df89ba351da2d787ff7"; + }; + + buildInputs = [ + perl perlXMLParser gettext intltool pkgconfig glib gtk + gnomedocutils gnomeicontheme libgnome libgnomeui libglade + scrollkeeper libgnome_keyring + libxslt # for `xsltproc' + dbus dbus_glib poppler libspectre djvulibre makeWrapper which + ghostscript + ]; + + configureFlags = "--with-libgnome --enable-dbus --enable-pixbuf " + + # Do not use nautilus + + " --disable-nautilus " + # Do not update Scrollkeeper's database (GNOME's help system). + + "--disable-scrollkeeper"; + + postUnpack = if recentListSize != null then '' + sed -i 's/\(gtk_recent_chooser_set_limit .*\)5)/\1${builtins.toString recentListSize})/' */shell/ev-open-recent-action.c + sed -i 's/\(if (++n_items == \)5\(.*\)/\1${builtins.toString recentListSize}\2/' */shell/ev-window.c + '' else ""; + + postInstall = '' + # Tell Glib/GIO about the MIME info directory, which is used + # by `g_file_info_get_content_type ()'. + wrapProgram "$out/bin/evince" \ + --prefix XDG_DATA_DIRS : "${shared_mime_info}/share:$out/share" + ''; + + meta = { + homepage = http://www.gnome.org/projects/evince/; + description = "Evince, GNOME's document viewer"; + + longDescription = '' + Evince is a document viewer for multiple document formats. It + currently supports PDF, PostScript, DjVu, TIFF and DVI. The goal + of Evince is to replace the multiple document viewers that exist + on the GNOME Desktop with a single simple application. + ''; + + license = "GPLv2+"; + }; +} diff --git a/pkgs/applications/misc/evtest/default.nix b/pkgs/applications/misc/evtest/default.nix index 9d7b6fa7a281fa28916e8399bce3020ac1e8bb25..58b4f0d01bf5e4133a2677c805a69ff556e84b37 100644 --- a/pkgs/applications/misc/evtest/default.nix +++ b/pkgs/applications/misc/evtest/default.nix @@ -12,8 +12,10 @@ stdenv.mkDerivation rec { rev = "1a50f2479c4775e047f234a24d95dda82441bfbd"; }; - meta = { + meta = with stdenv.lib; { description = "Simple tool for input event debugging"; license = "GPLv2"; + platforms = platforms.linux; + maintainers = [maintainers.bjornfor]; }; } diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix index 798b0e5162f3df00d28993db787424a0b4f77e2a..07de627128974debd5eba6be56ce64845091f8ca 100644 --- a/pkgs/applications/misc/lyx/default.nix +++ b/pkgs/applications/misc/lyx/default.nix @@ -3,12 +3,12 @@ }: stdenv.mkDerivation rec { - version = "2.0.5.1"; + version = "2.0.6"; name = "lyx-${version}"; src = fetchurl { url = "ftp://ftp.lyx.org/pub/lyx/stable/2.0.x/${name}.tar.xz"; - sha256 = "18k9qbz40v6lqmkfcg98wvcv4wi4p36ach1jz3z2b15gbmv2gr9n"; + sha256 = "1llah9d9ymvdk8asmqslcwnicycxrwb27k8si184n5bfxvnjpjx5"; }; configureFlags = [ @@ -23,6 +23,8 @@ stdenv.mkDerivation rec { enchant # mythes boost ]; + doCheck = true; + meta = { description = "WYSIWYM frontend for LaTeX, DocBook, etc."; homepage = "http://www.lyx.org"; diff --git a/pkgs/applications/misc/pitz/default.nix b/pkgs/applications/misc/pitz/default.nix index 495583d95d4be23801383af1e3b1a8bee6f14eb6..355ea9b2033d392f9557e83f5a6dc81349cd91b2 100644 --- a/pkgs/applications/misc/pitz/default.nix +++ b/pkgs/applications/misc/pitz/default.nix @@ -23,9 +23,11 @@ buildPythonPackage rec { # runtime. If we use buildInputs it would just build, not run. propagatedBuildInputs = [ tempita jinja2 pyyaml clepy mock nose decorator docutils ]; - meta = { + meta = with stdenv.lib; { description = "Distributed bugtracker"; - license = stdenv.lib.licenses.bsd3; + license = licenses.bsd3; homepage = http://pitz.tplus1.com/; + platforms = platforms.linux; + maintainers = [maintainers.bjornfor]; }; } diff --git a/pkgs/applications/misc/xfe/default.nix b/pkgs/applications/misc/xfe/default.nix index 67ff2ec5541198542aaab488ed1bc11dee611979..bd00d91e23d3682e5fd3e4ea9694281f515d3dee 100644 --- a/pkgs/applications/misc/xfe/default.nix +++ b/pkgs/applications/misc/xfe/default.nix @@ -1,20 +1,18 @@ -{ stdenv, fetchurl, fox_1_6, pkgconfig, gettext, x11, gcc, intltool, file, libpng }: - -let - version = "1.33"; -in +{ stdenv, fetchurl, fox, pkgconfig, gettext, x11, gcc, intltool, file, libpng }: stdenv.mkDerivation rec { - name = "xfe-${version}"; + name = "xfe-1.34"; src = fetchurl { - url = "http://downloads.sourceforge.net/project/xfe/xfe/${version}/${name}.tar.gz"; - md5 = "fb089ba73add411b08a6560eeb51742d"; + url = "mirror://sourceforge/xfe/${name}.tar.gz"; + sha256 = "0y6gi8vdvw1prz7dv7wadf7v8gl6g75jrlrl5jnsb71l1431ncay"; }; - buildInputs = [ fox_1_6 pkgconfig gettext x11 gcc intltool file libpng ]; + buildInputs = [ fox pkgconfig gettext x11 gcc intltool file libpng ]; - doCheck = false; + preConfigure = '' + sed -i s,/usr/share/xfe,$out/share/xfe, src/xfedefs.h + ''; enableParallelBuilding = true; diff --git a/pkgs/applications/misc/yeganesh/default.nix b/pkgs/applications/misc/yeganesh/default.nix index 14f0fdb538469012f2f7464d956c5bec12499757..36a5817772d5146d53a428ecf83c4fd2950324a0 100644 --- a/pkgs/applications/misc/yeganesh/default.nix +++ b/pkgs/applications/misc/yeganesh/default.nix @@ -12,6 +12,5 @@ cabal.mkDerivation (self: { description = "small dmenu wrapper"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/applications/networking/bittorrentsync/default.nix b/pkgs/applications/networking/bittorrentsync/default.nix index 65a60b88477e6afbb59236a1307251aa0a3c2e63..91afc98bd4afcfb05307f9a4ae98d146678239c0 100644 --- a/pkgs/applications/networking/bittorrentsync/default.nix +++ b/pkgs/applications/networking/bittorrentsync/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchurl, patchelf }: # this package contains the daemon version of bittorrent sync - # it's unfortunately closed source. let @@ -15,16 +14,15 @@ let else if stdenv.system == "i686-linux" then "ld-linux.so.2" else throw "Bittorrent Sync for: ${stdenv.system} not supported!"; - version = "1.0.116"; - sha256 = if stdenv.system == "x86_64-linux" then "108c11x8lp0a4irq88raclz3zfvmkxsqymxx3y8amc1lc6kc3n8i" - else if stdenv.system == "i686-linux" then "0kkxi04rggq6lrvn7g1xjay2nskqn7z4qkm0h0lcra7h2jz09mf1" + version = "1.0.132"; + sha256 = if stdenv.system == "x86_64-linux" then "04mwzpbibzzbl384ziq07g7xxbc1rb5lyxgc7g8m1x5fvc6g1dk6" + else if stdenv.system == "i686-linux" then "0yz1y761gx612lczlqjc3wddnw73qf4b8rna9hmfzan7ikqb81z0" else throw "Bittorrent Sync for: ${stdenv.system} not supported!"; in stdenv.mkDerivation { name = "btsync-bin-${version}"; src = fetchurl { - # TODO: using version-specific URL: http://forum.bittorrent.com/topic/18070-versioned-binary-downloads/#entry45868 - url = "http://btsync.s3-website-us-east-1.amazonaws.com/btsync_${arch}.tar.gz"; + url = "http://syncapp.bittorrent.com/${version}/btsync_${arch}-${version}.tar.gz"; inherit sha256; }; @@ -43,7 +41,7 @@ in stdenv.mkDerivation { meta = { homepage = "http://labs.bittorrent.com/experiments/sync.html"; description = "Automatically sync files via secure, distributed technology."; - license = stdenv.lib.licenses.unfreeRedistributable; + license = stdenv.lib.licenses.unfree; maintainers = [ stdenv.lib.maintainers.iElectric ]; }; } diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 682de909067619a0c0204090d4a54d429c46db20..5be67c888d9c049fb7fb5f21e2a650a7228f11de 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -86,9 +86,15 @@ let post26 = !pre27; post27 = !pre28; + # build paths and release info + packageName = "chromium"; + buildType = "Release"; + buildPath = "out/${buildType}"; + libExecPath = "$out/libexec/${packageName}"; + in stdenv.mkDerivation rec { name = "${packageName}-${version}"; - packageName = "chromium"; + inherit packageName; version = sourceInfo.version; @@ -119,7 +125,8 @@ in stdenv.mkDerivation rec { prePatch = "patchShebangs ."; - patches = optional cupsSupport ./cups_allow_deprecated.patch + patches = [ ./sandbox_userns.patch ] + ++ optional cupsSupport ./cups_allow_deprecated.patch ++ optional (pulseSupport && pre27) ./pulseaudio_array_bounds.patch ++ optional pre27 ./glibc-2.16-use-siginfo_t.patch; @@ -130,7 +137,7 @@ in stdenv.mkDerivation rec { '' + '' sed -i -e 's|/usr/bin/gcc|gcc|' \ third_party/WebKit/Source/${if post27 - then "core/core.gyp/core.gyp" + then "core/core.gypi" else "WebCore/WebCore.gyp/WebCore.gyp"} ''; @@ -146,6 +153,8 @@ in stdenv.mkDerivation rec { use_openssl = useOpenSSL; selinux = enableSELinux; use_cups = cupsSupport; + linux_sandbox_path="${libExecPath}/${packageName}_sandbox"; + linux_sandbox_chrome_path="${libExecPath}/${packageName}"; } // optionalAttrs proprietaryCodecs { # enable support for the H.264 codec proprietary_codecs = true; @@ -156,8 +165,6 @@ in stdenv.mkDerivation rec { target_arch = "ia32"; }); - buildType = "Release"; - enableParallelBuilding = true; configurePhase = '' @@ -179,26 +186,28 @@ in stdenv.mkDerivation rec { "BUILDTYPE=${buildType}" "library=shared_library" "chrome" - ]; + ] ++ optional (!enableSELinux) "chrome_sandbox"; installPhase = '' - mkdir -vp "$out/libexec/${packageName}" - cp -v "out/${buildType}/"*.pak "$out/libexec/${packageName}/" - cp -vR "out/${buildType}/locales" "out/${buildType}/resources" "$out/libexec/${packageName}/" - cp -v out/${buildType}/libffmpegsumo.so "$out/libexec/${packageName}/" + mkdir -vp "${libExecPath}" + cp -v "${buildPath}/"*.pak "${libExecPath}/" + cp -vR "${buildPath}/locales" "${buildPath}/resources" "${libExecPath}/" + cp -v ${buildPath}/libffmpegsumo.so "${libExecPath}/" - cp -v "out/${buildType}/chrome" "$out/libexec/${packageName}/${packageName}" + cp -v "${buildPath}/chrome" "${libExecPath}/${packageName}" mkdir -vp "$out/bin" - makeWrapper "$out/libexec/${packageName}/${packageName}" "$out/bin/${packageName}" + makeWrapper "${libExecPath}/${packageName}" "$out/bin/${packageName}" + cp -v "${buildPath}/chrome_sandbox" "${libExecPath}/${packageName}_sandbox" mkdir -vp "$out/share/man/man1" - cp -v "out/${buildType}/chrome.1" "$out/share/man/man1/${packageName}.1" + cp -v "${buildPath}/chrome.1" "$out/share/man/man1/${packageName}.1" for icon_file in chrome/app/theme/chromium/product_logo_*[0-9].png; do num_and_suffix="''${icon_file##*logo_}" icon_size="''${num_and_suffix%.*}" - logo_output_path="$out/share/icons/hicolor/''${icon_size}x''${icon_size}/apps" + logo_output_prefix="$out/share/icons/hicolor" + logo_output_path="$logo_output_prefix/''${icon_size}x''${icon_size}/apps" mkdir -vp "$logo_output_path" cp -v "$icon_file" "$logo_output_path/${packageName}.png" done diff --git a/pkgs/applications/networking/browsers/chromium/sandbox_userns.patch b/pkgs/applications/networking/browsers/chromium/sandbox_userns.patch new file mode 100644 index 0000000000000000000000000000000000000000..694cebe7c1470098841d6bcd7412287eb2c95d8d --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/sandbox_userns.patch @@ -0,0 +1,292 @@ +From a242351d8a32ea33e6337b928969cc9f715e314e Mon Sep 17 00:00:00 2001 +From: aszlig +Date: Thu, 16 May 2013 14:17:56 +0200 +Subject: [PATCH] zygote: Add support for user namespaces on Linux. + +The implementation is done by patching the Zygote host to execute the sandbox +binary with CLONE_NEWUSER and setting the uid and gid mapping so that the child +process is using uid 0 and gid 0 which map to the current user of the parent. +Afterwards, the sandbox will continue as if it was called as a setuid binary. + +In addition, this adds new_user_namespace as an option in process_util in order +to set the UID and GID mapping correctly. The reason for this is that just +passing CLONE_NEWUSER to clone_flags doesn't help in LaunchProcess(), because +without setting the mappings exec*() will clear the process's capability sets. + +If the kernel doesn't support unprivileged user namespaces and the sandbox +binary doesn't have the setuid flag, the Zygote main process will run without a +sandbox. This is to mimic the behaviour if no SUID sandbox binary path is set. + +Signed-off-by: aszlig +--- + base/process_util.h | 4 ++ + base/process_util_posix.cc | 71 +++++++++++++++++++++- + .../browser/zygote_host/zygote_host_impl_linux.cc | 28 +++++++-- + content/zygote/zygote_main_linux.cc | 7 +++ + sandbox/linux/suid/client/setuid_sandbox_client.cc | 8 +++ + sandbox/linux/suid/client/setuid_sandbox_client.h | 4 ++ + sandbox/linux/suid/common/sandbox.h | 1 + + 7 files changed, 117 insertions(+), 6 deletions(-) + +diff --git a/base/process_util.h b/base/process_util.h +index 6efc70c..0f0c74c 100644 +--- a/base/process_util.h ++++ b/base/process_util.h +@@ -261,3 +261,4 @@ struct LaunchOptions { ++ , new_user_namespace(false) + #endif // OS_LINUX + #if defined(OS_CHROMEOS) + , ctrl_terminal_fd(-1) +@@ -332,6 +333,9 @@ struct LaunchOptions { + #if defined(OS_LINUX) + // If non-zero, start the process using clone(), using flags as provided. + int clone_flags; ++ ++ // If true, start the process in a new user namespace. ++ bool new_user_namespace; + #endif // defined(OS_LINUX) + + #if defined(OS_CHROMEOS) +diff --git a/base/process_util_posix.cc b/base/process_util_posix.cc +index 6f15130..cea07f0 100644 +--- a/base/process_util_posix.cc ++++ b/base/process_util_posix.cc +@@ -34,6 +34,13 @@ + #include "base/threading/platform_thread.h" + #include "base/threading/thread_restrictions.h" + ++#if defined(OS_LINUX) ++#include ++#if !defined(CLONE_NEWUSER) ++#define CLONE_NEWUSER 0x10000000 ++#endif ++#endif ++ + #if defined(OS_CHROMEOS) + #include + #endif +@@ -621,8 +628,19 @@ bool LaunchProcess(const std::vector& argv, + + pid_t pid; + #if defined(OS_LINUX) +- if (options.clone_flags) { +- pid = syscall(__NR_clone, options.clone_flags, 0, 0, 0); ++ int map_pipe_fd[2]; ++ int flags = options.clone_flags; ++ ++ if (options.new_user_namespace) { ++ flags |= CLONE_NEWUSER; ++ if (pipe(map_pipe_fd) < 0) { ++ DPLOG(ERROR) << "user namespace pipe"; ++ return false; ++ } ++ } ++ ++ if (options.clone_flags || options.new_user_namespace) { ++ pid = syscall(__NR_clone, flags, 0, 0, 0); + } else + #endif + { +@@ -635,6 +653,21 @@ bool LaunchProcess(const std::vector& argv, + } else if (pid == 0) { + // Child process + ++#if defined(OS_LINUX) ++ if (options.new_user_namespace) { ++ // Close the write end of the pipe so we get an EOF when the parent closes ++ // the FD. This is to avoid race conditions when the UID/GID mappings are ++ // written _after_ execvp(). ++ close(map_pipe_fd[1]); ++ ++ char dummy; ++ if (HANDLE_EINTR(read(map_pipe_fd[0], &dummy, 1)) != 0) { ++ RAW_LOG(ERROR, "Unexpected input in uid/gid mapping pipe."); ++ _exit(127); ++ } ++ } ++#endif ++ + // DANGER: fork() rule: in the child, if you don't end up doing exec*(), + // you call _exit() instead of exit(). This is because _exit() does not + // call any previously-registered (in the parent) exit handlers, which +@@ -749,6 +782,40 @@ bool LaunchProcess(const std::vector& argv, + _exit(127); + } else { + // Parent process ++#if defined(OS_LINUX) ++ if (options.new_user_namespace) { ++ // We need to write UID/GID mapping here to map the current user outside ++ // the namespace to the root user inside the namespace in order to ++ // correctly "fool" the child process. ++ char buf[256]; ++ int map_fd, map_len; ++ ++ snprintf(buf, sizeof(buf), "/proc/%d/uid_map", pid); ++ map_fd = open(buf, O_RDWR); ++ DPCHECK(map_fd >= 0); ++ snprintf(buf, sizeof(buf), "0 %d 1", geteuid()); ++ map_len = strlen(buf); ++ if (write(map_fd, buf, map_len) != map_len) { ++ RAW_LOG(WARNING, "Can't write to uid_map."); ++ } ++ close(map_fd); ++ ++ snprintf(buf, sizeof(buf), "/proc/%d/gid_map", pid); ++ map_fd = open(buf, O_RDWR); ++ DPCHECK(map_fd >= 0); ++ snprintf(buf, sizeof(buf), "0 %d 1", getegid()); ++ map_len = strlen(buf); ++ if (write(map_fd, buf, map_len) != map_len) { ++ RAW_LOG(WARNING, "Can't write to gid_map."); ++ } ++ close(map_fd); ++ ++ // Close the pipe on the parent, so the child can continue doing the ++ // execvp() call. ++ close(map_pipe_fd[1]); ++ } ++#endif ++ + if (options.wait) { + // While this isn't strictly disk IO, waiting for another process to + // finish is the sort of thing ThreadRestrictions is trying to prevent. +diff --git a/content/browser/zygote_host/zygote_host_impl_linux.cc b/content/browser/zygote_host/zygote_host_impl_linux.cc +index ba7884f8..2a674a0 100644 +--- a/content/browser/zygote_host/zygote_host_impl_linux.cc ++++ b/content/browser/zygote_host/zygote_host_impl_linux.cc +@@ -117,6 +117,9 @@ void ZygoteHostImpl::Init(const std::string& sandbox_cmd) { + + sandbox_binary_ = sandbox_cmd.c_str(); + ++ bool userns_sandbox = false; ++ const std::vector cmd_line_unwrapped(cmd_line.argv()); ++ + if (!sandbox_cmd.empty()) { + struct stat st; + if (stat(sandbox_binary_.c_str(), &st) != 0) { +@@ -124,16 +127,21 @@ void ZygoteHostImpl::Init(const std::string& sandbox_cmd) { + << sandbox_binary_ << " Aborting now."; + } + +- if (access(sandbox_binary_.c_str(), X_OK) == 0 && +- (st.st_uid == 0) && +- (st.st_mode & S_ISUID) && +- (st.st_mode & S_IXOTH)) { ++ if (access(sandbox_binary_.c_str(), X_OK) == 0) { + using_suid_sandbox_ = true; ++ + cmd_line.PrependWrapper(sandbox_binary_); + + scoped_ptr + sandbox_client(sandbox::SetuidSandboxClient::Create()); + sandbox_client->SetupLaunchEnvironment(); ++ ++ if (!((st.st_uid == 0) && ++ (st.st_mode & S_ISUID) && ++ (st.st_mode & S_IXOTH))) { ++ userns_sandbox = true; ++ sandbox_client->SetNoSuid(); ++ } + } else { + LOG(FATAL) << "The SUID sandbox helper binary was found, but is not " + "configured correctly. Rather than run without sandboxing " +@@ -161,7 +169,19 @@ void ZygoteHostImpl::Init(const std::string& sandbox_cmd) { + base::ProcessHandle process = -1; + base::LaunchOptions options; + options.fds_to_remap = &fds_to_map; ++ if (userns_sandbox) ++ options.new_user_namespace = true; + base::LaunchProcess(cmd_line.argv(), options, &process); ++ ++ if (process == -1 && userns_sandbox) { ++ LOG(ERROR) << "User namespace sandbox failed to start, running without " ++ << "sandbox! You need at least kernel 3.8.0 with CONFIG_USER_NS " ++ << "enabled in order to use the sandbox without setuid bit."; ++ using_suid_sandbox_ = false; ++ options.new_user_namespace = false; ++ base::LaunchProcess(cmd_line_unwrapped, options, &process); ++ } ++ + CHECK(process != -1) << "Failed to launch zygote process"; + + if (using_suid_sandbox_) { +diff --git a/content/zygote/zygote_main_linux.cc b/content/zygote/zygote_main_linux.cc +index ca75518..d906411 100644 +--- a/content/zygote/zygote_main_linux.cc ++++ b/content/zygote/zygote_main_linux.cc +@@ -402,6 +402,13 @@ static bool EnterSandbox(sandbox::SetuidSandboxClient* setuid_sandbox, + *has_started_new_init = true; + } + ++ // Don't set non-dumpable, as it causes trouble when the host tries to find ++ // the zygote process (XXX: Not quite sure why this happens with user ++ // namespaces). Fortunately, we also have the seccomp filter sandbox which ++ // should disallow the use of ptrace. ++ if (setuid_sandbox->IsNoSuid()) ++ return true; ++ + #if !defined(OS_OPENBSD) + // Previously, we required that the binary be non-readable. This causes the + // kernel to mark the process as non-dumpable at startup. The thinking was +diff --git a/sandbox/linux/suid/client/setuid_sandbox_client.cc b/sandbox/linux/suid/client/setuid_sandbox_client.cc +index 7a174ef..633401e 100644 +--- a/sandbox/linux/suid/client/setuid_sandbox_client.cc ++++ b/sandbox/linux/suid/client/setuid_sandbox_client.cc +@@ -166,6 +166,10 @@ bool SetuidSandboxClient::IsInNewNETNamespace() const { + return env_->HasVar(kSandboxNETNSEnvironmentVarName); + } + ++bool SetuidSandboxClient::IsNoSuid() const { ++ return env_->HasVar(kSandboxNoSuidVarName); ++} ++ + bool SetuidSandboxClient::IsSandboxed() const { + return sandboxed_; + } +@@ -175,5 +179,9 @@ void SetuidSandboxClient::SetupLaunchEnvironment() { + SetSandboxAPIEnvironmentVariable(env_); + } + ++void SetuidSandboxClient::SetNoSuid() { ++ env_->SetVar(kSandboxNoSuidVarName, "1"); ++} ++ + } // namespace sandbox + +diff --git a/sandbox/linux/suid/client/setuid_sandbox_client.h b/sandbox/linux/suid/client/setuid_sandbox_client.h +index a9f6536..2e8113a 100644 +--- a/sandbox/linux/suid/client/setuid_sandbox_client.h ++++ b/sandbox/linux/suid/client/setuid_sandbox_client.h +@@ -39,6 +39,8 @@ class SetuidSandboxClient { + bool IsInNewPIDNamespace() const; + // Did the setuid helper create a new network namespace ? + bool IsInNewNETNamespace() const; ++ // Is sandboxed without SUID binary ? ++ bool IsNoSuid() const; + // Are we done and fully sandboxed ? + bool IsSandboxed() const; + +@@ -46,6 +48,8 @@ class SetuidSandboxClient { + // helper. + void SetupLaunchEnvironment(); + ++ void SetNoSuid(); ++ + private: + // Holds the environment. Will never be NULL. + base::Environment* env_; +diff --git a/sandbox/linux/suid/common/sandbox.h b/sandbox/linux/suid/common/sandbox.h +index aad4ff8..bd710d5 100644 +--- a/sandbox/linux/suid/common/sandbox.h ++++ b/sandbox/linux/suid/common/sandbox.h +@@ -18,6 +18,7 @@ static const char kAdjustLowMemMarginSwitch[] = "--adjust-low-mem"; + + static const char kSandboxDescriptorEnvironmentVarName[] = "SBX_D"; + static const char kSandboxHelperPidEnvironmentVarName[] = "SBX_HELPER_PID"; ++static const char kSandboxNoSuidVarName[] = "SBX_NO_SUID"; + + static const long kSUIDSandboxApiNumber = 1; + static const char kSandboxEnvironmentApiRequest[] = "SBX_CHROME_API_RQ"; +-- +1.8.2.1 + diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix index 0e041ee951877e010897640c84227d6b7e974a0f..3f0cb0e3f83f0a260cb9d108e3dba3fe45160daa 100644 --- a/pkgs/applications/networking/browsers/chromium/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/sources.nix @@ -1,14 +1,14 @@ # This file is autogenerated from update.sh in the same directory. { dev = { - version = "28.0.1485.0"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-28.0.1485.0.tar.xz"; - sha256 = "04whky5bwsj909cc1ycwrc91d04iynwncwh21cbbbvg93jsj2pq9"; + version = "28.0.1500.5"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-28.0.1500.5.tar.xz"; + sha256 = "1jpjmqag875bpy4rwvr362nzx0r8ffcrisil9ci2ar6ayjd4lfhd"; }; beta = { - version = "27.0.1453.65"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-27.0.1453.65.tar.xz"; - sha256 = "1flv9870p0bqglnbm4gfzbxzcvz30k2chxgnlbqgpfk5c4qq9mpb"; + version = "27.0.1453.81"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-27.0.1453.81.tar.xz"; + sha256 = "1g4gsrcdrp06hqr25fd9l4snjhibp5pi7pc3wv11fp8gd04cpv9w"; }; stable = { version = "26.0.1410.63"; diff --git a/pkgs/applications/networking/browsers/firefox/20.0.nix b/pkgs/applications/networking/browsers/firefox/20.0.nix index 3b2f9962a32cb1562c04fb109b2a100f8a6745e0..1480a300820cd0a4b8ecd330a190d99a96d345bb 100644 --- a/pkgs/applications/networking/browsers/firefox/20.0.nix +++ b/pkgs/applications/networking/browsers/firefox/20.0.nix @@ -35,7 +35,7 @@ rec { #"--enable-profiling" "--disable-debug" "--enable-strip" - "--with-system-jpeg" # now we use recent libjpeg-turbo + # "--with-system-jpeg" # Too old in nixpkgs "--with-system-zlib" "--with-system-bz2" "--with-system-nspr" diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 2bbff467bc5c1b97edd23a2413cffbd790ebc4fe..f8d2c2d0e8cdbe3e0687fc74ffe5229a6553f8b7 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -1,4 +1,4 @@ -{ stdenv, browser, makeDesktopItem, makeWrapper, plugins, libs +{ stdenv, browser, makeDesktopItem, makeWrapper, plugins, libs, gtk_modules , browserName, desktopName, nameSuffix, icon }: @@ -28,6 +28,7 @@ stdenv.mkDerivation { "$out/bin/${browserName}${nameSuffix}" \ --suffix-each MOZ_PLUGIN_PATH ':' "$plugins" \ --suffix-each LD_LIBRARY_PATH ':' "$libs" \ + --suffix-each GTK_PATH ':' "$gtk_modules" \ --suffix-each LD_PRELOAD ':' "$(cat $(filterExisting $(addSuffix /extra-ld-preload $plugins)))" \ --prefix-contents PATH ':' "$(filterExisting $(addSuffix /extra-bin-path $plugins))" @@ -43,6 +44,7 @@ stdenv.mkDerivation { # where to find the plugin in its tree. plugins = map (x: x + x.mozillaPlugin) plugins; libs = map (x: x + "/lib") libs ++ map (x: x + "/lib64") libs; + gtk_modules = map (x: x + x.gtkModule) gtk_modules; meta = { description = diff --git a/pkgs/applications/networking/browsers/kwebkitpart/default.nix b/pkgs/applications/networking/browsers/kwebkitpart/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..e9babf787bd16b5766c30ce94da2a8144419bd51 --- /dev/null +++ b/pkgs/applications/networking/browsers/kwebkitpart/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchgit, kdelibs }: + +stdenv.mkDerivation rec { + name = "kwebkitpart-1.3.2"; + + src = fetchgit { + url = git://anongit.kde.org/kwebkitpart; + rev = "292f32fda933b2ead5a61ff1ec457f839fad5c85"; + sha256 = "1b2jar9b1yb3gy9fnq8dn2n4z8lffb6pfrj9jc4rjzv5b3rwh1ak"; + }; + + buildInputs = [ kdelibs ]; + + meta = with stdenv.lib; { + platforms = platforms.linux; + maintainers = [ maintainers.phreedom ]; + description = "a WebKit KPart for Konqueror, Akregator and other KDE applications"; + homepage = https://projects.kde.org/projects/extragear/base/kwebkitpart; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix index e517985023710a02b1f1c58bd6aa2cca4ea239c8..c0f76602b2bba5b806f3538badb5f34f4b7678e4 100644 --- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix @@ -52,6 +52,8 @@ in stdenv.mkDerivation { patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 $file || true patchelf --set-rpath ${rpath}:$out/lib $file || true done + substituteInPlace $out/share/applications/hipchat.desktop \ + --replace /opt/HipChat/bin $out/bin ''; meta = { diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix index a4a32327d0c64d2011e623b3c59b046a940b5218..7bdb6cc1452d4cbd0f4ad5838dbc668f838c0616 100644 --- a/pkgs/applications/networking/instant-messengers/linphone/default.nix +++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix @@ -19,8 +19,6 @@ stdenv.mkDerivation rec { configureFlags = "--enable-external-ortp --enable-external-mediastreamer"; - NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; # I'm lazy to fix these for them - meta = { homepage = http://www.linphone.org/; description = "Open Source video SIP softphone"; diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index c0d87ee5a034f1352feccd4583d81b4705252e6d..95ae70810a12a31aaf9e821d3dce9797382ce9e6 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -12,14 +12,14 @@ enableOfficialBranding ? false }: -let version = "17.0"; in +let version = "17.0.6"; in stdenv.mkDerivation { name = "thunderbird-${version}"; src = fetchurl { url = "ftp://ftp.mozilla.org/pub/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.bz2"; - sha1 = "ccc5f2e155364948945abf6fd27bebeb4d797aa8"; + sha1 = "cb5cb5dbfe77179b5853345c826eaa2bc634d48c"; }; enableParallelBuilding = false; @@ -89,7 +89,7 @@ stdenv.mkDerivation { # Official branding implies thunderbird name and logo cannot be reuse, # see http://www.mozilla.org/foundation/licensing.html if enableOfficialBranding then licenses.proprietary else licenses.mpl11; - maintainers = maintainers.pierron; + maintainers = [ maintainers.pierron maintainers.eelco ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 173453f7b5ef1ce9f159adcd156166c7d9ebdb7e..599229753b5ed601e98c8d08b961b3c0c2c4d89b 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -1,16 +1,17 @@ { stdenv, fetchurl, perl, pkgconfig, gtk, libpcap, flex, bison , gnutls, libgcrypt, glib, zlib, libxml2, libxslt, adns, geoip , heimdal, python, lynx, lua5 +, makeDesktopItem }: -let version = "1.8.5"; in +let version = "1.8.7"; in stdenv.mkDerivation { name = "wireshark-${version}"; src = fetchurl { url = "mirror://sourceforge/wireshark/wireshark-${version}.tar.bz2"; - sha256 = "0wp33qa5yvi60b08iiz55wflhr1vwd7680sbwx2kqjlp2s17kr6l"; + sha256 = "0hm8zisy5dg7sfhh7rvgnpffq2qcw0syd8k5kns8j0j13sf44zjw"; }; buildInputs = @@ -20,13 +21,30 @@ stdenv.mkDerivation { configureFlags = "--disable-usr-local --with-ssl --enable-threads --enable-packet-editor"; + desktopItem = makeDesktopItem { + name = "Wireshark"; + exec = "wireshark"; + icon = "wireshark"; + comment = "Powerful network protocol analysis suite"; + desktopName = "Wireshark"; + genericName = "Network packet analyzer"; + categories = "Network;System"; + }; + + postInstall = '' + mkdir -p "$out"/share/applications/ + mkdir -p "$out"/share/icons/ + cp "$desktopItem"/share/applications/* "$out"/share/applications/ + cp image/wsicon.svg "$out"/share/icons/wireshark.svg + ''; + meta = { - homepage = "http://sourceforge.net/projects/wireshark/"; + homepage = http://www.wireshark.org/; description = "a powerful network protocol analyzer"; license = stdenv.lib.licenses.gpl2; longDescription = '' - Wireshark (formerly known as "Etherreal") is a powerful network + Wireshark (formerly known as "Ethereal") is a powerful network protocol analyzer developed by an international team of networking experts. It runs on UNIX, OS X and Windows. ''; diff --git a/pkgs/applications/networking/umurmur/default.nix b/pkgs/applications/networking/umurmur/default.nix index 7c731874a5f5dc8e56981e33a9706d45934cb1a6..715e7fa6998f8563a56878fbb774a52d7f14138b 100644 --- a/pkgs/applications/networking/umurmur/default.nix +++ b/pkgs/applications/networking/umurmur/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl, protobufc, libconfig }: stdenv.mkDerivation rec { - name = "umurmur-0.2.10"; + name = "umurmur-0.2.12"; src = fetchurl { url = "http://umurmur.googlecode.com/files/${name}.tar.gz"; - sha256 = "0c990jvm73a6lajr1qlzw0p6nkshkh2nqwjmz2sq79pj0hm9ckvy"; + sha1 = "5be3c765af3c5f518d1e1bbd828b3582ad4097cd"; }; buildInputs = [ openssl protobufc libconfig ]; diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix index c1f5472f18f8fc6ad0710a7b736ea98471e54dca..1b692586e0c85ee855ccd8efb372b469e0076f24 100644 --- a/pkgs/applications/office/calligra/default.nix +++ b/pkgs/applications/office/calligra/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://kde/stable/${name}/${name}.tar.bz2"; - sha256 = "0q6ydi7hzrzwqzb38gikdh1l2zf8qp4i3nkgyb01148bjwrhvf21"; + sha256 = "0h9idadrcyjvd0mkwri4lg310mzpna6s0pvc7b7r3267wzjbn9kw"; }; nativeBuildInputs = [ cmake perl pkgconfig ]; diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index 1654aa880046365246c71b76626eb92453e81597..26879a6f660f79f9456986b0d00751ce781810b4 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -1,7 +1,6 @@ { fetchurl, stdenv, pkgconfig, libxml2, gconf, glib, gtk, libgnomeui, libofx , libgtkhtml, gtkhtml, libgnomeprint, goffice, enchant, gettext, libbonoboui -, intltool, perl, guile, slibGuile, swig, isocodes, bzip2, makeWrapper, libglade -, libgsf, libart_lgpl +, intltool, perl, guile, slibGuile, swig, isocodes, bzip2, makeWrapper }: /* If you experience GConf errors when running GnuCash on NixOS, see @@ -20,12 +19,9 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libxml2 gconf glib gtk libgnomeui libgtkhtml gtkhtml libgnomeprint goffice enchant gettext intltool perl guile slibGuile - swig isocodes bzip2 makeWrapper libofx libglade libgsf libart_lgpl + swig isocodes bzip2 makeWrapper libofx ]; - # fix a problem with new intltool versions, taken from Gentoo - patchPhase = "patch -p3 < ${./potfiles-skip.patch}"; - configureFlags = "CFLAGS=-O3 CXXFLAGS=-O3 --disable-dbi --enable-ofx"; postInstall = '' diff --git a/pkgs/applications/office/gnucash/potfiles-skip.patch b/pkgs/applications/office/gnucash/potfiles-skip.patch deleted file mode 100644 index 6fef3a1dcd38814f4f494e7b54acb57aed1fd7b6..0000000000000000000000000000000000000000 --- a/pkgs/applications/office/gnucash/potfiles-skip.patch +++ /dev/null @@ -1,147 +0,0 @@ -Index: gnucash/branches/2.4/po/POTFILES.skip -=================================================================== ---- gnucash/branches/2.4/po/POTFILES.skip (revision 18623) -+++ gnucash/branches/2.4/po/POTFILES.skip (revision 22300) -@@ -19,2 +19,142 @@ - src/libqof/qof/qofquery-serialize.c - src/libqof/qof/qofsql.c -+ -+# The scheme files are handled by intl-scm/guile-strings.c because -+# intltool wouldn't scan scheme files. They're here now because -+# intltool 0.50 *does* scan them, and it creates an error during make -+# check. Once the whole world has upgraded to intltool 0.50, intl-scm -+# can be deleted and these files added to POTFILES.in. -+ -+src/app-utils/date-utilities.scm -+src/app-utils/prefs.scm -+src/business/business-utils/business-prefs.scm -+src/business/business-utils/business-utils.scm -+src/business/business-utils/gnucash/business-utils.scm -+src/import-export/qif-import/qif-dialog-utils.scm -+src/import-export/qif-import/qif-file.scm -+src/import-export/qif-import/qif-import/qif-dialog-utils.scm -+src/import-export/qif-import/qif-import/qif-file.scm -+src/import-export/qif-import/qif-import/qif-merge-groups.scm -+src/import-export/qif-import/qif-import/qif-parse.scm -+src/import-export/qif-import/qif-import/qif-to-gnc.scm -+src/import-export/qif-import/qif-merge-groups.scm -+src/import-export/qif-import/qif-parse.scm -+src/import-export/qif-import/qif-to-gnc.scm -+src/report/business-reports/aging.scm -+src/report/business-reports/balsheet-eg.eguile.scm -+src/report/business-reports/balsheet-eg.scm -+src/report/business-reports/business-reports.scm -+src/report/business-reports/customer-summary.scm -+src/report/business-reports/easy-invoice.scm -+src/report/business-reports/fancy-invoice.scm -+src/report/business-reports/gnucash/report/aging.scm -+src/report/business-reports/gnucash/report/balsheet-eg.eguile.scm -+src/report/business-reports/gnucash/report/balsheet-eg.scm -+src/report/business-reports/gnucash/report/business-reports.scm -+src/report/business-reports/gnucash/report/customer-summary.scm -+src/report/business-reports/gnucash/report/easy-invoice.scm -+src/report/business-reports/gnucash/report/fancy-invoice.scm -+src/report/business-reports/gnucash/report/invoice.scm -+src/report/business-reports/gnucash/report/job-report.scm -+src/report/business-reports/gnucash/report/owner-report.scm -+src/report/business-reports/gnucash/report/payables.scm -+src/report/business-reports/gnucash/report/receivables.scm -+src/report/business-reports/gnucash/report/taxinvoice.eguile.scm -+src/report/business-reports/gnucash/report/taxinvoice.scm -+src/report/business-reports/invoice.scm -+src/report/business-reports/job-report.scm -+src/report/business-reports/owner-report.scm -+src/report/business-reports/payables.scm -+src/report/business-reports/receivables.scm -+src/report/business-reports/taxinvoice.eguile.scm -+src/report/business-reports/taxinvoice.scm -+src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm -+src/report/locale-specific/us/gnucash/report/taxtxf.scm -+src/report/locale-specific/us/taxtxf-de_DE.scm -+src/report/locale-specific/us/taxtxf.scm -+src/report/report-gnome/gnucash/report/report-gnome.scm -+src/report/report-gnome/report-gnome.scm -+src/report/report-system/eguile-gnc.scm -+src/report/report-system/gnucash/report/eguile-gnc.scm -+src/report/report-system/html-acct-table.scm -+src/report/report-system/html-fonts.scm -+src/report/report-system/html-style-sheet.scm -+src/report/report-system/html-utilities.scm -+src/report/report-system/options-utilities.scm -+src/report/report-system/report-utilities.scm -+src/report/report-system/report.scm -+src/report/standard-reports/account-piecharts.scm -+src/report/standard-reports/account-summary.scm -+src/report/standard-reports/advanced-portfolio.scm -+src/report/standard-reports/average-balance.scm -+src/report/standard-reports/balance-sheet.scm -+src/report/standard-reports/budget-balance-sheet.scm -+src/report/standard-reports/budget-barchart.scm -+src/report/standard-reports/budget-flow.scm -+src/report/standard-reports/budget-income-statement.scm -+src/report/standard-reports/budget.scm -+src/report/standard-reports/cash-flow.scm -+src/report/standard-reports/category-barchart.scm -+src/report/standard-reports/daily-reports.scm -+src/report/standard-reports/equity-statement.scm -+src/report/standard-reports/general-journal.scm -+src/report/standard-reports/general-ledger.scm -+src/report/standard-reports/gnucash/report/standard-reports/account-piecharts.scm -+src/report/standard-reports/gnucash/report/standard-reports/account-summary.scm -+src/report/standard-reports/gnucash/report/standard-reports/advanced-portfolio.scm -+src/report/standard-reports/gnucash/report/standard-reports/average-balance.scm -+src/report/standard-reports/gnucash/report/standard-reports/balance-sheet.scm -+src/report/standard-reports/gnucash/report/standard-reports/budget-balance-sheet.scm -+src/report/standard-reports/gnucash/report/standard-reports/budget-barchart.scm -+src/report/standard-reports/gnucash/report/standard-reports/budget-flow.scm -+src/report/standard-reports/gnucash/report/standard-reports/budget-income-statement.scm -+src/report/standard-reports/gnucash/report/standard-reports/budget.scm -+src/report/standard-reports/gnucash/report/standard-reports/cash-flow.scm -+src/report/standard-reports/gnucash/report/standard-reports/category-barchart.scm -+src/report/standard-reports/gnucash/report/standard-reports/daily-reports.scm -+src/report/standard-reports/gnucash/report/standard-reports/equity-statement.scm -+src/report/standard-reports/gnucash/report/standard-reports/general-journal.scm -+src/report/standard-reports/gnucash/report/standard-reports/general-ledger.scm -+src/report/standard-reports/gnucash/report/standard-reports/income-statement.scm -+src/report/standard-reports/gnucash/report/standard-reports/net-barchart.scm -+src/report/standard-reports/gnucash/report/standard-reports/net-linechart.scm -+src/report/standard-reports/gnucash/report/standard-reports/portfolio.scm -+src/report/standard-reports/gnucash/report/standard-reports/price-scatter.scm -+src/report/standard-reports/gnucash/report/standard-reports/register.scm -+src/report/standard-reports/gnucash/report/standard-reports/sx-summary.scm -+src/report/standard-reports/gnucash/report/standard-reports/transaction.scm -+src/report/standard-reports/gnucash/report/standard-reports/trial-balance.scm -+src/report/standard-reports/income-statement.scm -+src/report/standard-reports/net-barchart.scm -+src/report/standard-reports/net-linechart.scm -+src/report/standard-reports/portfolio.scm -+src/report/standard-reports/price-scatter.scm -+src/report/standard-reports/register.scm -+src/report/standard-reports/sx-summary.scm -+src/report/standard-reports/transaction.scm -+src/report/standard-reports/trial-balance.scm -+src/report/stylesheets/gnucash/report/stylesheet-easy.scm -+src/report/stylesheets/gnucash/report/stylesheet-fancy.scm -+src/report/stylesheets/gnucash/report/stylesheet-footer.scm -+src/report/stylesheets/gnucash/report/stylesheet-plain.scm -+src/report/stylesheets/stylesheet-easy.scm -+src/report/stylesheets/stylesheet-fancy.scm -+src/report/stylesheets/stylesheet-footer.scm -+src/report/stylesheets/stylesheet-plain.scm -+src/report/utility-reports/gnucash/report/hello-world.scm -+src/report/utility-reports/gnucash/report/view-column.scm -+src/report/utility-reports/gnucash/report/welcome-to-gnucash.scm -+src/report/utility-reports/hello-world.scm -+src/report/utility-reports/view-column.scm -+src/report/utility-reports/welcome-to-gnucash.scm -+src/scm/build-config.scm -+src/scm/build-config.scm.in -+src/scm/command-line.scm -+src/scm/gnucash/price-quotes.scm -+src/scm/main-window.scm -+src/scm/price-quotes.scm -+src/tax/us/de_DE.scm -+src/tax/us/gnucash/tax/de_DE.scm -+src/tax/us/txf-de_DE.scm -+src/tax/us/txf.scm -+ diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 065f439427cfe6f825e45e1c33a9646147d3d79b..fc5f5058f97b631364b43674d9b1857d1cbfb22b 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -16,7 +16,7 @@ let langsSpaces = stdenv.lib.concatStringsSep " " langs; major = "3"; minor = "6"; - patch = "2"; + patch = "6"; tweak = "2"; subdir = "${major}.${minor}.${patch}"; version = "${subdir}${if tweak == "" then "" else "."}${tweak}"; @@ -36,17 +36,17 @@ let }) ] ++ (map fetchThirdParty (import ./libreoffice-srcs.nix)); translations = fetchSrc { name = "translations"; - sha256 = "a6ef65d5acfe9be19a3d4d743cd23a1017733f651ffc57f5773a24704a282c33"; + sha256 = "1n3yk2077adyxrhs0jpkbm8dg3lxpn3sy63f0dl87ifv7ha1rfpn"; }; help = fetchSrc { name = "help"; - sha256 = "55ec6ef5eef4bbf2298c3b864f67c8424ebb5ccbe7bcd6ca59abba2867989e31"; + sha256 = "12rb5mw6sbi41w1zaxrj4qffiis9qcx8ibp5cpmwsz07nsdv5sxk"; }; core = fetchSrc { name = "core"; - sha256 = "5ec07ffacec09c4dcee9246cb132f7a59a618b395835e781735fd61bf47e8d37"; + sha256 = "0xw36sa73cgk3k3fv1spv5pavm95bc02lszn8415ay36lcc098pn"; }; }; in diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix index 357b703d84d6f66463acea85e21e09d8461b407c..7f8f2c089f3baddbeab3efd360680ef7e9ae8554 100644 --- a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix +++ b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix @@ -336,8 +336,8 @@ md5 = "d197bd6211669a2fa4ca648faf04bcb1"; } { - name = "mdds_0.5.3.tar.bz2"; - md5 = "0ff7d225d087793c8c2c680d77aac3e7"; + name = "mdds_0.6.1.tar.bz2"; + md5 = "9f9e15966b5624834157fe3d748312bc"; } { name = "boost_1_44_0.tar.bz2"; @@ -352,8 +352,8 @@ md5 = "3bf481ca95109b14435125c0dd1f2217"; } { - name = "libvisio-0.0.18.tar.bz2"; - md5 = "a9a1db27688bad49418667b434d29c1f"; + name = "libvisio-0.0.19.tar.bz2"; + md5 = "94e7f271e38c976462558b4278590178"; } { name = "LinLibertineG-20120116.zip"; @@ -364,15 +364,11 @@ md5 = "0d2dcdfbf28d6208751b33057f5361f0"; } { - name = "libcdr-0.0.8.tar.bz2"; - md5 = "ce5a1def34578b75959ac31210f031f6"; + name = "libcdr-0.0.9.tar.bz2"; + md5 = "3c0037fb07dea2f0bbae8386fa7c6a9a"; } { name = "lcms2-2.3.tar.gz"; md5 = "327348d67c979c88c2dec59a23a17d85"; } -{ - name = "libvisio-0.0.19.tar.bz2"; - md5 = "94e7f271e38c976462558b4278590178"; -} ] diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix index 541340df629901279c49772e75fc8b5fb27a132a..04c82b21e85951c64be0c515b79be884c52caefd 100644 --- a/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/pkgs/applications/science/astronomy/stellarium/default.nix @@ -1,14 +1,14 @@ {stdenv, fetchurl, cmake, freetype, libpng, mesa, gettext, openssl, qt4, perl, libiconv}: let - name = "stellarium-0.11.4a"; + name = "stellarium-0.12.1"; in stdenv.mkDerivation { inherit name; src = fetchurl { url = "mirror://sourceforge/stellarium/${name}.tar.gz"; - sha256 = "0gs3lf2061chgcyx22xbnn6b284nsnj8xal7jyjzj57s8yk4n619"; + sha256 = "02qfp56mkg3bqggv3ndx8v6zfswg51gkczwiqy5c9y4rw28hazla"; }; buildInputs = [ cmake freetype libpng mesa gettext openssl qt4 perl libiconv ]; diff --git a/pkgs/applications/science/logic/ekrhyper/default.nix b/pkgs/applications/science/logic/ekrhyper/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..7ff1acb062be0f503f472e412e9fcb850cab748b --- /dev/null +++ b/pkgs/applications/science/logic/ekrhyper/default.nix @@ -0,0 +1,32 @@ +{stdenv, fetchurl, ocaml, perl}: +let + s = # Generated upstream information + rec { + baseName="ekrhyper"; + version="1_4_08022013"; + name="${baseName}-${version}"; + hash="0vni5pq1p99428ii3g13chiqxcs8k1fm6jlvg1jqh4qdcs42w7yb"; + url="http://userpages.uni-koblenz.de/~bpelzer/ekrhyper/ekrh_1_4_08022013.tar.gz"; + sha256="0vni5pq1p99428ii3g13chiqxcs8k1fm6jlvg1jqh4qdcs42w7yb"; + }; + buildInputs = [ + ocaml perl + ]; +in +stdenv.mkDerivation { + inherit (s) name version; + inherit buildInputs; + src = fetchurl { + inherit (s) url sha256; + }; + setSourceRoot = "export sourceRoot=$(echo */ekrh/src/)"; + preInstall = "export INSTALLDIR=$out"; + postInstall = ''for i in "$out/casc"/*; do ln -s "$i" "$out/bin/ekrh-casc-$(basename $i)"; done ''; + meta = { + inherit (s) version; + description = "Automated first-order theorem prover"; + license = stdenv.lib.licenses.gpl2 ; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/science/logic/ekrhyper/default.upstream b/pkgs/applications/science/logic/ekrhyper/default.upstream new file mode 100644 index 0000000000000000000000000000000000000000..310e93ea53fd3d13616617e78678b77162ad8cad --- /dev/null +++ b/pkgs/applications/science/logic/ekrhyper/default.upstream @@ -0,0 +1,3 @@ +url http://userpages.uni-koblenz.de/~bpelzer/ekrhyper/ +ensure_choice +version '.*[^0-9]_([-0-9_]+)[.].*' '\1' diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..5ceefb87af002b226a2e3aa6216505aaa4b8131a --- /dev/null +++ b/pkgs/applications/science/math/R/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, blas, bzip2, gfortran, liblapack, libX11, libXmu, libXt +, libjpeg, libpng, libtiff, ncurses, pango, pcre, perl, readline, tcl +, texLive, tk, xz, zlib, less, texinfo, graphviz +}: + +stdenv.mkDerivation rec { + name = "R-3.0.1"; + + src = fetchurl { + url = "http://ftp5.gwdg.de/pub/misc/cran/src/base/R-3/${name}.tar.gz"; + sha256 = "0d3iv382bsyz6ad5fk382x7sy3qzgpqvd0fw26r0648lyf54i45g"; + }; + + buildInputs = [ blas bzip2 gfortran liblapack libX11 libXmu libXt + libXt libjpeg libpng libtiff ncurses pango pcre perl readline tcl + texLive tk xz zlib less texinfo graphviz ]; + + enableParallelBuilding = true; + + meta = { + description = "a free software environment for statistical computing and graphics"; + homepage = "http://www.r-project.org/"; + license = stdenv.lib.licenses.gpl2Plus; + + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.simons ]; + }; +} diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix index 2f616b2bed0d0262c8793bd64e6dd78caee807a2..e9e6ca7bead75ae122e8f54b5359ed48f31d1802 100644 --- a/pkgs/applications/science/math/wxmaxima/default.nix +++ b/pkgs/applications/science/math/wxmaxima/default.nix @@ -2,14 +2,14 @@ let name = "wxmaxima"; - version = "12.09.0"; + version = "13.04.1"; in stdenv.mkDerivation { name = "${name}-${version}"; src = fetchurl { - url = "mirror://sourceforge/${name}/wxMaxima-${version}.tar.gz"; - sha256 = "5803ab62fc791bcb87f0d0f38357dba6fccc4efa61cb9f709e142c2954b1305d"; + url = "mirror://sourceforge/${name}/wxMaxima/${version}/wxMaxima-${version}.tar.gz"; + sha256 = "0irp1m9vr50ym7wfj1c1vbrzd2pip1vmvn9ykqsdf04afkkwkran"; }; buildInputs = [wxGTK maxima makeWrapper]; diff --git a/pkgs/applications/science/misc/tulip/default.nix b/pkgs/applications/science/misc/tulip/default.nix index 84da60398227b5c475427143c6d3c6496e29adcf..1402dc9b1824c2fb1913b739828291d27ce870f0 100644 --- a/pkgs/applications/science/misc/tulip/default.nix +++ b/pkgs/applications/science/misc/tulip/default.nix @@ -1,13 +1,13 @@ { fetchurl, stdenv, libxml2, freetype, mesa, glew, qt4 , cmake, makeWrapper, libjpeg }: -let version = "4.1.0"; in +let version = "3.7.0"; in stdenv.mkDerivation rec { name = "tulip-${version}"; src = fetchurl { - url = "mirror://sourceforge/auber/${name}_src.tar.gz"; - sha256 = "1js1f8xdm9g2m66xbhfxa8ixzw6h4gjynxsm83p54l3i0hs3biig"; + url = "mirror://sourceforge/auber/tulip/tulip-3.7.0/${name}-src.tar.gz"; + sha256 = "150fj9pdxblvl5sby61cb2kq98r6h8yljk3vq5xizn198d3fz4jq"; }; buildInputs = [ libxml2 freetype glew mesa qt4 libjpeg ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { doCheck = false; meta = { - description = "A visualization framework for the analysis and visualization of relational data"; + description = "Tulip, a visualization framework for the analysis and visualization of relational data"; longDescription = '' Tulip is an information visualization framework dedicated to the diff --git a/pkgs/applications/science/spyder/default.nix b/pkgs/applications/science/spyder/default.nix index 6c0125e4b850f21a8234bc561802b771122872d8..cd2bd4fecf3d0bc9599d33535891e38d400d4b8a 100644 --- a/pkgs/applications/science/spyder/default.nix +++ b/pkgs/applications/science/spyder/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { cp spyderlib/images/spyder.svg $out/share/icons/ ''; - meta = { + meta = with stdenv.lib; { description = "Scientific PYthon Development EnviRonment (SPYDER)"; longDescription = '' Spyder (previously known as Pydee) is a powerful interactive development @@ -50,6 +50,8 @@ buildPythonPackage rec { testing, debugging and introspection features. ''; homepage = https://code.google.com/p/spyderlib/; - license = stdenv.lib.licenses.mit; + license = licenses.mit; + platforms = platforms.linux; + maintainers = [maintainers.bjornfor]; }; } diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix index 1a2e637bff06c6a0e73b498d24ce801f0f071cc2..f8809d27cc471c4d0a51b9d670fb40bdf1a420af 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation { name = "git-annex-${version}"; src = fetchurl { - url = "http://git.kitenet.net/?p=git-annex.git;a=snapshot;sf=tgz;h=${version}"; - sha256 = "0g89lmkrs02qdb1k1bfq9gz3j4yv35320vb8ddmj99f4nnhqc6vv"; + url = "https://github.com/joeyh/git-annex/tarball/${version}"; + sha256 = "1280sdj3d3s3k5a1znzl7xzzyncv9kz522bprhwb9if03v6xh2kl"; name = "git-annex-${version}.tar.gz"; }; diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 58071d86d4e5681c655da08a9544ffa3fbeb970c..f042b2e0faa5d67e9bf475e956a6007780b6f46b 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -10,7 +10,7 @@ let - version = "1.8.2.1"; + version = "1.8.2.3"; svn = subversionClient.override { perlBindings = true; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://git-core.googlecode.com/files/git-${version}.tar.gz"; - sha1 = "ad9f833e509ba31c83efe336fd3599e89a39394b"; + sha1 = "2831f7deec472db4d0d0cdffb4d82d91cecdf295"; }; patches = [ ./docbook2texi.patch ./symlinks-in-bin.patch ]; diff --git a/pkgs/applications/version-management/git-and-tools/tig/default.nix b/pkgs/applications/version-management/git-and-tools/tig/default.nix index ea9ce97be161d60959a943a0b2126d7172af7f14..20644d09dd70b79ee9bef1293d0bcc8658d91109 100644 --- a/pkgs/applications/version-management/git-and-tools/tig/default.nix +++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix @@ -13,10 +13,10 @@ stdenv.mkDerivation rec { mkdir -p $out/etc/bash_completion.d/ cp contrib/tig-completion.bash $out/etc/bash_completion.d/ ''; - meta = { + meta = with stdenv.lib; { homepage = "http://jonas.nitro.dk/tig/"; description = "Tig is a git repository browser that additionally can act as a pager for output from various git commands"; - maintainers = [ stdenv.lib.maintainers.garbas ]; - license = stdenv.lib.licenses.gpl2; + maintainers = [ maintainers.garbas maintainers.bjornfor ]; + license = licenses.gpl2; }; } diff --git a/pkgs/applications/version-management/kdesvn/default.nix b/pkgs/applications/version-management/kdesvn/default.nix index 59fb1f5a867f1711ff440296eed85f244aac15f3..29b8b306fe5428130c0ef9e2c8f6d7a47587758f 100644 --- a/pkgs/applications/version-management/kdesvn/default.nix +++ b/pkgs/applications/version-management/kdesvn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gettext, apr, aprutil, subversion, db4, kdelibs, expat }: +{ stdenv, fetchurl, gettext, apr, aprutil, subversion, db4, kdelibs }: stdenv.mkDerivation rec { name = "kdesvn-1.5.5"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { patches = [ ./docbook.patch ./virtual_inheritance.patch ]; - buildInputs = [ apr aprutil subversion db4 kdelibs expat ]; + buildInputs = [ apr aprutil subversion db4 kdelibs ]; nativeBuildInputs = [ gettext ]; diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 865033ae2d2641220547207ef697f8fed3cefe57..669aa5713a08c71dfafd27c3a4821d65f0ea5948 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -2,14 +2,15 @@ , guiSupport ? false, tk ? null, curses }: let - name = "mercurial-2.2.3"; + name = "mercurial-2.6.1"; in + stdenv.mkDerivation { inherit name; src = fetchurl { url = "http://mercurial.selenic.com/release/${name}.tar.gz"; - sha256 = "0yv7kn96270fixigry910c1i3zzivimh1xjxywqjn9dshn2y6qbw"; + sha256 = "0r4fg269xnqgacc82ppm3wxl9wwvvgwz8z6zi1iai4gx76iklhdn"; }; inherit python; # pass it so that the same version can be used in hg2git @@ -39,6 +40,12 @@ stdenv.mkDerivation { $WRAP_TK done + mkdir -p $out/etc/mercurial + cat >> $out/etc/mercurial/hgrc << EOF + [web] + cacerts = /etc/ssl/certs/ca-bundle.crt + EOF + # copy hgweb.cgi to allow use in apache mkdir -p $out/share/cgi-bin cp -v hgweb.cgi contrib/hgweb.wsgi $out/share/cgi-bin @@ -49,5 +56,6 @@ stdenv.mkDerivation { description = "A fast, lightweight SCM system for very large distributed projects"; homepage = "http://www.selenic.com/mercurial/"; license = "GPLv2"; + maintainers = [ stdenv.lib.maintainers.eelco ]; }; } diff --git a/pkgs/applications/video/gnash/default.nix b/pkgs/applications/video/gnash/default.nix index 4f2addcc99b0c4c218ca13da1151239d643ff1d0..db6bde782b99ee6d29acf12019eb1b8021811e90 100644 --- a/pkgs/applications/video/gnash/default.nix +++ b/pkgs/applications/video/gnash/default.nix @@ -3,7 +3,7 @@ , gst_ffmpeg, speex , libogg, libxml2, libjpeg, mesa, libpng, libungif, libtool , boost, freetype, agg, dbus, curl, pkgconfig, gettext -, glib, gtk, gtkglext, pangox_compat, x11, ming, dejagnu, python, perl +, glib, gtk, gtkglext, x11, ming, dejagnu, python, perl , freefont_ttf, haxe, swftools , lib, makeWrapper , xulrunner }: @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { gettext x11 SDL SDL_mixer gstreamer gst_plugins_base gst_plugins_good gst_ffmpeg speex libtool libogg libxml2 libjpeg mesa libpng libungif boost freetype agg - dbus curl pkgconfig glib gtk gtkglext pangox_compat + dbus curl pkgconfig glib gtk gtkglext xulrunner makeWrapper ] diff --git a/pkgs/applications/window-managers/openbox/default.nix b/pkgs/applications/window-managers/openbox/default.nix index 016325140e05bd503deb7d10bd638d0af774c128..e8314ef1b4333ab7b7a3a03aa3fe080d7c6686f7 100644 --- a/pkgs/applications/window-managers/openbox/default.nix +++ b/pkgs/applications/window-managers/openbox/default.nix @@ -1,13 +1,19 @@ -{ stdenv, fetchurl, pkgconfig, glib, pango, libxml2, libXau }: +{ stdenv, fetchurl, pkgconfig +, libxml2, libXinerama, libXcursor, libXau, libXrandr +, imlib2, pango, libstartup_notification }: stdenv.mkDerivation rec { - name = "openbox-3-4-11-2"; + name = "openbox-3.5.0"; - buildInputs = [ pkgconfig glib pango libxml2 libXau ]; + buildInputs = [ + pkgconfig libxml2 + libXinerama libXcursor libXau libXrandr + imlib2 pango libstartup_notification + ]; src = fetchurl { - url = http://openbox.org/dist/openbox/openbox-3.4.11.2.tar.gz; - sha256 = "2e7579389c30e6bb08cc721a2c1af512e049fec2670e71715aa1c4e129ec349d"; + url = "http://openbox.org/dist/openbox/${name}.tar.gz"; + sha256 = "02pa1wa2rzvnq1z3xchzafc96hvp3537jh155q8acfhbacb01abg"; }; meta = { diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix deleted file mode 100644 index 2c1044d69372e8b09e08df0ca195642429cc0313..0000000000000000000000000000000000000000 --- a/pkgs/applications/window-managers/weston/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, wayland, mesa, libxkbcommon -, cairo, libxcb, libXcursor, x11, udev, libdrm, mtdev -, libjpeg, pam, autoconf, automake, libtool }: - -let version = "1.0.5"; in - -stdenv.mkDerivation rec { - name = "weston-${version}"; - - src = fetchurl { - url = "http://wayland.freedesktop.org/releases/${name}.tar.xz"; - sha256 = "0g2k82pnlxl8b70ykazj7kn8xffjfsmgcgx427qdrm4083z2hgm0"; - }; - - buildInputs = [ pkgconfig wayland mesa libxkbcommon - cairo libxcb libXcursor x11 udev libdrm mtdev - libjpeg pam autoconf automake libtool ]; - - preConfigure = "autoreconf -vfi"; - - # prevent install target to chown root weston-launch, which fails - configureFlags = '' - --disable-setuid-install - ''; - - meta = { - description = "Reference implementation of a Wayland compositor"; - homepage = http://wayland.freedesktop.org/; - license = stdenv.lib.licenses.mit; - }; -} diff --git a/pkgs/build-support/fetchhg/builder.sh b/pkgs/build-support/fetchhg/builder.sh index fbdd12b4f055d0766274f80c1139483bb2a7344d..73ec7ec0b36219e1d6f531cf403d02d4e0ec8f0e 100644 --- a/pkgs/build-support/fetchhg/builder.sh +++ b/pkgs/build-support/fetchhg/builder.sh @@ -2,7 +2,7 @@ source $stdenv/setup header "getting $url${tag:+ ($tag)} into $out" -hg clone ${tag:+-r "$tag"} "$url" "$out" +hg clone --insecure ${tag:+-r "$tag"} "$url" "$out" rm -rf "$out/.hg" diff --git a/pkgs/build-support/fetchurl/builder.sh b/pkgs/build-support/fetchurl/builder.sh index 177b1e016a6b07005e48381d08def561eecc06b5..402fe0cba5b8a80ec2727a4ae070e39a40493df9 100644 --- a/pkgs/build-support/fetchurl/builder.sh +++ b/pkgs/build-support/fetchurl/builder.sh @@ -13,6 +13,7 @@ curl="curl \ --disable-epsv \ --cookie-jar cookies \ --insecure \ + $curlOpts \ $NIX_CURL_FLAGS" diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix index 09816d9ba8e4fd530c08a9a32ea5b12de2229bd0..6c981229531a85ce3751b4b43cc53ec3de32bb4a 100644 --- a/pkgs/build-support/fetchurl/default.nix +++ b/pkgs/build-support/fetchurl/default.nix @@ -47,6 +47,9 @@ in # locations. They are tried in order. urls ? [] +, # Additional curl options needed for the download to succeed. + curlOpts ? "" + , # Name of the file. If empty, use the basename of `url' (or of the # first element of `urls'). name ? "" @@ -97,7 +100,7 @@ stdenv.mkDerivation { outputHash = if outputHash != "" then outputHash else if sha256 != "" then sha256 else if sha1 != "" then sha1 else md5; - inherit showURLs mirrorsFile impureEnvVars; + inherit curlOpts showURLs mirrorsFile impureEnvVars; # Doing the download on a remote machine just duplicates network # traffic, so don't do that. diff --git a/pkgs/build-support/kdewrapper/default.nix b/pkgs/build-support/kdewrapper/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..be90011f49397d9de168d57bece97b8bb607f418 --- /dev/null +++ b/pkgs/build-support/kdewrapper/default.nix @@ -0,0 +1,42 @@ +{ stdenv, kde4, shared_mime_info, extraLibs ? [] }: + +/* Supply a KDE program, and it will have the necessary KDE vars to + get icons, mime types, etc. working. + For example: + + packageOverrides = pkgs : { + kdenliveWrapped = kde4.wrapper kde4.kdenlive; + }; + */ +program: + +let + libs = with kde4; [ kdelibs kde_runtime oxygen_icons shared_mime_info ] + ++ extraLibs; +in +stdenv.mkDerivation { + name = program.name + "-wrapped"; + + inherit libs; + + buildCommand = '' + ensureDir $out/bin + + KDEDIRS=${program} + QT_PLUGIN_PATH=${program}/lib/qt4/plugins:${program}/lib/kde4/plugins + for a in $libs; do + KDEDIRS=$a''${KDEDIRS:+:}$KDEDIRS + QT_PLUGIN_PATH=$a/lib/qt4/plugins:$a/lib/kde4/plugins''${QT_PLUGIN_PATH:+:}$QT_PLUGIN_PATH + done + for a in ${program}/bin/*; do + PROG=$out/bin/`basename $a` + cat > $PROG << END + #!/bin/sh + export KDEDIRS=$KDEDIRS\''${KDEDIRS:+:}\$KDEDIRS + export QT_PLUGIN_PATH=$QT_PLUGIN_PATH\''${QT_PLUGIN_PATH:+:}\$QT_PLUGIN_PATH + exec $a "\$@" + END + chmod +x $PROG + done + ''; +} diff --git a/pkgs/build-support/upstream-updater/urls-from-page.sh b/pkgs/build-support/upstream-updater/urls-from-page.sh index 3c494114e9146d19f04aad67e18fb10553ea4aea..d456794a563dc2c2dbfa274695765a19d87473bf 100755 --- a/pkgs/build-support/upstream-updater/urls-from-page.sh +++ b/pkgs/build-support/upstream-updater/urls-from-page.sh @@ -9,6 +9,6 @@ relpath="${path#$server}" echo "URL: $url" >&2 -curl -L -k "$url" | sed -re 's/^/-/;s/[hH][rR][eE][fF]=("([^"]*)"|([^" <>&]+)[ <>&])/\n+\2\3\n-/g' | \ +curl -L -k "$url" | sed -re 's/^/-/;s/[hH][rR][eE][fF]=("([^"]*)"|'\''([^'\'']*)'\''|([^"'\'' <>&]+)[ <>&])/\n+\2\3\4\n-/g' | \ sed -e '/^-/d; s/^[+]//; /^#/d;'"s/^\\//$protocol:\\/\\/$server\\//g" | \ sed -re 's`^[^:]*$`'"$protocol://$basepath/&\`" diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index e8351089ed2937e2954ecd713a9acb5e62c1f966..b1eb82ed830381a35d71c3ba6e76f638bac68ee6 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -1,9 +1,9 @@ { pkgs -, linuxKernel ? pkgs.linux +, linuxKernel ? pkgs.linux_3_9 , img ? "bzImage" , rootModules ? [ "cifs" "virtio_net" "virtio_pci" "virtio_blk" "virtio_balloon" "nls_utf8" "ext2" "ext3" - "ext4" "unix" "hmac" "md4" "ecb" "des_generic" + "ext4" "unix" "hmac" "md4" "ecb" "des_generic" "sha256" ] }: @@ -123,14 +123,14 @@ rec { echo "mounting Nix store..." mkdir -p /fs/nix/store - mount -t cifs //10.0.2.4/store /fs/nix/store -o guest,sec=none + mount -t cifs //10.0.2.4/store /fs/nix/store -o guest,sec=none,sec=ntlm mkdir -p /fs/tmp mount -t tmpfs -o "mode=755" none /fs/tmp echo "mounting host's temporary directory..." mkdir -p /fs/tmp/xchg - mount -t cifs //10.0.2.4/xchg /fs/tmp/xchg -o guest,sec=none + mount -t cifs //10.0.2.4/xchg /fs/tmp/xchg -o guest,sec=none,sec=ntlm mkdir -p /fs/proc mount -t proc none /fs/proc @@ -445,7 +445,7 @@ rec { etc. from the specified filesystem image, which typically is a filesystem containing a non-NixOS Linux distribution. */ - runInLinuxImage = attrs: runInLinuxVM (attrs // { + runInLinuxImage = drv: runInLinuxVM (lib.overrideDerivation drv (attrs: { mountDisk = true; /* Mount `image' as the root FS, but use a temporary copy-on-write @@ -470,7 +470,7 @@ rec { /* Don't run Nix-specific build steps like patchelf. */ fixupPhase = "true"; - }); + })); /* Create a filesystem image of the specified size and fill it with @@ -492,8 +492,6 @@ rec { chroot=$(type -tP chroot) - ${utillinux}/bin/mount -t proc none /mnt/proc - # Make the Nix store available in /mnt, because that's where the RPMs live. mkdir -p /mnt/nix/store ${utillinux}/bin/mount -o bind /nix/store /mnt/nix/store @@ -506,6 +504,7 @@ rec { ln -s /usr/sbin /mnt/sbin ln -s /usr/lib /mnt/lib ln -s /usr/lib64 /mnt/lib64 + ${utillinux}/bin/mount -t proc none /mnt/proc ''} echo "unpacking RPMs..." @@ -533,7 +532,7 @@ rec { rm /mnt/.debug - ${utillinux}/bin/umount /mnt/nix/store /mnt/tmp /mnt/proc + ${utillinux}/bin/umount /mnt/nix/store /mnt/tmp ${lib.optionalString unifiedSystemDir "/mnt/proc"} ${utillinux}/bin/umount /mnt ''; diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix index 7349ab3e98288def3bcf4ac6f5430fa7bca393ea..711ebc9e88fb9ed23d0531c4c67b6c56b4afe8ef 100644 --- a/pkgs/data/misc/cacert/default.nix +++ b/pkgs/data/misc/cacert/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "cacert-20120628"; + name = "cacert-20121229"; src = fetchurl { url = "http://nixos.org/tarballs/${name}.pem.bz2"; - sha256 = "0xg9f1w2pmsv221lgc60c07bs0xf2rr189a2yp2y9an95h3gx7ir"; + sha256 = "031s86pqvn620zkj6w97hqgjvkp6vsvlymzz7rwvkv25zvrjsgif"; }; unpackPhase = "true"; diff --git a/pkgs/data/misc/freepats/default.nix b/pkgs/data/misc/freepats/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..21f34a607d4f0273bde418878add79bf0ca40ea1 --- /dev/null +++ b/pkgs/data/misc/freepats/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "freepats-20060219"; + + src = fetchurl { + url = "http://freepats.zenvoid.org/${name}.tar.bz2"; + sha256 = "12iw36rd94zirll96cd5k0va7p5hxmf2shvjlhzihcmjaw8flq82"; + }; + + installPhase = ''mkdir "$out"; cp -r . "$out"''; + + meta = with stdenv.lib; { + description = "Instrument patches, for MIDI synthesizers"; + longDescription = '' + Freepats is a project to create a free and open set of instrument + patches, in any format, that can be used with softsynths. + ''; + homepage = http://freepats.zenvoid.org/; + license = licenses.gpl2; + platforms = platforms.all; + maintainers = [maintainers.bjornfor]; + }; +} diff --git a/pkgs/data/misc/gsettings-desktop-schemas/default.nix b/pkgs/data/misc/gsettings-desktop-schemas/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..c934863d75d7734d2d119c65abb088caf29e9586 --- /dev/null +++ b/pkgs/data/misc/gsettings-desktop-schemas/default.nix @@ -0,0 +1,17 @@ +{ stdenv, fetchurl, glib, pkgconfig, intltool }: + +stdenv.mkDerivation { + name = "gsettings-desktop-schemas-3.2.0"; + + src = fetchurl { + url = mirror://gnome/sources/gsettings-desktop-schemas/3.2/gsettings-desktop-schemas-3.2.0.tar.xz; + sha256 = "0772axkd1nlf3j1lcg0zi5x5jh4zmr25k98dhn7pzppahljaj3hi"; + }; + + buildInputs = [ glib ]; + nativeBuildInputs = [ pkgconfig intltool ]; + + meta = { + inherit (glib.meta) maintainers platforms; + }; +} diff --git a/pkgs/data/misc/poppler-data/default.nix b/pkgs/data/misc/poppler-data/default.nix index 9e2679c04380ec341e9f89071037ad213643a900..14a41cf84fc929d3b5045cef75b9b0c55d035e39 100644 --- a/pkgs/data/misc/poppler-data/default.nix +++ b/pkgs/data/misc/poppler-data/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, cmake }: stdenv.mkDerivation rec { - name = "poppler-data-0.4.6"; + name = "poppler-data-0.4.5"; src = fetchurl { url = "http://poppler.freedesktop.org/${name}.tar.gz"; - sha256 = "1yhaz74b50hjkz3ii077kmq3qg3p3kdyxm33cv6r1njvz8fr01pk"; + sha256 = "1zbh1zd083wfwrcw7vxc2bn32h42y6iyh24syxcb3r5ggd2vr41i"; }; buildInputs = [ cmake ]; @@ -23,7 +23,6 @@ stdenv.mkDerivation rec { homepage = http://poppler.freedesktop.org/; description = "Encoding files for Poppler, a PDF rendering library"; platforms = stdenv.lib.platforms.all; - license = "free"; # more free licenses combined maintainers = [ stdenv.lib.maintainers.urkud ]; }; } diff --git a/pkgs/desktops/gnome-2/bindings/python-rsvg/default.nix b/pkgs/desktops/gnome-2/bindings/python-rsvg/default.nix index 1e2faf3af84f78074f2b4af2383d59f07a244f52..c09ed74a97c0de56b9f3fbdf4e1a53f6e2043bfb 100644 --- a/pkgs/desktops/gnome-2/bindings/python-rsvg/default.nix +++ b/pkgs/desktops/gnome-2/bindings/python-rsvg/default.nix @@ -1,26 +1,24 @@ -{ stdenv, fetchurl, gnome, librsvg, pkgconfig, pygtk, python, gtk }: +{ stdenv, fetchurl, gnome, librsvg, pkgconfig, pygtk, python }: stdenv.mkDerivation rec { - ver_maj = "2.32"; - ver_min = "0"; - version = "${ver_maj}.${ver_min}"; + version = "2.32"; name = "python-rsvg-${version}"; src = fetchurl { - url = "mirror://gnome/sources/gnome-python-desktop/${ver_maj}/gnome-python-desktop-${version}.tar.bz2"; - sha256 = "1s8f9rns9v7qlwjv9qh9lr8crp88dpzfm45hj47zc3ivpy0dbnq9"; + url = "mirror://gnome/sources/gnome-python-desktop/${version}/gnome-python-desktop-${version}.0.tar.gz"; + sha256 = "1xhh3h1qdnimydvv55pmqwyzjchhjwfvp951sjlq0180kskqrlj5"; }; configurePhase = '' - sed -e "s@{PYTHONDIR}/gtk-2.0@{PYTHONDIR}/@" -i rsvg/wscript - python waf configure --enable-modules=rsvg --prefix=$out + sed -e "s@{PYTHONDIR}/gtk-2.0@{PYTHONDIR}/@" -i rsvg/wscript + python waf configure --enable-modules=rsvg --prefix=$out ''; buildPhase = "python waf build"; installPhase = "python waf install"; - buildInputs = [ gtk gnome.gnome_python librsvg pkgconfig pygtk python ]; + buildInputs = [ gnome.gnome_python librsvg pkgconfig pygtk python ]; meta = with stdenv.lib; { homepage = "http://www.pygtk.org"; diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix index 3d76ba72daeb2a78792205980a2397e3a5d5f085..38ae4c01534251ff159e0cb7cefc239b4bb08e68 100644 --- a/pkgs/desktops/gnome-2/default.nix +++ b/pkgs/desktops/gnome-2/default.nix @@ -29,6 +29,8 @@ libgtkhtml = callPackage ./platform/libgtkhtml { }; + intltool = callPackage ./platform/intltool { }; + GConf = callPackage ./platform/GConf { }; gconfmm = callPackage ./platform/gconfmm { }; diff --git a/pkgs/desktops/gnome-2/platform/ORBit2/default.nix b/pkgs/desktops/gnome-2/platform/ORBit2/default.nix index 22c22c6bcf50b42e4e1ecbffa5f17b9811fe831d..ec6931724bc28841f1eca5a686ee179d94d677db 100644 --- a/pkgs/desktops/gnome-2/platform/ORBit2/default.nix +++ b/pkgs/desktops/gnome-2/platform/ORBit2/default.nix @@ -9,10 +9,6 @@ stdenv.mkDerivation rec { sha256 = "0l3mhpyym9m5iz09fz0rgiqxl2ym6kpkwpsp1xrr4aa80nlh1jam"; }; - preBuild = '' - sed 's/-DG_DISABLE_DEPRECATED//' -i linc2/src/Makefile - ''; - nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ glib libIDL ]; } diff --git a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix index 55daa496afc7c6a04720e42d3f806fb717e389f5..0215b341f934a61b95a1cba3c169d59ea96d28c6 100644 --- a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix +++ b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix @@ -16,6 +16,4 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = [ GConf glib ]; - - postPatch = "find . -name Makefile.in | xargs sed 's/-DG_DISABLE_DEPRECATED//g' -i "; } diff --git a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix index 903387f50b14bf4ce8eebc211e56c72916bb3b31..4eab4b8213c69a20521f9ad904f1a029080c46f9 100644 --- a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix +++ b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, gtk, mesa, pango, pangox_compat, xlibs }: +{ stdenv, fetchurl, pkgconfig, gtk, mesa, pango }: stdenv.mkDerivation rec { name = "gtkglext-1.2.0"; @@ -8,8 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0lbz96jwz57hnn52b8rfj54inwpwcc9fkdq6ya043cgnfih77g8n"; }; - buildInputs = with xlibs; - [ pkgconfig glib gtk mesa pango pangox_compat libX11 libXmu ]; + buildInputs = [ pkgconfig gtk mesa pango ]; # The library uses `GTK_WIDGET_REALIZED', `GTK_WIDGET_TOPLEVEL', and # `GTK_WIDGET_NO_WINDOW', all of which appear to be deprecated nowadays. diff --git a/pkgs/desktops/gnome-2/platform/intltool/default.nix b/pkgs/desktops/gnome-2/platform/intltool/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..51eaa4a2cf48d824b1bc2ab8d2690174b0ecfc03 --- /dev/null +++ b/pkgs/desktops/gnome-2/platform/intltool/default.nix @@ -0,0 +1,13 @@ +{stdenv, fetchurl, pkgconfig, perl, perlXMLParser, gettext}: + +stdenv.mkDerivation rec { + name = "intltool-0.40.6"; + + src = fetchurl { + url = mirror://gnome/sources/intltool/0.40/intltool-0.40.6.tar.bz2; + sha256 = "0r1vkvy5xzqk01yl6a0xlrry39bra24alkrx6279b77hc62my7jd"; + }; + + buildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ perl perlXMLParser gettext ]; +} diff --git a/pkgs/desktops/gnome-2/platform/libbonobo/default.nix b/pkgs/desktops/gnome-2/platform/libbonobo/default.nix index 2303fb15a6f15a0b83d88a76965ba309e97729b4..79c41f924d3f6438e4a6718ce75ca91ea25154b2 100644 --- a/pkgs/desktops/gnome-2/platform/libbonobo/default.nix +++ b/pkgs/desktops/gnome-2/platform/libbonobo/default.nix @@ -10,9 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0swp4kk6x7hy1rvd1f9jba31lvfc6qvafkvbpg9h0r34fzrd8q4i"; }; - preConfigure = # still using stuff deprecated in new glib versions - "sed 's/-DG_DISABLE_DEPRECATED//g' -i configure activation-server/Makefile.in"; - + preConfigure = "export USER=`whoami`"; nativeBuildInputs = [ flex bison pkgconfig intltool procps ]; buildInputs = [ libxml2 ]; propagatedBuildInputs = [ popt glib ORBit2 ]; diff --git a/pkgs/desktops/gnome-2/platform/libgnome/default.nix b/pkgs/desktops/gnome-2/platform/libgnome/default.nix index 5ab6d5e813d6acd7c7a2c3f9fffb0e96f8a0474a..37dbfd1296114fca3e1c7c9e79e0c4535d0acb8f 100644 --- a/pkgs/desktops/gnome-2/platform/libgnome/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnome/default.nix @@ -9,9 +9,7 @@ stdenv.mkDerivation rec { major = "2"; minor = "32"; patchlevel = "1"; sha256 = "197pnq8y0knqjhm2fg4j6hbqqm3qfzfnd0irhwxpk1b4hqb3kimj"; }; - - patches = [ ./new-glib.patch ]; - + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ popt zlib intltool GConf gnome_vfs libcanberra libtool ]; propagatedBuildInputs = [ glib libbonobo ]; diff --git a/pkgs/desktops/gnome-2/platform/libgnome/new-glib.patch b/pkgs/desktops/gnome-2/platform/libgnome/new-glib.patch deleted file mode 100644 index ceabfbdd158e6c22df3070d302749fb6bf9c5fa8..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-2/platform/libgnome/new-glib.patch +++ /dev/null @@ -1,65 +0,0 @@ -Porting libgnome to newer glib: - * remove g_thread_init and g_thread_supported, which are longer needed - https://developer.gnome.org/glib/2.36/glib-Deprecated-Thread-APIs.html#g-thread-init - * replace GStaticRecMutex by GRecMutex - https://developer.gnome.org/glib/2.36/glib-Deprecated-Thread-APIs.html#GStaticRecMutex - -diff --git a/libgnome/gnome-i18n.c b/libgnome/gnome-i18n.c -index 531c56c..f13d61e 100644 ---- a/libgnome/gnome-i18n.c -+++ b/libgnome/gnome-i18n.c -@@ -55,12 +55,14 @@ - const GList * - gnome_i18n_get_language_list (const gchar *ignored) - { -- static GStaticRecMutex lang_list_lock = G_STATIC_REC_MUTEX_INIT; -+ static GRecMutex lang_list_lock; -+ g_rec_mutex_init (&lang_list_lock); -+ - static GList *list = NULL; - const char * const* langs; - int i; - -- g_static_rec_mutex_lock (&lang_list_lock); -+ g_rec_mutex_lock (&lang_list_lock); - - if (list == NULL) { - langs = g_get_language_names (); -@@ -71,7 +73,7 @@ gnome_i18n_get_language_list (const gchar *ignored) - list = g_list_reverse (list); - } - -- g_static_rec_mutex_unlock (&lang_list_lock); -+ g_rec_mutex_unlock (&lang_list_lock); - - return list; - } -diff --git a/libgnome/gnome-init.c b/libgnome/gnome-init.c -index fe3efd4..c6619af 100644 ---- a/libgnome/gnome-init.c -+++ b/libgnome/gnome-init.c -@@ -115,9 +115,6 @@ gnome_bonobo_module_info_get (void) - static void - bonobo_activation_pre_args_parse (GnomeProgram *program, GnomeModuleInfo *mod_info) - { -- if (!g_thread_supported ()) -- g_thread_init (NULL); -- - if (!bonobo_activation_is_initialized ()) - bonobo_activation_preinit (program, mod_info); - } -diff --git a/libgnome/gnome-program.c b/libgnome/gnome-program.c -index 739765e..cd14999 100644 ---- a/libgnome/gnome-program.c -+++ b/libgnome/gnome-program.c -@@ -1878,10 +1878,6 @@ gnome_program_init (const char *app_id, const char *app_version, - GnomeProgram *program; - va_list args; - -- /* g_thread_init() has to be the first GLib function called ever */ -- if (!g_threads_got_initialized) -- g_thread_init (NULL); -- - g_type_init (); - - va_start(args, first_property_name); diff --git a/pkgs/desktops/gnome-3/core/at-spi2-atk/default.nix b/pkgs/desktops/gnome-3/core/at-spi2-atk/default.nix deleted file mode 100644 index 948774572670d5ae6ae810423de3cb5b35193240..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/at-spi2-atk/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ stdenv, fetchurl, python, pkgconfig, popt, atk, libX11, libICE, xlibs, libXi -, intltool, dbus_glib, at_spi2_core, libSM }: - -stdenv.mkDerivation rec { - versionMajor = "2.8"; - versionMinor = "0"; - moduleName = "at-spi2-atk"; - name = "${moduleName}-${versionMajor}.${versionMinor}"; - - src = fetchurl { - url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; - sha256 = "085sqww174vl3i9ccb477v706rkjs2d107rl96ma1kbl2jyar226"; - }; - - buildInputs = [ python pkgconfig popt atk libX11 libICE xlibs.libXtst libXi - intltool dbus_glib at_spi2_core libSM ]; -} diff --git a/pkgs/desktops/gnome-3/core/at-spi2-core/default.nix b/pkgs/desktops/gnome-3/core/at-spi2-core/default.nix deleted file mode 100644 index 2d433486677a4799a0e0c3513b480260a37c4543..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/at-spi2-core/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchurl, python, pkgconfig, popt, intltool, dbus_glib -, libX11, xextproto, libSM, libICE, libXtst, libXi }: - -stdenv.mkDerivation rec { - - versionMajor = "2.8"; - versionMinor = "0"; - moduleName = "at-spi2-core"; - name = "${moduleName}-${versionMajor}.${versionMinor}"; - - src = fetchurl { - url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; - sha256 = "0n64h6j10sn90ds9y70d9wlvvsbwnrym9fm0cyjxb0zmqw7s6q8q"; - }; - - buildInputs = [ - python pkgconfig popt intltool dbus_glib - libX11 xextproto libSM libICE libXtst libXi - ]; - - # ToDo: on non-NixOS we create a symlink from there? - configureFlags = "--with-dbus-daemondir=/run/current-system/sw/bin/"; -} diff --git a/pkgs/desktops/gnome-3/core/evince/default.nix b/pkgs/desktops/gnome-3/core/evince/default.nix deleted file mode 100644 index de49bffc419edf79d93acb46e87653dc081b3e75..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/evince/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, intltool, perl, perlXMLParser, libxml2 -, glib, gtk3, pango, atk, gdk_pixbuf, shared_mime_info -, itstool, gnome_icon_theme, libgnome_keyring, gsettings_desktop_schemas -, poppler, ghostscriptX, djvulibre, libspectre -, makeWrapper #, python /*just for tests*/ -, recentListSize ? null # 5 is not enough, allow passing a different number -}: - -stdenv.mkDerivation rec { - name = "evince-3.6.1"; - - src = fetchurl { - url = "http://ftp.gnome.org/pub/GNOME/sources/evince/3.6/${name}.tar.xz"; - sha256 = "1da1pij030dh8mb0pr0jnyszgsbjnh8lc17rj5ii52j3kmbv51qv"; - }; - - buildInputs = [ - pkgconfig intltool perl perlXMLParser libxml2 - glib gtk3 pango atk gdk_pixbuf - itstool gnome_icon_theme libgnome_keyring gsettings_desktop_schemas - poppler ghostscriptX djvulibre libspectre - makeWrapper - ]; - - configureFlags = [ - "--disable-nautilus" # Do not use nautilus - "--disable-dbus" # strange compilation error - ]; - - preConfigure = with stdenv.lib; - optionalString doCheck '' - for file in test/*.py; do - echo "patching $file" - sed '1s,/usr,${python},' -i "$file" - done - '' + optionalString (recentListSize != null) '' - sed -i 's/\(gtk_recent_chooser_set_limit .*\)5)/\1${builtins.toString recentListSize})/' shell/ev-open-recent-action.c - sed -i 's/\(if (++n_items == \)5\(.*\)/\1${builtins.toString recentListSize}\2/' shell/ev-window.c - ''; - - postInstall = '' - # Tell Glib/GIO about the MIME info directory, which is used - # by `g_file_info_get_content_type ()'. - wrapProgram "$out/bin/evince" \ - --prefix XDG_DATA_DIRS : "${shared_mime_info}/share:$out/share" - '' + gsettings_desktop_schemas.doCompileSchemas; - doCheck = false; # would need pythonPackages.dogTail, which is missing - - meta = { - homepage = http://www.gnome.org/projects/evince/; - description = "GNOME's document viewer"; - - longDescription = '' - Evince is a document viewer for multiple document formats. It - currently supports PDF, PostScript, DjVu, TIFF and DVI. The goal - of Evince is to replace the multiple document viewers that exist - on the GNOME Desktop with a single simple application. - ''; - - license = "GPLv2+"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gconf/default.nix b/pkgs/desktops/gnome-3/core/gconf/default.nix deleted file mode 100644 index 9ca9c227d5863a0c21e23a6b4742c3cbc19cad3c..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/gconf/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, dbus_glib, gtk, glib, libxml2 -, intltool, polkit, orbit }: - -stdenv.mkDerivation rec { - - versionMajor = "3.2"; - versionMinor = "5"; - moduleName = "GConf"; - - origName = "${moduleName}-${versionMajor}.${versionMinor}"; - - name = "gconf-${versionMajor}.${versionMinor}"; - - src = fetchurl { - url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${origName}.tar.xz"; - sha256 = "1ijqks0jxc4dyfxg4vnbqds4aj6miyahlsmlqlkf2bi1798akpjd"; - }; - - buildInputs = [ libxml2 polkit gtk orbit ]; - propagatedBuildInputs = [ glib dbus_glib ]; - nativeBuildInputs = [ pkgconfig intltool ]; - - # ToDo: ldap reported as not found but afterwards reported as supported - - meta = { - homepage = http://projects.gnome.org/gconf/; - description = "A system for storing application preferences"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gcr/default.nix b/pkgs/desktops/gnome-3/core/gcr/default.nix deleted file mode 100644 index cf9774c5511cf4898f3c04238af6e19c7ead2ba1..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/gcr/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gnupg, p11_kit, glib -, libgcrypt, libtasn1, dbus_glib, gtk, pango, gdk_pixbuf, atk }: - -stdenv.mkDerivation rec { - name = "gcr-3.6.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gcr/3.6/${name}.tar.xz"; - sha256 = "16xyqxv2hxl3a4m8ahilqcf1ps58w1ijh8dav1l5nqz36ljdn2gp"; - }; - - buildInputs = [ - pkgconfig intltool gnupg p11_kit glib - libgcrypt libtasn1 dbus_glib gtk pango gdk_pixbuf atk - ]; - - #doCheck = true; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-icon-theme/default.nix b/pkgs/desktops/gnome-3/core/gnome-icon-theme/default.nix deleted file mode 100644 index 303bcd2208ce6c4669a038f8bd1792fbd3c0ad76..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-icon-theme/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, gtk }: - -stdenv.mkDerivation rec { - name = "gnome-icon-theme-3.6.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-icon-theme/3.6/${name}.tar.xz"; - sha256 = "0i8hkx2c1g5ckrvbkvs9n47i8fby8p9xs6p5l0mxdx9aq4smak9i"; - }; - - nativeBuildInputs = [ pkgconfig intltool iconnamingutils gtk ]; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix deleted file mode 100644 index 5983b74c0f45c9e3bafacd09cc32311e128ade2c..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, python, glib -, gtk3, intltool, gconf, libgnome_keyring, pango, gcr, gdk_pixbuf, atk, p11_kit }: - -stdenv.mkDerivation rec { - name = "gnome-keyring-3.6.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-keyring/3.6/${name}.tar.xz"; - sha256 = "1mhc2c0qswfjqi2spdvh19b7npfkjf1k40q6v7fja4qpc26maq5f"; - }; - - buildInputs = [ - dbus libgcrypt pam python gtk3 gconf libgnome_keyring - pango gcr gdk_pixbuf atk p11_kit - ]; - - propagatedBuildInputs = [ glib libtasn1 ]; - - nativeBuildInputs = [ pkgconfig intltool ]; - - configureFlags = [ - "--with-ca-certificates=/etc/ssl/certs/ca-bundle.crt" # NixOS hardcoded path - "--with-pkcs11-config=$$out/etc/pkcs11/" # installation directories - "--with-pkcs11-modules=$$out/lib/pkcs11/" - ]; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix deleted file mode 100644 index 41fdcc8086b1f9988de789bbdb552bf378e30d7f..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, cairo, libxml2, libxslt, gnome3, pango -, gnome_doc_utils, intltool, libX11, which, gconf }: - -stdenv.mkDerivation rec { - - versionMajor = "3.4"; - versionMinor = "1.1"; - - name = "gnome-terminal-${versionMajor}.${versionMinor}"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-terminal/${versionMajor}/${name}.tar.xz"; - sha256 = "1p9zqjmkxryf2kyghhhwwpsh4kd8y1jzzwc9zxghmpxszi9a5m0l"; - }; - - configureFlags = "--disable-scrollkeeper"; - buildInputs = [ gnome3.gtk gnome3.gsettings_desktop_schemas gnome3.vte gconf ]; - - nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which ]; -} diff --git a/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix b/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix deleted file mode 100644 index 9c13539a1cc6b83a3147ccbcc401fb75b16c96a7..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib - # just for passthru -, gtk3, gsettings_desktop_schemas }: - -stdenv.mkDerivation rec { - - versionMajor = "3.6"; - versionMinor = "1"; - moduleName = "gsettings-desktop-schemas"; - - name = "${moduleName}-${versionMajor}.${versionMinor}"; - - src = fetchurl { - url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; - sha256 = "1rk71q2rky9nzy0zb5jsvxa62vhg7dk65kdgdifq8s761797ga6r"; - }; - - buildInputs = [ glib ]; - - nativeBuildInputs = [ pkgconfig intltool ]; - - passthru = { - doCompileSchemas = '' - for pkg in "${gsettings_desktop_schemas}" "${gtk3}"; do - cp -s $pkg/share/glib-2.0/schemas/*.gschema.xml $out/share/glib-2.0/schemas/ - done - ${glib}/bin/glib-compile-schemas $out/share/glib-2.0/schemas/ - ''; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gvfs/default.nix b/pkgs/desktops/gnome-3/core/gvfs/default.nix deleted file mode 100644 index 1eea518c4b7f9fe23a978a9618d40e4fbcc9e328..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/gvfs/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, dbus_libs, samba, libarchive, fuse, libgphoto2 -, libcdio, libxml2, libtool, glib, intltool, gconf, libgnome_keyring, libsoup -, udev, avahi, libxslt, docbook_xsl }: - -stdenv.mkDerivation rec { - name = "gvfs-1.14.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gvfs/1.14/${name}.tar.xz"; - sha256 = "1g4ghyf45jg2ajdkv2d972hbckyjh3d9jdrppai85pl9pk2dmfy3"; - }; - - buildInputs = - [ glib dbus_libs udev samba libarchive fuse libgphoto2 libcdio libxml2 gconf - libgnome_keyring libsoup avahi libtool libxslt docbook_xsl - ]; - - nativeBuildInputs = [ pkgconfig intltool ]; - - enableParallelBuilding = true; -} diff --git a/pkgs/desktops/gnome-3/core/libcroco/default.nix b/pkgs/desktops/gnome-3/core/libcroco/default.nix deleted file mode 100644 index 70c1db8c02751b3e909c202d67d10965af6678b1..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/libcroco/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{stdenv, fetchurl, pkgconfig, libxml2, glib}: - -stdenv.mkDerivation rec { - name = "libcroco-0.6.6"; # 3.6.2 release - - src = fetchurl { - url = "mirror://gnome/sources/libcroco/0.6/${name}.tar.xz"; - sha256 = "1nbb12420v1zacn6jwa1x4ixikkcqw66sg4j5dgs45nhygiarv3j"; - }; - buildInputs = [ pkgconfig libxml2 glib ]; -} diff --git a/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix deleted file mode 100644 index a5d196ae1e32654fa6f7c62b2a10f04c95daff26..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ stdenv, fetchurl, glib, dbus_libs, libgcrypt, pkgconfig, intltool }: - -stdenv.mkDerivation rec { - name = "libgnome-keyring-3.6.0"; - - src = fetchurl { - url = "mirror://gnome/sources/libgnome-keyring/3.6/${name}.tar.xz"; - sha256 = "0c4qrjpmv1hqga3xv6wsq2z10x2n78qgw7q3k3s01y1pggxkgjkd"; - }; - - propagatedBuildInputs = [ glib dbus_libs libgcrypt ]; - nativeBuildInputs = [ pkgconfig intltool ]; - - meta = { - inherit (glib.meta) platforms maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/core/libgweather/default.nix b/pkgs/desktops/gnome-3/core/libgweather/default.nix deleted file mode 100644 index 78ae94c1a33a6811a2e7330d7048642d2b267eb5..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/libgweather/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, gtk, intltool, libsoup, gconf -, pango, gdk_pixbuf, atk }: - -stdenv.mkDerivation rec { - name = "libgweather-3.6.2"; - - src = fetchurl { - url = "mirror://gnome/sources/libgweather/3.6/${name}.tar.xz"; - sha256 = "1c50m0zrnfh4g58rzf33dfw8ggslj38c61p8a75905bmj3rfyahg"; - }; - configureFlags = if stdenv ? glibc then "--with-zoneinfo-dir=${stdenv.glibc}/share/zoneinfo" else ""; - propagatedBuildInputs = [ libxml2 gtk libsoup gconf pango gdk_pixbuf atk ]; - nativeBuildInputs = [ pkgconfig intltool ]; -} diff --git a/pkgs/desktops/gnome-3/core/vte/default.nix b/pkgs/desktops/gnome-3/core/vte/default.nix deleted file mode 100644 index ffc3aab870646170a7f8d18a4b785ae8339e563b..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/vte/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ stdenv, fetchurl, intltool, pkgconfig, gnome3, ncurses -, pythonSupport ? false, python, pygtk}: - -stdenv.mkDerivation rec { - - versionMajor = "0.32"; - versionMinor = "2"; - moduleName = "vte"; - - name = "${moduleName}-${versionMajor}.${versionMinor}"; - - src = fetchurl { - url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; - sha256 = "0sj837b9ib36gx00hzdinv23f7w91fd5mcw1p6wdi053yxqw17nn"; - }; - - buildInputs = [ intltool pkgconfig gnome3.glib gnome3.gtk ncurses ] ++ - stdenv.lib.optionals pythonSupport [python pygtk]; - - configureFlags = '' - ${if pythonSupport then "--enable-python" else "--disable-python"} - ''; - - postInstall = stdenv.lib.optionalString pythonSupport '' - cd $(toPythonPath $out)/gtk-2.0 - for n in *; do - ln -s "gtk-2.0/$n" "../$n" - done - ''; - - meta = { - homepage = http://www.gnome.org/; - description = "A library implementing a terminal emulator widget for GTK+"; - longDescription = '' - VTE is a library (libvte) implementing a terminal emulator widget for - GTK+, and a minimal sample application (vte) using that. Vte is - mainly used in gnome-terminal, but can also be used to embed a - console/terminal in games, editors, IDEs, etc. VTE supports Unicode and - character set conversion, as well as emulating any terminal known to - the system's terminfo database. - ''; - license = "LGPLv2"; - maintainers = with stdenv.lib.maintainers; [ astsmtl antono ]; - platforms = with stdenv.lib.platforms; linux; - }; -} diff --git a/pkgs/desktops/gnome-3/core/zenity/default.nix b/pkgs/desktops/gnome-3/core/zenity/default.nix deleted file mode 100644 index 18b91d4f61e84e3343e4a7f878998d7d63e76167..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/core/zenity/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, cairo, libxml2, libxslt, gnome3, pango -, gnome_doc_utils, intltool, libX11, which }: - -stdenv.mkDerivation rec { - - versionMajor = "3.4"; - versionMinor = "0"; - - name = "zenity-${versionMajor}.${versionMinor}"; - - src = fetchurl { - url = "mirror://gnome/sources/zenity/${versionMajor}/zenity-${versionMajor}.${versionMinor}.tar.xz"; - sha256 = "1bqbfcvd3kj2xk15fvbcdaqvyg9qvymlhn8cwvg5m6v4gicniw2w"; - }; - - configureFlags = "--disable-scrollkeeper"; - buildInputs = [ gnome3.gtk libxml2 libxslt libX11 ]; - - nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which ]; -} diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix deleted file mode 100644 index 5d517da82b3920106f0b8d8b9e572992a15482e2..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ callPackage, lib, self, stdenv, gettext, overrides ? {}, pkgs }: - -rec { - inherit (pkgs) fetchurl_gnome glib gtk3 atk pango; - gtk = gtk3; - orbit = pkgs.gnome2.ORBit2; - - inherit (lib) lowPrio hiPrio appendToName makeOverridable; - - __overrides = overrides; - -#### Core (http://ftp.acc.umu.se/pub/GNOME/core/) - - at_spi2_atk = lib.lowPrio (callPackage ./core/at-spi2-atk { }); - - at_spi2_core = callPackage ./core/at-spi2-core { }; - - evince = callPackage ./core/evince { }; # ToDo: dbus would prevent compilation, enable tests - - gconf = callPackage ./core/gconf { }; - - gcr = callPackage ./core/gcr { }; # ToDo: tests fail - - gnome_icon_theme = callPackage ./core/gnome-icon-theme { }; - - gnome_keyring = callPackage ./core/gnome-keyring { }; - libgnome_keyring = callPackage ./core/libgnome-keyring { }; - - gnome_terminal = callPackage ./core/gnome-terminal { }; - - gsettings_desktop_schemas = lib.lowPrio (callPackage ./core/gsettings-desktop-schemas { }); - - gvfs = callPackage ./core/gvfs { }; - - libcroco = callPackage ./core/libcroco {}; - - libgweather = callPackage ./core/libgweather { }; - - vte = callPackage ./core/vte { }; - - zenity = callPackage ./core/zenity { }; - -#### Apps (http://ftp.acc.umu.se/pub/GNOME/apps/) - - gnome_dictionary = callPackage ./desktop/gnome-dictionary { }; - - gnome_desktop = callPackage ./desktop/gnome-desktop { }; - - # Removed from recent GNOME releases, but still required - scrollkeeper = callPackage ./desktop/scrollkeeper { }; - - # scrollkeeper replacement - rarian = callPackage ./desktop/rarian { }; - -} diff --git a/pkgs/desktops/gnome-3/desktop/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/desktop/gnome-desktop/default.nix deleted file mode 100644 index 4d22f6ad7466dc93ed845eaa5bf4ecddbaf3138c..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/desktop/gnome-desktop/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, python, libxml2Python, libxslt, which, libX11, gnome3 -, intltool, gnome_doc_utils}: - -stdenv.mkDerivation rec { - - majorVersion = "3.5"; - minorVersion = "3"; - name = "gnome-desktop-${majorVersion}.${minorVersion}"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-desktop/${majorVersion}/${name}.tar.xz"; - sha256 = "1nrqcp1p5cxhfjjy5hjpvkqmzsgl2353a08fg0b11c932v95bsba"; - }; - - configureFlags = "--disable-scrollkeeper"; - buildInputs = [ pkgconfig python libxml2Python libxslt which libX11 - gnome3.gtk gnome3.glib intltool gnome_doc_utils ]; -} diff --git a/pkgs/desktops/gnome-3/desktop/gnome-dictionary/default.nix b/pkgs/desktops/gnome-3/desktop/gnome-dictionary/default.nix deleted file mode 100644 index 7a1ab5b1505a974d217647577f35eef89b9168b1..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/desktop/gnome-dictionary/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gnome_doc_utils, intltool, which -, libxml2, libxslt }: - -stdenv.mkDerivation rec { - version = "3.5.2"; - name = "gnome-dictionary-${version}"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-dictionary/3.5/${name}.tar.xz"; - sha256 = "1cq32csxn27vir5nlixx337ym2nal9ykq3s1j7yynh2adh4m0jil"; - }; - - buildInputs = [ gnome3.gtk ]; - nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which libxml2 libxslt gnome3.scrollkeeper ]; -} diff --git a/pkgs/desktops/gnome-3/desktop/rarian/default.nix b/pkgs/desktops/gnome-3/desktop/rarian/default.nix deleted file mode 100644 index 77a2b710f4471707a16d715be1b8805409ffc95e..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/desktop/rarian/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{stdenv, fetchurl, pkgconfig, perl, perlXMLParser, libxml2, libxslt, docbook_xml_dtd_42}: - -stdenv.mkDerivation rec { - name = "rarian-0.8.1"; - src = fetchurl { - url = "mirror://gnome/sources/rarian/0.8/${name}.tar.bz2"; - sha256 = "aafe886d46e467eb3414e91fa9e42955bd4b618c3e19c42c773026b205a84577"; - }; - buildInputs = [pkgconfig perl perlXMLParser libxml2 libxslt]; - configureFlags = "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/docbook.cat"; -} diff --git a/pkgs/desktops/gnome-3/desktop/scrollkeeper/default.nix b/pkgs/desktops/gnome-3/desktop/scrollkeeper/default.nix deleted file mode 100644 index 97dcbf4e0041ac4242bc7b0da9717006c649a78f..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/desktop/scrollkeeper/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{stdenv, fetchurl, pkgconfig, perl, perlXMLParser, libxml2, libxslt, docbook_xml_dtd_42, automake}: - -stdenv.mkDerivation { - name = "scrollkeeper-0.3.14"; - src = fetchurl { - url = mirror://gnome/sources/scrollkeeper/0.3/scrollkeeper-0.3.14.tar.bz2; - sha256 = "08n1xgj1f53zahwm0wpn3jid3rfbhi3iwby0ilaaldnid5qriqgc"; - }; - - # The fuloong2f is not supported by scrollkeeper-0.3.14 config.guess - preConfigure = " - substituteInPlace extract/dtds/Makefile.am --replace /usr/bin/xmlcatalog xmlcatalog - cp ${automake}/share/automake*/config.{sub,guess} . - "; - - buildInputs = [pkgconfig perl perlXMLParser libxml2 libxslt]; - configureFlags = "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/docbook.cat"; -} diff --git a/pkgs/desktops/kde-4.10/default.nix b/pkgs/desktops/kde-4.10/default.nix index 4ea8b6acd4440fa1793cf9840f849924fb784b63..6be77e321d1d78f7040a0957555cf262c2dfa86e 100644 --- a/pkgs/desktops/kde-4.10/default.nix +++ b/pkgs/desktops/kde-4.10/default.nix @@ -1,7 +1,7 @@ { callPackage, callPackageOrig, stdenv, qt48 }: let - release = "4.10.2"; + release = "4.10.3"; # Need callPackageOrig to avoid infinite cycle kde = callPackageOrig ./kde-package { diff --git a/pkgs/desktops/kde-4.10/kde-package/4.10.2.nix b/pkgs/desktops/kde-4.10/kde-package/4.10.2.nix deleted file mode 100644 index 64bc7d56e6904e13ea8e473629224ee5a72f6ecd..0000000000000000000000000000000000000000 --- a/pkgs/desktops/kde-4.10/kde-package/4.10.2.nix +++ /dev/null @@ -1,399 +0,0 @@ -{stable=true; -hashes=builtins.listToAttrs[ - {name="analitza";value="1k950n7rq081qy2pv7cbwzr81qp6bifll7cddgwgxk9kv16wrmh1";} - {name="ark";value="11jfdw4hkma564r6b9mn6vn2h5s6b6mf4imjad6iw7z3lxq6v7w9";} - {name="audiocd-kio";value="0zgil29ig2n5km3wzsx0gpwxk7l6zpcnxqgws9mgaqm3vnfqcjh6";} - {name="blinken";value="19jxlqalxfbxh1dshgpdyjkb8n7bynfr09p4hy38kv6nfil890y8";} - {name="bomber";value="08g82id9sf1m9zg38k47vannqcpm3fmskpgz4j41bcn24yfwynvf";} - {name="bovo";value="1zsbly04bcn00gyl751vszw82pvakdlw6l1n67hsgg3h5wa5z1fb";} - {name="cantor";value="1f3xwl9da0cz25qrx47p9b1bkcsbdj4i740py6awvhrrq60s0870";} - {name="dragon";value="0f9ma8aaglxh91inm711y64xqscxlqfil53gpk8c1bbanb8m99xp";} - {name="ffmpegthumbs";value="12fljrxyv8zgr1vl0ki8hxahwm4dn15pqhb1xgkw5pld0lvcq4sy";} - {name="filelight";value="0jiahda52k4knka4b0an4g2brbp263b2q8c09ayzmcd4mp9a4cgv";} - {name="granatier";value="0npp24j7bxmnfi743qsjn4ymi5b5icli0fb6g4x2f713z7i6raf8";} - {name="gwenview";value="1bznjfki05mydgjb3bmj5dymh33rac9lxrzlczqmah87c0f8fbc7";} - {name="jovie";value="17fbyja7ffsx0q6wlls9lagfcv8b21cnjnww06k90cyg0vn7sng4";} - {name="juk";value="0ni0iqprfrypx1iwgphhxwyw9216nc5s7hb0hv5j3v2kl1v2ir2n";} - {name="kaccessible";value="1zqbs26nl6wxnkya6nqzvnjfwmsqciraixi1awra4nzzx7n736rg";} - {name="kactivities";value="1d0xalwk2hlz0xxfgkrkfp0kgl347psgfhixsl8axhjgfxxi3bmx";} - {name="kajongg";value="1k401zxhkw8nha69kqr5igfwfgzlbmlvsy24fn4m2h2k1sh3vdcj";} - {name="kalgebra";value="1dzj9m6rm07xfr7plf9f7qrs44fzs4j9ncj02h9hzjli7zb44c3p";} - {name="kalzium";value="03zwwsbnizqm23zrhh5iagayw7jynmx87fwv0piiz65mgn4kxr5p";} - {name="kamera";value="1qvq4flqw1hw3513mcqdhsdvvr12sac272lhaf3jzxsm7p1qc3p1";} - {name="kanagram";value="0b5h2b8jm9zssn1hcl0wzf3mh11yh5hhaiay1i5db9k9g6y2nbn1";} - {name="kapman";value="1ghlfhmjivxnbga255x2lcdi6kxddyb3hnq93n6bzpg30m4j95sx";} - {name="kate";value="0cfdpg5j0zfi1zi0cjq8m3lgnbc9pwb2wlr9dvm4m0hy7byp88p3";} - {name="katomic";value="1r2nxya5c6dazvi7810hr24ydkyyb11ganbxkc4d1m8735i6fbqw";} - {name="kblackbox";value="0hslyixnw5bb2z71jncahjhnnf08baid8vxsp9n6a4ckcvbmldw4";} - {name="kblocks";value="1ds06amafp2igkhcjlwmaszbdvx4kfzlqpx57r5r4nlypnqfvv7k";} - {name="kbounce";value="0qp5ayyv3vacr2vak797wzxvkl5b9wn3db1rrzldiixb067f8jzy";} - {name="kbreakout";value="1ywk8zwpgqichq12idracld1gjv8gzhfyzxfi1n7165jyqqf9ba6";} - {name="kbruch";value="0vr1pbh7ds30vys3gd71c056fc96m5jpi7ihdbvm96p0bz94s7s4";} - {name="kcalc";value="1wni970xvd0inpxgw6mb85h6j9acp8vv62v7ipxcm4s4ay5jj9n1";} - {name="kcharselect";value="1rigpqyykd9s3gsai61y0jm6vbcza9gafwr2a4kgr72w7rn767fk";} - {name="kcolorchooser";value="0k60hbx41snpx83ivmnakl0a4li72pdimbgg987pl9ydjb7ja8gy";} - {name="kdeadmin";value="1a6412g8083g9b1xf75cwf0x3x3szadcqw3r4415vxww6kmb8br1";} - {name="kdeartwork";value="0a12fcmvhbc11vlmgds43mqbc6zf5j00dpsnj27ylz0nckjlajlb";} - {name="kde-baseapps";value="1gmyy9lkgcjhhbffzq51rjqr4m59x16qcsplcyywz218zr28gpfs";} - {name="kde-base-artwork";value="1vz5y6qb1wy3vcinnbsxydy39gz2ifls56dyg082j2f709hijzy3";} - {name="kdegraphics-mobipocket";value="0nf2k94bz8iqrr60zrql5mg14q14przq5lxscm71kk1bhdh711si";} - {name="kdegraphics-strigi-analyzer";value="10l1bmnskmfrwln78pzagfhz5kc2nipdm57i1c3fyp15d0msdgjz";} - {name="kdegraphics-thumbnailers";value="0p6bmllgzamfc3f9vigdq8knlblsmp4308lhh4f5bw5wkncjglqg";} - {name="kdelibs";value="1bylppbp6bzqyhkw5cavccmxh6zixjzc3z4g28d2lqixga1l16qz";} - {name="kdenetwork";value="0kjjwj69a79rfx7z3qxp5gjpykqq3nkwr5cm50f0phsfnflzx9l8";} - {name="kdepim";value="14q30gf3al23sx7cf8mhp89xa5c5xd1ns7dwq26igzkvji79kwlk";} - {name="kdepimlibs";value="1m56ljhssdj581hsb4irkgi6dwx25s5x8axk4fpipzvj6dq6yplz";} - {name="kdepim-runtime";value="1c9wv2wr843090jg41dwhqmvvvzqw875asmvydhj6kw625k62hr1";} - {name="kdeplasma-addons";value="1n1yar1rqw3swfnjmazqs1qm7yg19pki97204xa8dnlispbqk21s";} - {name="kde-runtime";value="0gmirvzs5cvh6rzps59hqkj4zk3nixh7i5hrxmm1ib7g1qnh0kfg";} - {name="kdesdk";value="1nyff19fv186n1j14qpvgslnaphl5y4rls8rn0yc0vxh31x769d9";} - {name="kdetoys";value="12c4h8vv5fd12k1wkbpmsf95c0gqa8nnwhszri72danal1qak7jj";} - {name="kde-wallpapers";value="17kavdzxql2cgpqrw0v9c2aflajv0l1qgllsg0l5qr7w68fqdjn7";} - {name="kdewebdev";value="0hv4ly6323f64wiqvizdn1ia0z50chhravm796wczb8xw8mcidh8";} - {name="kde-workspace";value="0rv8gdwlkvhajbn5s8mybrqc4ilpq4b0v7r55zp9dcb27c8jkr1n";} - {name="kdf";value="1bkj5yr7ds74gqlfsvyxf26kdqsyac8kg04phnc2rkzp31dvgldg";} - {name="kdiamond";value="1y1fyv211mvh5sbw55f827b7nx4da3aaly7c1bm2c13nnj7j5r9s";} - {name="kfloppy";value="063zzya13jmcdr2y3vig5k54hx1asnzs6lg2r5sckqp5lsmpdaz5";} - {name="kfourinline";value="1af58yrhpjhj61ppxfymw5z43ks9j5cz6ldagxiblp67w4bpa468";} - {name="kgamma";value="167z8ycnvi59kvmyar856hkcpb4znwhkkxvn4gg4g74byjzwlf3a";} - {name="kgeography";value="04p6ypf72gd2k54qaarsgyvji0bvsi0iqbbjr4qdyd9dhxihhzzp";} - {name="kgoldrunner";value="13m1j31fjiz6j0wfivkvgcmicz274h0jvdm8mkjzlp10g3691x4p";} - {name="kgpg";value="00zs8x2dhli8dlmj0365gq9517pzkpyf31kb4398zfrrcmja2qip";} - {name="khangman";value="1wj439z0n6sy1l5vknh9nrq2d1q2bq5sh0963g1zb9hp8l13bf8a";} - {name="kig";value="0hhfvl38czabramgyxjlazqp4dlkkc859fs36wq042iip05kyy3q";} - {name="kigo";value="0bvcqsq8w983lnrgi85pjajb7phbg826ky50w5wk5vql1afl02c6";} - {name="killbots";value="08j9p8wyqpjj78b9sj13f4vhlkcrhc7sgzwakcv4bg2dvmpr95mp";} - {name="kimono";value="14z3ca8s7swwxwnm198bq4ndfsl2m0brc9k465k7rj50l15y0rhl";} - {name="kiriki";value="13cay0dllcf5618yjjs1hz3392hcig8bj7r09b0hbqhay65z9l5y";} - {name="kiten";value="0lrdkha6xmlxfq9f36rb5ysk8hg9m5zmc9x1y206gxk3rf3k1wzj";} - {name="kjumpingcube";value="179p3lw1vl9vxvsdwzx8qjfrahii0igakw0qrdpkcmx4yr0a9gfx";} - {name="klettres";value="149xgrxqbp2bq8v2abzhmb8w2b2ssd7xmb06j6k1s707wc9kcs5g";} - {name="klickety";value="00x4f4nxfi9xasrddnc84vayn36dd0chyl8jxryswg8dabzazb25";} - {name="klines";value="0vamlsz3a945zcm34gb3w0iq2rknwkh9cbv1syh3cc2s9dn5sg29";} - {name="kmag";value="06jcp2nhgqbw6yrr5xhajsy2lxklk31kjfmq0pphssfs9yhi1pan";} - {name="kmahjongg";value="07hj806mix703h9x676rnwmklrfms04hfxidvzl0324idjw6v5m9";} - {name="kmines";value="07nrv4qn7wg590id83dgw7l5kyh4prj3nbi9np4x9ik1rr5bq9nm";} - {name="kmix";value="1hwmn4rvr7jid4y3gycsvxvvfxmkv128jxsdfjdhzqz8lcp2q87q";} - {name="kmousetool";value="1mrhppgrwwr3cyr3fna0hgypclssixhw9yx6wvqgqj3sc5wd6n4f";} - {name="kmouth";value="1s7789qsvg18548bdhmmgcs3w9843naxhcwsiqhc8x0dvaxlgd5r";} - {name="kmplot";value="0jzrc47c4v6hvrs6p0yhki70diyfgs55vnjac4gfrfn17jgh562w";} - {name="knavalbattle";value="1mqvlvhqd7sa4qsz6cf6gffysamgfml3nd4h71x5qzw8qqw778yq";} - {name="knetwalk";value="14nizf7nrvsmqg6d5vaazl8wf74q64gwxq6nmj86brinf7d5nn5h";} - {name="kolf";value="1qghkmzbpaajb91xcwd22fx87cfpmgmjjwqisdzkjz4qn3z5mpx0";} - {name="kollision";value="1z0xg967q3l2gxmnigjbrnqwvw5fm7cpscpfavn31zp4vbmk937m";} - {name="kolourpaint";value="135i7h1lf23cggzx7l2p2hsh7s4zrik3298fwwbhly0jl564ribb";} - {name="konquest";value="133zjqqpzwrai34f8gb4nk3im50i61c2my8hnqzr61pbbgd61ff3";} - {name="konsole";value="1iaih9c6i5ad0bvalwykrdgrwz6wb7k6x808na1df0yynw76r4s7";} - {name="korundum";value="1h8rr229hwkckrvpz6zkkxpfkrpg18fvyxsqb01sjaky7c6i4649";} - {name="kpat";value="1imr9w6jymx4379ba7drpa9nmaq6z28hrf5jwi06crhp5fyi08dh";} - {name="kremotecontrol";value="0zzhjgpy17wrgcrr70z582zh7rj0n4vgbxksz7gl3qm543y15kry";} - {name="kreversi";value="0dmfsg38hhav78j4s34arjr09ahfblv4k7s8llpafg7cicm8g0iv";} - {name="kross-interpreters";value="043wpb05di9pw3h206lpccgpfghc4v23s0n2bwv30246ig75rmk1";} - {name="kruler";value="1g7f810d7940j9lylzj0k7d89mbblz8ai9gs5cc7n0mkrczb9ws9";} - {name="ksaneplugin";value="1svsfgsvd21f9fhrsvi2fasffrx0r5rf8a8r4jx19hlzcvha0kza";} - {name="kscd";value="1ipl9sq8zikdjs044lbi519jyvdaahi0f8a877zfdp0xspzqi398";} - {name="kshisen";value="06qkl8fwh8rql6hdl8fygvfybp7w6c3ys0qsnjpxk5bz4m5xap1d";} - {name="ksirk";value="1hqp00dilzkbkada7dc5j56sh2rp19xcirhvj26560whlwdxhcj5";} - {name="ksnakeduel";value="0nbn1pn0hzh6wmhxkabrga50y06k4gv4pbb5235jbynjmk539n31";} - {name="ksnapshot";value="09na29nydwi0cmgg9g6yqr3wl9npgiqpvdq3wxc5jk1kxadlb0aj";} - {name="kspaceduel";value="1xf5qb8a08ar0v0ws1iyiqbax6qc8crbhn59nzy2hrc12451lbkc";} - {name="ksquares";value="1iz9r80mnkyq5mx4i95gx5a5qk5y5by8bwq9599ypamrb9fr1zpl";} - {name="kstars";value="0p86fpcyb1ipgmi2ypckdb5zzwanky9b3c1n5ddcr25y84b2m7iy";} - {name="ksudoku";value="0k5qdy0i20kxcsqdwzxhrw6rn3lzh2mgbw97rlxw5gmr3619irdz";} - {name="ktimer";value="149zlkpdz38pfg0yy9mi6xkrc3wcz790kc3026x1c5zyvb2nnwm7";} - {name="ktouch";value="109dwxxz1hcwj5506k33a0zy86ky50rp058x6pgqh1m0a6ljvswi";} - {name="ktuberling";value="1vsdkx7kz4gz35g3ggn6h5gmk43sww7mawdfl4r11q5rq7r2nlnx";} - {name="kturtle";value="1jvj34jlbvzvwmr7q8c12rh9q47d78dl6vx6lhjhvs1b0969zzrq";} - {name="kubrick";value="1vqjbf6p6adrmnrl4i4y1jh80rimzlp4fyfmgscpfncdnc5pzgb0";} - {name="kwallet";value="0sc6xn1gyl2jvfqqvln2x4cb68b2x5cjmb8gvxhgwizx93jmwkc1";} - {name="kwordquiz";value="1i7kdfp8x1r109jmj1a86bmn69cgjc8q9c4n92j1imr17ig063is";} - {name="libkcddb";value="1krr3jh46q3q02rps3wawv59bv9jzri7i4gi4qgszk5v8gn67nqb";} - {name="libkcompactdisc";value="1y7sznz6sdrgs8jiqxs2y7imqywq91l46w1dv8fkc9mcpx5233zb";} - {name="libkdcraw";value="1nhhnj6hir347g6jp20k5jq0faygp8x9k3lic9ixdw2byigy9c3p";} - {name="libkdeedu";value="0m0ipprcldg1l2yi0hpq87npvqic9vfh6pn60fg4wvl56syn0sfg";} - {name="libkdegames";value="1qs59v68nwli5438ax3am6694r1c04i7crv34bs9hksnmr51l499";} - {name="libkexiv2";value="0n93d4s37m2jdg04wgvmljrs7j14967bjjk6mk7fibv0jqmp65i5";} - {name="libkipi";value="0kjp9y2rngvhskzk63az6zfzjrysir2qlapy56ynscdgq3yl0ygm";} - {name="libkmahjongg";value="0g7fp0wzrhxfyhj46bv0in8z4iwal6ipjjcm38qz1j4ric71l1kf";} - {name="libksane";value="0pqgh21ymq0pclbvq411aglclak6afqll5d0y8hz8m6afkmjhqxc";} - {name="lskat";value="04gvh3266hllfzl5syai3qw7zvkd7jipqdrwzynqvzpdg725a05g";} - {name="marble";value="0v4c1psyl5342f01n0794wk0ckg5chblibvap0vicanlq16pp65f";} - {name="mplayerthumbs";value="198b8f3s7zv4sprbj22flzdpxsag91p283iym5q9mkialf51789y";} - {name="nepomuk-core";value="15zzraacig4qqmwabw7xy38ddvcxam7djw96yhxc0z8zr3xffysj";} - {name="nepomuk-widgets";value="1kjzp7px5l7q9bal0dxpm24wq05s0wbjgqli6bhx7d5hipfr53w2";} - {name="okular";value="0zvmfh9ijwx10zy9nq6295x1w9x1xljkdcsz5269m230ff6wwmnh";} - {name="oxygen-icons";value="1z46zmazg1hf6yy2krfqpb5i5xmf7kpw9l7wvh3ihfqsdh77qmn8";} - {name="pairs";value="0i9wg6a3y71m3bdp5qjk6f9bmmd45r9hi7b8fqxp8srxcqn5hzx1";} - {name="palapeli";value="1cq8vggcc1358nf4n15pycmbn7m50lndd1w0541c85qirlnrq7wm";} - {name="parley";value="0cqdmjcsjqa8p42p7j8ni9mkf898p5hs3wdb757b4c1vyzkkdlpx";} - {name="perlkde";value="0w628fdxqmwv8k0x22307a4cpwlvq3lfsbhl5b3bv7naqjnwf549";} - {name="perlqt";value="11g5rh32i2x8klg5y5bapg581k4gm38jdfsmqsrjdcmxfw94bjil";} - {name="picmi";value="0y3s3k1x78z2asbcrcl8xkrk7kkz2ci4lbh1jfbnd66bx7lmwv0l";} - {name="print-manager";value="0x8lqjndi3ln90n8bgw26k09kz5ghkfm2xgqi4y0295ggbm3cm24";} - {name="pykde4";value="02qih6jw13mv9x4wf85ff9m5akdmxrz2jf2nlldyimh879dn0hxr";} - {name="qtruby";value="15wv6rh8d1f0d96f42bawyljlkpnamwxqng69jfd3q44j54gjkc5";} - {name="qyoto";value="1jpk5vp4ymvy8hhqia7b4mw0pzgdskb3aff30ik154mngzaqbdzc";} - {name="rocs";value="131gb6xfcrmwnl7nbxpm1rip9q2r8wzw8pb8f8a47vvswf200n7g";} - {name="smokegen";value="1vcc7yz6j7ndk8ppg7zr546cji6x5w38nlfc1lanq1pb3lbsddwn";} - {name="smokekde";value="1ib1xj6lkh2z80l9dci6w58f62f2mmpfz6hm81hygxqyxbf8rl64";} - {name="smokeqt";value="1fpv9c1qsl08p8s5a86ql0342hbalbh2inxv9a3risqg6qd0is6l";} - {name="step";value="1iayd98rqsl5qm1r4jiabnhw68691kakajgp9kpmn302ljn2wx5j";} - {name="superkaramba";value="1g86gacs1ss2sa3vdyg1ciwbpcd6d3i8yfb7fjmgvjm4qiyl3npg";} - {name="svgpart";value="0iy01cl4p37bfmr5779shbp202w25ik3phsqq6yjzfb7521xbm4r";} - {name="sweeper";value="1np09is041rb7bk8q1bhl0wmv3dypmsgyvd5yxg1qlsibn8mwbiw";} -]; -modules=[ -{ - module="kdemultimedia"; - split=true; - pkgs=[ - { name="audiocd-kio"; sane="audiocd_kio"; } - { name="dragon"; } - { name="ffmpegthumbs"; } - { name="juk"; } - { name="kmix"; } - { name="kscd"; } - { name="libkcddb"; } - { name="libkcompactdisc"; } - { name="mplayerthumbs"; } - ]; -} -{ - module="kdegraphics"; - split=true; - pkgs=[ - { name="gwenview"; } - { name="kamera"; } - { name="kcolorchooser"; } - { name="kdegraphics-mobipocket"; sane="kdegraphics_mobipocket"; } - { name="kdegraphics-strigi-analyzer"; sane="kdegraphics_strigi_analyzer"; } - { name="kdegraphics-thumbnailers"; sane="kdegraphics_thumbnailers"; } - { name="kgamma"; } - { name="kolourpaint"; } - { name="kruler"; } - { name="ksaneplugin"; } - { name="ksnapshot"; } - { name="libkdcraw"; } - { name="libkexiv2"; } - { name="libkipi"; } - { name="libksane"; } - { name="okular"; } - { name="svgpart"; } - ]; -} -{ - module="kdelibs"; - split=true; - pkgs=[ - { name="kdelibs"; } - { name="nepomuk-core"; sane="nepomuk_core"; } - { name="nepomuk-widgets"; sane="nepomuk_widgets"; } - ]; -} -{ - module="kdeutils"; - split=true; - pkgs=[ - { name="ark"; } - { name="filelight"; } - { name="kcalc"; } - { name="kcharselect"; } - { name="kdf"; } - { name="kfloppy"; } - { name="kgpg"; } - { name="kremotecontrol"; } - { name="ktimer"; } - { name="kwallet"; } - { name="print-manager"; sane="print_manager"; } - { name="superkaramba"; } - { name="sweeper"; } - ]; -} -{ - module="applications"; - split=true; - pkgs=[ - { name="kate"; } - { name="konsole"; } - ]; -} -{ - module="kdegames"; - split=true; - pkgs=[ - { name="bomber"; } - { name="bovo"; } - { name="granatier"; } - { name="kajongg"; } - { name="kapman"; } - { name="katomic"; } - { name="kblackbox"; } - { name="kblocks"; } - { name="kbounce"; } - { name="kbreakout"; } - { name="kdiamond"; } - { name="kfourinline"; } - { name="kgoldrunner"; } - { name="kigo"; } - { name="killbots"; } - { name="kiriki"; } - { name="kjumpingcube"; } - { name="klickety"; } - { name="klines"; } - { name="kmahjongg"; } - { name="kmines"; } - { name="knavalbattle"; } - { name="knetwalk"; } - { name="kolf"; } - { name="kollision"; } - { name="konquest"; } - { name="kpat"; } - { name="kreversi"; } - { name="kshisen"; } - { name="ksirk"; } - { name="ksnakeduel"; } - { name="kspaceduel"; } - { name="ksquares"; } - { name="ksudoku"; } - { name="ktuberling"; } - { name="kubrick"; } - { name="libkdegames"; } - { name="libkmahjongg"; } - { name="lskat"; } - { name="palapeli"; } - { name="picmi"; } - ]; -} -{ - module="kdeedu"; - split=true; - pkgs=[ - { name="analitza"; } - { name="blinken"; } - { name="cantor"; } - { name="kalgebra"; } - { name="kalzium"; } - { name="kanagram"; } - { name="kbruch"; } - { name="kgeography"; } - { name="khangman"; } - { name="kig"; } - { name="kiten"; } - { name="klettres"; } - { name="kmplot"; } - { name="kstars"; } - { name="ktouch"; } - { name="kturtle"; } - { name="kwordquiz"; } - { name="libkdeedu"; } - { name="marble"; } - { name="pairs"; } - { name="parley"; } - { name="rocs"; } - { name="step"; } - ]; -} -{ - module="kdebindings"; - split=true; - pkgs=[ - { name="kimono"; } - { name="korundum"; } - { name="kross-interpreters"; sane="kross_interpreters"; } - { name="perlkde"; } - { name="perlqt"; } - { name="pykde4"; } - { name="qtruby"; } - { name="qyoto"; } - { name="smokegen"; } - { name="smokekde"; } - { name="smokeqt"; } - ]; -} -{ - module="kdeaccessibility"; - split=true; - pkgs=[ - { name="jovie"; } - { name="kaccessible"; } - { name="kmag"; } - { name="kmousetool"; } - { name="kmouth"; } - ]; -} -{ - module="kde-baseapps"; -sane="kde_baseapps"; split=true; - pkgs=[ - { name="kde-baseapps"; sane="kde_baseapps"; } - ]; -} -{ module="kactivities"; split=false;} -{ module="kdeadmin"; split=false; - pkgs=[ - { name="strigi-analyzer"; sane="strigi_analyzer";} - { name="kuser"; } - { name="kcron"; } - { name="ksystemlog"; } - ]; - -} -{ module="kdeartwork"; split=false; - pkgs=[ - { name="ColorSchemes"; } - { name="IconThemes"; } - { name="emoticons"; } - { name="kscreensaver"; } - { name="kwin-styles"; sane="kwin_styles";} - { name="sounds"; } - { name="styles"; } - { name="wallpapers"; } - { name="HighResolutionWallpapers"; } - { name="WeatherWallpapers"; } - { name="desktopthemes"; } - ]; - -} -{ module="kde-base-artwork"; sane="kde_base_artwork"; split=false;} -{ module="kdenetwork"; split=false; - pkgs=[ - { name="kfile-plugins"; sane="kfile_plugins";} - { name="kget"; } - { name="kopete"; } - { name="krdc"; } - { name="kppp"; } - { name="krfb"; } - { name="kdnssd"; } - { name="filesharing"; } - ]; - -} -{ module="kdepim"; split=false;} -{ module="kdepimlibs"; split=false;} -{ module="kdepim-runtime"; sane="kdepim_runtime"; split=false;} -{ module="kdeplasma-addons"; sane="kdeplasma_addons"; split=false;} -{ module="kde-runtime"; sane="kde_runtime"; split=false;} -#had to add fake pkgs to kdesdk to get it to be treated like a split module -{ module="kdesdk"; split=false; pkgs = [{ name="fake"; }]; } -{ module="kdetoys"; split=false; - pkgs=[ - { name="kteatime"; } - { name="ktux"; } - { name="amor"; } - ]; - -} -{ module="kde-wallpapers"; sane="kde_wallpapers"; split=false;} -{ module="kdewebdev"; split=false; - pkgs=[ - { name="klinkstatus"; } - { name="kfilereplace"; } - { name="kimagemapeditor"; } - { name="kommander"; } - ]; - -} -{ module="kde-workspace"; sane="kde_workspace"; split=false;} -{ module="oxygen-icons"; sane="oxygen_icons"; split=false;} -]; -} diff --git a/pkgs/desktops/kde-4.10/kde-package/4.10.3.nix b/pkgs/desktops/kde-4.10/kde-package/4.10.3.nix new file mode 100644 index 0000000000000000000000000000000000000000..f6c66a8498cf6e2e1a81da1cafa55b54c9e385bb --- /dev/null +++ b/pkgs/desktops/kde-4.10/kde-package/4.10.3.nix @@ -0,0 +1,399 @@ +{stable=true; +hashes=builtins.listToAttrs[ + {name="analitza";value="0y8481jrb4bklwrcadska1rdqrbbknml6i9gcvkp8sibjnj0hz7y";} + {name="ark";value="0y4adimbsax8g5q9nffd22icskxpjcqhr4ws2p1857znlxxc9prh";} + {name="audiocd-kio";value="1pwfdb989yf5kjni8y2irzys8qdcw9ipwszmds7ss9ycdv1mc9p7";} + {name="blinken";value="1scywjdj6sjlzwbpxnarik3wypw7f6fcdmcgiql1sa1df1bdbh41";} + {name="bomber";value="0jxl93adfv3pf2xkkazh1yfkiixz49yhbg9kblnav44np9wydpzk";} + {name="bovo";value="0plm0g75qyx6lgdmzaml650nm7v1kjss5cq1v4dpmicahw9mgqfd";} + {name="cantor";value="05rd4jm5w9l4i16qrx5vqrszk666gzvmndn9w4f80jgzdsal0h45";} + {name="dragon";value="0xmxjicj8bg43d7mlmw5hwl5mqn9r2xm9kqh47cmlili9g90hklx";} + {name="ffmpegthumbs";value="0i4qbfa954qsirpq6ywwspfi7y26j8jkrx4x7h73ywqmilbw7gab";} + {name="filelight";value="0p840l6nw9hm25ndcr87g9pykhajzj99kzdqbirwancgj77rgn14";} + {name="granatier";value="0b50dnyvq0qgldg9jp9dsig0yh7xmmbfbza3vv6b0bwr8i7q3zcd";} + {name="gwenview";value="199yafvaz9bgd6wg49n9l5f90bvq61z0pc46h4p3fpfp0lp66r6p";} + {name="jovie";value="1fay1czn7s9412gh8dda889bcxcphclj66xd1snmxyq80avpyilr";} + {name="juk";value="0k9b745kqa3w3lzwibrh9aawpd1xdzqv6mf6ik9yy3r25wkj22sy";} + {name="kaccessible";value="13391w38l3k7b4il3spsrzniwiw1hq7lhqsl1wl2zfigz47hv288";} + {name="kactivities";value="00fdnw2rwpk8q6xgydwshawl23l76igdr6v8p69d5fmaj93nbqb8";} + {name="kajongg";value="1pkdjc54ydzxlbjp63s2cz5fzg56isrjyym0wlgiqlhgiqjf48qn";} + {name="kalgebra";value="09gsbn4aj4i52q670ginj0n2y26iqnsh12sh09642g9jkhdmigik";} + {name="kalzium";value="0rd3yz0q0158m158n20qmd9h0xmrc53wnhjc7g17lj2l605svkkv";} + {name="kamera";value="1s9znmi6ka8r2wyylp9pwlv3pg313yzc0k3j50c18c529nbx1dsx";} + {name="kanagram";value="0jxjz4zz7vivqdpm9c4lvi2pgvf5v16fhn0np8sdzaiv7rj2sl3j";} + {name="kapman";value="0f6nd2f56qy1c704451lxz57fzlnxry5njbid80wn8rv6c9c6m6k";} + {name="kate";value="07nchlm93860rwwbcllcj92w7p8dx06dimc6vclgn640d19j3ac2";} + {name="katomic";value="053l57z8l68r4vrrcj3rh4gn36f9qcqwysk0k34lh0szaii81qjw";} + {name="kblackbox";value="0lr7k2d0ml2aqga9md05kddm9zik7n18b622v57jim54id9i8iyl";} + {name="kblocks";value="1fylcrwaziksw2f17nbwmprk5psb5b292qwfc09y2i2ykx734gc8";} + {name="kbounce";value="0n7bgcldblmy9123ls5d7cpa7qajhpskpl0nv83n2dyfz4pa70dp";} + {name="kbreakout";value="13vjzna3n7m0hnc2glnz931j9pcwwzb4vnyhs6bjszrj422k6r5d";} + {name="kbruch";value="00a999gjzgd5cffjrkpdin8y9qqppir591w53yp1layvv080370j";} + {name="kcalc";value="0k84r6g0iz30g7ff39kgrcxx1xjnw6p5khzvikj79y9b56sd0g19";} + {name="kcharselect";value="0drah7js6r6zl6nii2bmpxhxzn78y04sqj013bzyblskqibxh0zz";} + {name="kcolorchooser";value="1crk5dxfxgyh3wz286hd69rhcf0s9jnq5pqcnhgcrsjpfjk9hahs";} + {name="kdeadmin";value="1iq93in2wvmqjgz1wqmr0vn9rd1pzdrl202n3qhass0rfm0vsv7w";} + {name="kdeartwork";value="0qcypdzyh5pqp70b2m32hqhcnv4gwpyawdhb2nphmgv64v9s2b8z";} + {name="kde-baseapps";value="1p2qfghvyi0pglp88p351c6lm54i3ibp7h2yxh27phwdi0j9lbzx";} + {name="kde-base-artwork";value="12zgimngxcp96bcw2mffrk6fsy34mbll5pp4blm3c59ya7b50nq1";} + {name="kdegraphics-mobipocket";value="1qcddcc5h3108i2xkp4ibjmgg3k0sxyr30i9nkbaawaid66l36lk";} + {name="kdegraphics-strigi-analyzer";value="0ixj0gqjdqrwqk0zc3p0kdkd0wg1rwkyxzndq459y8xpnbyn3pvi";} + {name="kdegraphics-thumbnailers";value="03pc1ybbnpybp85jc4gn45lr61q5x8yf541qnkap1mrs658f57d1";} + {name="kdelibs";value="1vrcawx3w5cdr4yapim0j2zx4lmlcpjg6866wd70bhp6fary1gaz";} + {name="kdenetwork";value="1xz57fb3dpllydi4jhbv5z5y710k2fdk1jl516ixihhbjbbr4phg";} + {name="kdepim";value="1myznqi7dggxkkd59vil16514biydrvlihksl8b3njfif2f4ifkj";} + {name="kdepimlibs";value="0r7qvq0rvkl5a76xq28f56fqd7hfxbin541qw9gniygnlddnhjvq";} + {name="kdepim-runtime";value="01cxrf9541fsga5c9fjzarzja2p58vrpwll6gx4dk49hmx1hwvjb";} + {name="kdeplasma-addons";value="1s1rxhd8apnww0z4hsawlvib126p3lj0m5jg29kgh4xwbkrwi2qa";} + {name="kde-runtime";value="01gjyhvymf0a0ishhdwy6mfvv20sj2b182q1r410miq5zjl3l79n";} + {name="kdesdk";value="1y4qxvcgl9zg0cqgaqc77hhpqlrbb6panpicarm766vas3pw78na";} + {name="kdetoys";value="0nspyll9if2jk8r2b65z9hahwcawmyhkl3pfi38drxqxzaqkpcq0";} + {name="kde-wallpapers";value="1ik0lmkzyml63dgh6inv3qa9wbj3ylk2rjkfafmqc2anzsgpjmxk";} + {name="kdewebdev";value="05g308cl6njl5vrnks2jv87xvqwphppfgy9mkgmm7brwkk0n25ny";} + {name="kde-workspace";value="17g4zjf6sich990i8s22m54i534p4hyzbbnc2566vv6w74pxnw6q";} + {name="kdf";value="1r19lfsxps177nc5ys4mqfa8y43b4rcsj4wiigvry6vmwvxnqy4j";} + {name="kdiamond";value="0hd4zn8xyk12idkwjv0h4rlfzdyx0m03i054h99z2ls4vfxixb6v";} + {name="kfloppy";value="037gng2bx7lv7zki7n56yxbcqrl4aj4y2zn1milm5dv1r33ga4k0";} + {name="kfourinline";value="1aav3b4snqj3ah2cwyl02mmvdnk3hsw2wcxbabijkbd2anaijbvg";} + {name="kgamma";value="1ccbjbfjljcndz39f1qhjcisbihk8v407hcl3nnwf25sgcvqygiz";} + {name="kgeography";value="00dsl70d7w7kfwam39pjwd624zs9fwbwbb8kn7gas3m9kc435drs";} + {name="kgoldrunner";value="1r2lrv63ks2c39nzfgc4bj9prlqcd1jqrywahxla6l8fpp299r05";} + {name="kgpg";value="1xg1axd8gvcn8w9haywjfi0lk044vi7z3klp2y93rwxdidxjjjji";} + {name="khangman";value="1a27n9m9js8j3rn112dg0aqj58qxjs8rb6mylzwi99a6w6jl44ka";} + {name="kig";value="1ns3d7lk96lr9l8kipdz92xq0q7q5lpbbqip6f55wcvazb4280r3";} + {name="kigo";value="1hbxx8ivwbw7mpkz3hsb5lwci2cxd48kiia4jd2859znjza5hz70";} + {name="killbots";value="1idczq2f1g7maxlf0fyc4dpm3f9lbsqgnsyf6j48hm0aicsazmcj";} + {name="kimono";value="1a0m6gk25qhx88z7y17154b8i9r9s3ry6zx21mxr7zz42d1ng5by";} + {name="kiriki";value="1307xbyxhxzqv294x99712h269p3k3cw34mpq8b5nv0102ig4pwl";} + {name="kiten";value="1n27cl8g4r7i60hrwfpc7nl7d118f2kyby0wgbwil6ip5q9ak71w";} + {name="kjumpingcube";value="0mw6bns7b9dwf7kbcpk0ilgvqbmak9765wffqhx52ykj7c993x1i";} + {name="klettres";value="0ymy4a0172fym2b0pvfgjb07waivb610z7cpnnrdw0qyzxks7131";} + {name="klickety";value="1mln3hb97isy2v71bxk0ijbqrlx31s1483ziajnlva7j7mc44pi2";} + {name="klines";value="0ylhz4nvwgc0ilgpv1fpf2vgcnypwgd0bslmg1sh2cc3gczxkdx8";} + {name="kmag";value="123a329sx3d3h3vk3w4400w5g9nsl6r2c7lv8i8xvcp7xcxixls7";} + {name="kmahjongg";value="1ahjdwwglp24a9g75cpq4c9bbqcwl50630ys94za94j5lj4sbrg4";} + {name="kmines";value="1pgpfhj5008vckpplmvwngm34wl1m3pz2ig9x12j20rcd0sy0k27";} + {name="kmix";value="0qkmnjlscsggmcfkj2xqfawrv2zn56byhzczn94piva28pcxcvps";} + {name="kmousetool";value="0khxn5qnzgdjba1d229kqfd3vf5bjdpj8i2zahwynxvgghmmg6cz";} + {name="kmouth";value="05wvwkj5xhjn3g5c1shviqfl284zfqf8qbgcc7a980f453sr8bbr";} + {name="kmplot";value="0pv41r9bygw895azcnf22r3lfddzf1xplnx1li88038gp9vzrybv";} + {name="knavalbattle";value="0hgralml3xhd487zi4gac60738arlb1xi3kzm1vlq7f5vp2dllaj";} + {name="knetwalk";value="0r6l3n3jzl3mabjn8v7mk41j5gcbh5xnajngk075vk0v7mp4xasj";} + {name="kolf";value="1wfvcz3hy8a9v07qs1427bqxniaai3iv8r63x1ia0sim5j33xlgq";} + {name="kollision";value="0g98icgnazlqjbbgcqa4i6gp5zm5wwzab7rd93cf5jvd81g5ymys";} + {name="kolourpaint";value="01qccaavpb3fp15ajfrmmimg0mwx8jbmq5gndmd0qrfymqvdwfm2";} + {name="konquest";value="0i5jbnm46mj3055d471zfs7j9c2sr6y39a311485mk24yf31pcif";} + {name="konsole";value="1kcg2lmnqbamhgik3bpynq8gf4jl78fhlq9ydh1m0vlqwj38vs36";} + {name="korundum";value="08bkgqj3r51jsvss517v74ikl7vdrzd15wn5fbcrkz625y8blcv6";} + {name="kpat";value="0l41dnjd2smrxjgkldsrscn5550kzaf5byv686f5iavb60nlr36x";} + {name="kremotecontrol";value="0p2z0q0l2wdlg5zij053cvimdkijwy949f1k1ma00z8gf881y3ix";} + {name="kreversi";value="0w0q11m5n39p80p38p6x3q3xlz19xnd2xnmkvx1zwq2sy8hwc06w";} + {name="kross-interpreters";value="1irw7wca7wlvv8ap9ypzn13zvjdijlyzf5mxkikdh23hhbhmmvn5";} + {name="kruler";value="0cqlidxwsg08am32nlgxdknzj0iwlg35z786ms6dqxax9rjzqs31";} + {name="ksaneplugin";value="0w08r33l5k3dn6vvm0ss49b84ffp04yc0aakx772ywp7shx1fkim";} + {name="kscd";value="13f7xb4kp24hq6wyvd7r55002r86fjh2c4sl2p5sh05glscw361f";} + {name="kshisen";value="0v6rplsxj8c60p2798w85llvfwdlhc4n6sck3m3kb70h725i3vnw";} + {name="ksirk";value="1bppikyznpwfy82bx22wacayrvsbzsqzrckrysmh6w8zadbalmmf";} + {name="ksnakeduel";value="09lyviv79ki1qld18854wpkrv6xb1g99jql8x7mfpafhsfqh3x9f";} + {name="ksnapshot";value="16qz4rmmx6901jmvc998izdr9q6p5jv5296ynwj3x6hlx4n4h21x";} + {name="kspaceduel";value="0nkwpny631fxvgg7h29pdgy8ikdfvynfa7bbn6vpaf56d4n5rj4s";} + {name="ksquares";value="0pxcm9i7j0g5cxrij3ir2bbqv5yla5n3m1fxig2qxa084a45d6nb";} + {name="kstars";value="01pv6aryk4wknjfh270ynrr3v5j308l3m55ca16f68njfndh7wi1";} + {name="ksudoku";value="1cb3ahkvjm2mps11spw1vbrxh2fal16mix5d2kjlayj0pmm6yhvc";} + {name="ktimer";value="0lnbzjqj0xbhhaw53z2a0sdfd1i1kzckczbfjy3ab2bg6xwfyb4y";} + {name="ktouch";value="08am04nirzh05rdh0mh2xixrd5w04xnnc7r8rfzcxra6s84jlsns";} + {name="ktuberling";value="0b206b4whhivhbn41fg0hwidn9m0acs5jfdjnv269x58vh79w7dj";} + {name="kturtle";value="1i19ksrac0k65xqj8yhb5n53x4qxj93zanb546gqirrgvhlhh573";} + {name="kubrick";value="1s5p1f8b30iqpngkxzkv29qc078nxncqlwlvfyq18gn27zdwcy2g";} + {name="kwallet";value="0v6c356ysv9xf6gg3ivlshqsd06rxsmvfcvq4igp7z4l9cz4cdya";} + {name="kwordquiz";value="1v061nq5scwgamshpkajq2cgp5dqipa3qlq5xl393kvp89zfl2bp";} + {name="libkcddb";value="09s6s779k6lq2pnb4iy4qnny2h8mbiy4w12nvw791gid1670vng7";} + {name="libkcompactdisc";value="06mm2im3rllwvrv2ph9smgbjfh2lhm3r3j8gmzikdqhzpyqp2kpc";} + {name="libkdcraw";value="0v2ji0jdzqpy54z60gq4p1k7zdw3bdsa0xd711gzbyxh34k5i1dg";} + {name="libkdeedu";value="1f8wqc0lfvgych011pg1smxyqsh9vwjhr13wcnmkf35hfwh81vfm";} + {name="libkdegames";value="16lz2mj93myl5wr7xyird9kwqml0na9h9c5vnxhig18vqvxs64ca";} + {name="libkexiv2";value="1sjpndx5d5w9dllh1f5cjg4z2gl0v827qjnnwnbm1lvps2s1kmm3";} + {name="libkipi";value="02ymmx97nbpwbhq786kcxi2cfr8f6vwyicskywv01f0qv4qh5llg";} + {name="libkmahjongg";value="0z9ahgfbf6ymbhzg6xcgcrl4qqadc986hi9xx38rcr1v3hm21pld";} + {name="libksane";value="17ahz4zm0lh52295nzdjvhafnlfixyi8p1xl9dyan6zwr2hbq9i2";} + {name="lskat";value="0qgsfy67pvvg058i1ik4h45d8n4x7npbvbhwcv9p29ar57vg1xd9";} + {name="marble";value="0fclzqvda5jjqy0mqbbq1wsb6s3xjbcx6nwzmc72f2ni2qas3yyx";} + {name="mplayerthumbs";value="04a8rccs0amgkmvgzqfz01ng13s287gyllppsqhxfr8ndpqdxp06";} + {name="nepomuk-core";value="1hj2z2sxghk71cqaz62v7b1lab0c3hh8cb6bb6fm6abg3gcb4z7g";} + {name="nepomuk-widgets";value="1w11va7m2665xlm1lgg7jx7qqxkpicr9mblf53vlvssljq96qak0";} + {name="okular";value="0lgri7y5zf2hx7zyi8i02i1amqcsn6k7nwbq77cgs2xlmj9kr7dn";} + {name="oxygen-icons";value="1wsac10jdxc7ywwm46mdvsxnil7bnzpdrcn3yjjdrkjjsn4kgj1i";} + {name="pairs";value="0gfq7cgxs3k2449fa5rdklwamrs5brj23zi19jns6x6mgasnl5ww";} + {name="palapeli";value="1grj7bm0im94crjzav3vlgqn9w014n55v6mms51r0issa2lpcblx";} + {name="parley";value="0wfcmrgzygz7pwgpsi5wzswk3wnimrxkdhby5jcdpaphwcn7pml2";} + {name="perlkde";value="0l3bz1l2s5p7kq785a9yvgnr28xlq2sddd7kzdbwahb0jrbhbyra";} + {name="perlqt";value="0j1a38qm3iqgdxx28flaam8v49r7l4lwg89by3vqsymc9bd787r8";} + {name="picmi";value="0p18667nybyr41b3n55s0862vvnhy1fw3gm7n0xa6r57dlkcsxjs";} + {name="print-manager";value="18scysv26jrzm36wrhjcad7qrf98hy2yq3b14j5ra1vdnr1n8nkk";} + {name="pykde4";value="1zq4xivx4xiwkdpz54llahjvfvx89bpf09jr275mj1rxayl2plma";} + {name="qtruby";value="0rbkqdvn36bgac6zv552jpgh8np6mf90hckf8g07npbf4sirgawa";} + {name="qyoto";value="0zbf7mpabazqwqh8g1dkg41bp06mvk9pcfh5m2br95wixcd6hv4g";} + {name="rocs";value="1ia1qfnhdic9py12nycp8v5lpyr6py4x5vvmj51b5w7h1m841dnd";} + {name="smokegen";value="1ybpxhh9fldzxha9307x8dq45zizqlj3cjwap3b4j4darvmsm0ky";} + {name="smokekde";value="1r0vq064afr6ih0is90wlidl0pxllk00hrzsqy5hgvr5c2yhaynk";} + {name="smokeqt";value="0df2js5k9vwzakcix06k1sprsrm1jl6fgnpsxs9r05a3mkkdl37q";} + {name="step";value="1dgqfycsf0d2fzrlkpw9d2s6aw11ik4cv9m37xdaciw1qkfjc6w2";} + {name="superkaramba";value="0mrk1vipxh65r9gwys89y1iacb7423mqx031abpry78jsa4prc4d";} + {name="svgpart";value="0bkbp7qd6xq3fdsn68r74a92r7pw97v494h78w4vrc06xx4v912w";} + {name="sweeper";value="1azvnv32r2fg8ha0ly3bkp2xc3s4kdvyyj9vl0p8az1q86x0z3jj";} +]; +modules=[ +{ + module="kdemultimedia"; + split=true; + pkgs=[ + { name="audiocd-kio"; sane="audiocd_kio"; } + { name="dragon"; } + { name="ffmpegthumbs"; } + { name="juk"; } + { name="kmix"; } + { name="kscd"; } + { name="libkcddb"; } + { name="libkcompactdisc"; } + { name="mplayerthumbs"; } + ]; +} +{ + module="kdegraphics"; + split=true; + pkgs=[ + { name="gwenview"; } + { name="kamera"; } + { name="kcolorchooser"; } + { name="kdegraphics-mobipocket"; sane="kdegraphics_mobipocket"; } + { name="kdegraphics-strigi-analyzer"; sane="kdegraphics_strigi_analyzer"; } + { name="kdegraphics-thumbnailers"; sane="kdegraphics_thumbnailers"; } + { name="kgamma"; } + { name="kolourpaint"; } + { name="kruler"; } + { name="ksaneplugin"; } + { name="ksnapshot"; } + { name="libkdcraw"; } + { name="libkexiv2"; } + { name="libkipi"; } + { name="libksane"; } + { name="okular"; } + { name="svgpart"; } + ]; +} +{ + module="kdelibs"; + split=true; + pkgs=[ + { name="kdelibs"; } + { name="nepomuk-core"; sane="nepomuk_core"; } + { name="nepomuk-widgets"; sane="nepomuk_widgets"; } + ]; +} +{ + module="kdeutils"; + split=true; + pkgs=[ + { name="ark"; } + { name="filelight"; } + { name="kcalc"; } + { name="kcharselect"; } + { name="kdf"; } + { name="kfloppy"; } + { name="kgpg"; } + { name="kremotecontrol"; } + { name="ktimer"; } + { name="kwallet"; } + { name="print-manager"; sane="print_manager"; } + { name="superkaramba"; } + { name="sweeper"; } + ]; +} +{ + module="applications"; + split=true; + pkgs=[ + { name="kate"; } + { name="konsole"; } + ]; +} +{ + module="kdegames"; + split=true; + pkgs=[ + { name="bomber"; } + { name="bovo"; } + { name="granatier"; } + { name="kajongg"; } + { name="kapman"; } + { name="katomic"; } + { name="kblackbox"; } + { name="kblocks"; } + { name="kbounce"; } + { name="kbreakout"; } + { name="kdiamond"; } + { name="kfourinline"; } + { name="kgoldrunner"; } + { name="kigo"; } + { name="killbots"; } + { name="kiriki"; } + { name="kjumpingcube"; } + { name="klickety"; } + { name="klines"; } + { name="kmahjongg"; } + { name="kmines"; } + { name="knavalbattle"; } + { name="knetwalk"; } + { name="kolf"; } + { name="kollision"; } + { name="konquest"; } + { name="kpat"; } + { name="kreversi"; } + { name="kshisen"; } + { name="ksirk"; } + { name="ksnakeduel"; } + { name="kspaceduel"; } + { name="ksquares"; } + { name="ksudoku"; } + { name="ktuberling"; } + { name="kubrick"; } + { name="libkdegames"; } + { name="libkmahjongg"; } + { name="lskat"; } + { name="palapeli"; } + { name="picmi"; } + ]; +} +{ + module="kdeedu"; + split=true; + pkgs=[ + { name="analitza"; } + { name="blinken"; } + { name="cantor"; } + { name="kalgebra"; } + { name="kalzium"; } + { name="kanagram"; } + { name="kbruch"; } + { name="kgeography"; } + { name="khangman"; } + { name="kig"; } + { name="kiten"; } + { name="klettres"; } + { name="kmplot"; } + { name="kstars"; } + { name="ktouch"; } + { name="kturtle"; } + { name="kwordquiz"; } + { name="libkdeedu"; } + { name="marble"; } + { name="pairs"; } + { name="parley"; } + { name="rocs"; } + { name="step"; } + ]; +} +{ + module="kdebindings"; + split=true; + pkgs=[ + { name="kimono"; } + { name="korundum"; } + { name="kross-interpreters"; sane="kross_interpreters"; } + { name="perlkde"; } + { name="perlqt"; } + { name="pykde4"; } + { name="qtruby"; } + { name="qyoto"; } + { name="smokegen"; } + { name="smokekde"; } + { name="smokeqt"; } + ]; +} +{ + module="kdeaccessibility"; + split=true; + pkgs=[ + { name="jovie"; } + { name="kaccessible"; } + { name="kmag"; } + { name="kmousetool"; } + { name="kmouth"; } + ]; +} +{ + module="kde-baseapps"; +sane="kde_baseapps"; split=true; + pkgs=[ + { name="kde-baseapps"; sane="kde_baseapps"; } + ]; +} +{ module="kactivities"; split=false;} +{ module="kdeadmin"; split=false; + pkgs=[ + { name="strigi-analyzer"; sane="strigi_analyzer";} + { name="kuser"; } + { name="kcron"; } + { name="ksystemlog"; } + ]; + +} +{ module="kdeartwork"; split=false; + pkgs=[ + { name="ColorSchemes"; } + { name="IconThemes"; } + { name="emoticons"; } + { name="kscreensaver"; } + { name="kwin-styles"; sane="kwin_styles";} + { name="sounds"; } + { name="styles"; } + { name="wallpapers"; } + { name="HighResolutionWallpapers"; } + { name="WeatherWallpapers"; } + { name="desktopthemes"; } + ]; + +} +{ module="kde-base-artwork"; sane="kde_base_artwork"; split=false;} +{ module="kdenetwork"; split=false; + pkgs=[ + { name="kfile-plugins"; sane="kfile_plugins";} + { name="kget"; } + { name="kopete"; } + { name="krdc"; } + { name="kppp"; } + { name="krfb"; } + { name="kdnssd"; } + { name="filesharing"; } + ]; + +} +{ module="kdepim"; split=false;} +{ module="kdepimlibs"; split=false;} +{ module="kdepim-runtime"; sane="kdepim_runtime"; split=false;} +{ module="kdeplasma-addons"; sane="kdeplasma_addons"; split=false;} +{ module="kde-runtime"; sane="kde_runtime"; split=false;} +#had to add fake pkgs to kdesdk to get it to be treated like a split module +{ module="kdesdk"; split=false; pkgs = [{ name="fake"; }]; } +{ module="kdetoys"; split=false; + pkgs=[ + { name="kteatime"; } + { name="ktux"; } + { name="amor"; } + ]; + +} +{ module="kde-wallpapers"; sane="kde_wallpapers"; split=false;} +{ module="kdewebdev"; split=false; + pkgs=[ + { name="klinkstatus"; } + { name="kfilereplace"; } + { name="kimagemapeditor"; } + { name="kommander"; } + ]; + +} +{ module="kde-workspace"; sane="kde_workspace"; split=false;} +{ module="oxygen-icons"; sane="oxygen_icons"; split=false;} +]; +} diff --git a/pkgs/desktops/kde-4.10/kde-wallpapers.nix b/pkgs/desktops/kde-4.10/kde-wallpapers.nix index fe463786e4caa7f132db26093ead7faa6f31f26c..6e559ad8a6c2f2ed4cc2897f0a1977324ab5d75f 100644 --- a/pkgs/desktops/kde-4.10/kde-wallpapers.nix +++ b/pkgs/desktops/kde-4.10/kde-wallpapers.nix @@ -9,7 +9,7 @@ kde { outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "1qpnv4f8f2aga3i1w9k0f0s6myilnm0f9mja8ikkkgi2qpv1q66f"; + outputHash = "01k4rr7xkay5j0g8qwmfmvf4d0rjc9sdk121wravsagbidz3s9ci"; meta = { description = "Wallpapers for KDE"; diff --git a/pkgs/desktops/kde-4.10/kdelibs/kdelibs.nix b/pkgs/desktops/kde-4.10/kdelibs/kdelibs.nix index 16e082ac07b318cf3e4c0a74c0013a818e36b419..6bb6b7ebfdf109862cc2850e1613a4d0ab503ca0 100644 --- a/pkgs/desktops/kde-4.10/kdelibs/kdelibs.nix +++ b/pkgs/desktops/kde-4.10/kdelibs/kdelibs.nix @@ -57,6 +57,8 @@ kde { "-DHUPNP_ENABLED=ON" ]; + passthru.wantsUdisks2 = false; + meta = { description = "KDE libraries"; license = "LGPL"; diff --git a/pkgs/desktops/kde-4.10/l10n/manifest-4.10.2.nix b/pkgs/desktops/kde-4.10/l10n/manifest-4.10.2.nix deleted file mode 100644 index 93e47d2e63a2b990bf2d72be9c89c51fdf6689a5..0000000000000000000000000000000000000000 --- a/pkgs/desktops/kde-4.10/l10n/manifest-4.10.2.nix +++ /dev/null @@ -1,282 +0,0 @@ -[ -{ - lang = "ar"; - saneName = "ar"; - sha256 = "1si3hkxag2s93vywr8spiwaz8rr287b8ms0akw7ba4hr3mccgllz"; -} -{ - lang = "bg"; - saneName = "bg"; - sha256 = "1dfp2zkzj5h0qqz03sicdvw024afc49vlj59k973vqnziwqwkvil"; -} -{ - lang = "bs"; - saneName = "bs"; - sha256 = "0v56by3jxpn76dcbrz89np6par2ndmz6l9lgpyzi3qgh7c1flh3k"; -} -{ - lang = "ca"; - saneName = "ca"; - sha256 = "0xj157l9h6frac4pnfsirh06j7kdq37wlikm7rnybnpdg7nv4kls"; -} -{ - lang = "ca@valencia"; - saneName = "ca_valencia"; - sha256 = "0zrc3cpbiarsfh2jqrrhxalmz62k5bb9wf9vbfcvbh90a0v5csaw"; -} -{ - lang = "cs"; - saneName = "cs"; - sha256 = "1scy726cxyv6gmh77wnfb8qb00vhhxxg1wwg8lk56r79jsh77pbh"; -} -{ - lang = "da"; - saneName = "da"; - sha256 = "1qdhzw9v1q188bky8phv3wj0sj3imf08j3bqqf2gcniw2zr0nkhq"; -} -{ - lang = "de"; - saneName = "de"; - sha256 = "13r97in3yl17scq41fncbzp3s99c2ahspxixcjb5b066c9ln4n4z"; -} -{ - lang = "el"; - saneName = "el"; - sha256 = "0c3w2cxmv46l85kg9d68v037br0ck423k0zfkyi01hgh76jixhnm"; -} -{ - lang = "en_GB"; - saneName = "en_GB"; - sha256 = "158i25z1b5hj5fhhsczf52l2369xmzyxfjjr1xp9pp5aga2kp3dc"; -} -{ - lang = "es"; - saneName = "es"; - sha256 = "0vm2sr5nqzjssm2mzjw56wwsygzasrr04pl77y4mvq1d573gaks3"; -} -{ - lang = "et"; - saneName = "et"; - sha256 = "0w4dqvgain4m14cr8vmr49a890lmjiz203vw347fyq6mvqg57f3z"; -} -{ - lang = "eu"; - saneName = "eu"; - sha256 = "1809g1jdbrp22572h68zr7a5riymzv240hpmh633v8qmdqyzmnlk"; -} -{ - lang = "fa"; - saneName = "fa"; - sha256 = "1y1m9zagw1wras6vfrw6zbhy08xm1djfg7wg0fqvr2pnw01b903f"; -} -{ - lang = "fi"; - saneName = "fi"; - sha256 = "0fd6zbxn1dcq3i8vp6m4ifsrfhpghbgvwrh0gqmpw60kr9ms72pj"; -} -{ - lang = "fr"; - saneName = "fr"; - sha256 = "1ybdnvsb2fi8hymad4fj7dhgfqjabbhgjgmcs4g0px583gbx38ys"; -} -{ - lang = "ga"; - saneName = "ga"; - sha256 = "1hcdx82213dhy6v2hy9c543fci8pj3p5lz2bb0sds14wscryngiy"; -} -{ - lang = "gl"; - saneName = "gl"; - sha256 = "0p0k0r42wqp9ww0w4k4dp0cp9mv4is1zffsnpb1vdj8fr4n73lms"; -} -{ - lang = "he"; - saneName = "he"; - sha256 = "0wfyx7w2igz078f9s3nf2gr2s2bj6kdrpsd4cycdrvi7lpkv97mg"; -} -{ - lang = "hi"; - saneName = "hi"; - sha256 = "0nr6lskvq4v885hlnwyn5c6r76lj923lnmzz7f3ymxsm8ahgy9i1"; -} -{ - lang = "hr"; - saneName = "hr"; - sha256 = "1zg11q416rlcwygbapllmhwy577gwrvxyrr2hv0knz8r6jdwxnxj"; -} -{ - lang = "hu"; - saneName = "hu"; - sha256 = "1km3w6m7m3w3315ivy80rwmn82g41cfw3id21ks8sykqray60jyf"; -} -{ - lang = "ia"; - saneName = "ia"; - sha256 = "1rb6qsvhp8r7ivsjcp2980vdkb5pczxky6wix884xdd2jyb4dqbs"; -} -{ - lang = "is"; - saneName = "is"; - sha256 = "0kngwsasyw36g05xbxcgn71mkl89xs3sg8lx3qzd6g7drk2s5r1w"; -} -{ - lang = "it"; - saneName = "it"; - sha256 = "1ckb7alln8f72x9q6hi4ji7xylaipd3zwilnrr7978y1q5b8297l"; -} -{ - lang = "ja"; - saneName = "ja"; - sha256 = "1s0m6kl0wdd22pbnrnmxq19y1nzyvmln64g5gqr9c33x08lwd3jz"; -} -{ - lang = "kk"; - saneName = "kk"; - sha256 = "1jn3pd4j5jpw8ing7hi0npkrk4cy5vbfp62jcpn93dizq71g0cis"; -} -{ - lang = "km"; - saneName = "km"; - sha256 = "1y6492rmh8hw3fw8yss80j8dnn6gah4mp207wnjx7savxdganrk9"; -} -{ - lang = "ko"; - saneName = "ko"; - sha256 = "05r7cslynx4yxlkaqq2lhjg2rmvjzz74h41if5fj3lkm9p848663"; -} -{ - lang = "lt"; - saneName = "lt"; - sha256 = "1xa7jc3jbhicqzikayssmm08mnqwhwy3gbr2xp2wyxvrwgy0vd7b"; -} -{ - lang = "lv"; - saneName = "lv"; - sha256 = "1xr2938yqkl81rwcfg43mqksm9r6zcw5bp49cm5ybrrr1np08d4p"; -} -{ - lang = "mr"; - saneName = "mr"; - sha256 = "0w4g863da74vabbx6dc7hpf6lqa09bsxm5bdl33bqp6wxz0qbrxf"; -} -{ - lang = "nb"; - saneName = "nb"; - sha256 = "1axqkkwgm3x12fpfnvxzm2bf22rh2fxic15rrk70sjc0xzkmbfc2"; -} -{ - lang = "nds"; - saneName = "nds"; - sha256 = "1y72jrw7s6afznj0axwrxczvcxm2i3m9dldjjb32w8lr2gbibhz9"; -} -{ - lang = "nl"; - saneName = "nl"; - sha256 = "01ps3fgwhzffsb52zcjgi4frgy719wlgjmrva9hl320wgi6bgs30"; -} -{ - lang = "nn"; - saneName = "nn"; - sha256 = "0a9zrn54x38c4jn2p59s3wiv42g1f7nwar2gppn992q2awq05m6x"; -} -{ - lang = "pa"; - saneName = "pa"; - sha256 = "1782vpj199ck5fswv3jc0adff0k7bv699b4la604kb0a7dl43cf2"; -} -{ - lang = "pl"; - saneName = "pl"; - sha256 = "0lldhl2jd51j3srf2dqq6gd4nxy6y3qxd585bgxpclvnmz7zqq9b"; -} -{ - lang = "pt"; - saneName = "pt"; - sha256 = "10w740h5h3ag2jpj44xyclpya59d8jmgv5ma1rz27wcvwl38jggx"; -} -{ - lang = "pt_BR"; - saneName = "pt_BR"; - sha256 = "1rn5jc9dihi0mwvly1rk1fqzdbhyg9gxax1bip0l80wg8mj9d0h5"; -} -{ - lang = "ro"; - saneName = "ro"; - sha256 = "1l1b9j9ixianyvbg2msc4d4bkm2km3w0h6xkbcyl7rg0cja9ys8l"; -} -{ - lang = "ru"; - saneName = "ru"; - sha256 = "0rgasg2c0ds96yqky1rnqj7fc9w3g6p0ng27v5vq3ja7paij1yv9"; -} -{ - lang = "si"; - saneName = "si"; - sha256 = "0124dhn1ng225zhyz8lmc2lf6cpxbbirr3bl3h6cq8lyjs4p078l"; -} -{ - lang = "sk"; - saneName = "sk"; - sha256 = "0xfp2wh1qyyh1cixypam9qnni0zin580vcbnhpmbx5disy3znmga"; -} -{ - lang = "sl"; - saneName = "sl"; - sha256 = "1hfqq8k5n48hjypj5sribh761gpgn930410qbdnrxjmm0l95rzlp"; -} -{ - lang = "sr"; - saneName = "sr"; - sha256 = "1rma3l9mpm1xakkf2mkjpa6nxhl076hnm6fiirna7nsgvsk2c3jz"; -} -{ - lang = "sv"; - saneName = "sv"; - sha256 = "02rg9hm0j1lfdv9nb80bh4yy41z3rvfh39w8xwrmv941y6k58q7w"; -} -{ - lang = "tg"; - saneName = "tg"; - sha256 = "16731c2bjg3c8r7i6lm6j3gsj9yqs2yd69sl04y9nv5yh1i0km15"; -} -{ - lang = "th"; - saneName = "th"; - sha256 = "032zwwn5za8cknmqxd8yzr3djylnvrzjldgygqlshf0pxkryjkrp"; -} -{ - lang = "tr"; - saneName = "tr"; - sha256 = "1bp8bndwyw33rkkv2dhs1l9qbzkhccsrqcflxnjrm98shks2vgzr"; -} -{ - lang = "ug"; - saneName = "ug"; - sha256 = "0hhdj4yb208rmpd9a77jf7x9p5iq35iyvn68sr6n1m228pncddi6"; -} -{ - lang = "uk"; - saneName = "uk"; - sha256 = "0sw07alwjw7qiss93bgf4h5ix9kpz2czfwbbgdydfwqcwz5nzvcy"; -} -{ - lang = "vi"; - saneName = "vi"; - sha256 = "06fchmphkp7rpg6i0gd50qyjlfr6drj0xnlkdczw54iy1zklrlmh"; -} -{ - lang = "wa"; - saneName = "wa"; - sha256 = "1pm3wvs88h03gch6nzn5hd268r2q4jd13slh6bh2nvhq719g8zsa"; -} -{ - lang = "zh_CN"; - saneName = "zh_CN"; - sha256 = "0k8j3dprpzxi87rd6xhp1qr93jg91i0hym87y7wlqb239aqz41dn"; -} -{ - lang = "zh_TW"; - saneName = "zh_TW"; - sha256 = "05ks7gdl3x6wkxs2rdj6f48bpd4cishw9zfh0a264kix6mh2fzcq"; -} -] diff --git a/pkgs/desktops/kde-4.10/l10n/manifest-4.10.3.nix b/pkgs/desktops/kde-4.10/l10n/manifest-4.10.3.nix new file mode 100644 index 0000000000000000000000000000000000000000..102363ba1dee8a32683e00f023fb7873cff51ba5 --- /dev/null +++ b/pkgs/desktops/kde-4.10/l10n/manifest-4.10.3.nix @@ -0,0 +1,282 @@ +[ +{ + lang = "ar"; + saneName = "ar"; + sha256 = "0m9zzggcq9ril1wklq1w94hgqdzg78m9v932j1hv1h1nvsjf2gkl"; +} +{ + lang = "bg"; + saneName = "bg"; + sha256 = "1c6y2b249sh8k76q1ahw1z4lfn9riqhngxhmrjc6qsi3lpfd851n"; +} +{ + lang = "bs"; + saneName = "bs"; + sha256 = "0q7jcw0085cm8wnr5fykim6yvvvps4hn9z9anb8dmgxrzyvvr2p4"; +} +{ + lang = "ca"; + saneName = "ca"; + sha256 = "1mzcmxqlabgfhdq4bkwcc5gv2dpx0yxkwln5whyjzy7jz5wz5hhl"; +} +{ + lang = "ca@valencia"; + saneName = "ca_valencia"; + sha256 = "1laz6av9xssdmkd3xcz68bbjdp1b61py0xpqhj90ma1bhza9rk5v"; +} +{ + lang = "cs"; + saneName = "cs"; + sha256 = "12smzrr5chavlg0xis993f60hwqrh1hrbkh0n6n5m3mdsfi5dwix"; +} +{ + lang = "da"; + saneName = "da"; + sha256 = "0a0hm328lvw9ahw4xmbwsyngidpawjcc3fi9kinqsss4srm257jc"; +} +{ + lang = "de"; + saneName = "de"; + sha256 = "1wz9ly4yqs20s3c6lb92p8v1hylidkp57j8v02qys7883j5rii8w"; +} +{ + lang = "el"; + saneName = "el"; + sha256 = "0954c5jar0lmjnivnnbbs2b04xd58l7s0s3adbnrg392cvq92ca7"; +} +{ + lang = "en_GB"; + saneName = "en_GB"; + sha256 = "15y0s4y9rqqc8g0qm9v4l9w2km6589xckyd9c21bqhx0nsk2dm5k"; +} +{ + lang = "es"; + saneName = "es"; + sha256 = "0d7blp0xc808gfhyjww60zdr9wbp5lx1m4i8cca8l683rbxqcbvb"; +} +{ + lang = "et"; + saneName = "et"; + sha256 = "07l9w9mk4xylk5s00xs1i8vpa0fhy2fxngqayqyr3n0ljj0ls9my"; +} +{ + lang = "eu"; + saneName = "eu"; + sha256 = "1g8yap82jz9nvj25bihrw4xrbjq6669l3qlikjsb89x9jxdslncj"; +} +{ + lang = "fa"; + saneName = "fa"; + sha256 = "0492aps0xvw8krcq5h0rx7farm96k0s3apc3lhxxx9g1flxpjffa"; +} +{ + lang = "fi"; + saneName = "fi"; + sha256 = "0pnmjikbn077h6p2inkpisgyrkmfy0wphbmif3spli07nakd1kaw"; +} +{ + lang = "fr"; + saneName = "fr"; + sha256 = "1hs53c35fpxkrgfpdfp3qxyy6sh6wv2zcb078rrpc1yc8vjxs31q"; +} +{ + lang = "ga"; + saneName = "ga"; + sha256 = "1d6ch6hkc7vncpwkqg5prm1ngkgckr8ynk32w6vi5lkhcc1lmi2g"; +} +{ + lang = "gl"; + saneName = "gl"; + sha256 = "16jrf6zb4glsighllq7n1hg73la6g3gzbzs4c56yhgyyi8x02i7h"; +} +{ + lang = "he"; + saneName = "he"; + sha256 = "0gjhnypd2lrrx2v0kn2h2iqclhy8fh38z5fzry2m0dgzxqpj7nmw"; +} +{ + lang = "hi"; + saneName = "hi"; + sha256 = "0pplwd10jancgfilywl12fifsnng1dw1j87ph1khgx786q0fncwj"; +} +{ + lang = "hr"; + saneName = "hr"; + sha256 = "1a33p1pic8g9cfjx1inry1dxf2lsz91cw7v3niwv5a3xsyd1p5sw"; +} +{ + lang = "hu"; + saneName = "hu"; + sha256 = "08q62d900hyfzf2lnysjk4bg7gg5lgna80x537fkpz5klbmhipar"; +} +{ + lang = "ia"; + saneName = "ia"; + sha256 = "010gjkpky3arbfhhhwb51px2qwcn35ppfg1rhm16vvpmi4whz768"; +} +{ + lang = "is"; + saneName = "is"; + sha256 = "1pdla5xvx0jqs0bzz8ncgjllg39wa4a67lzz9mr2j4w51c4y2s5p"; +} +{ + lang = "it"; + saneName = "it"; + sha256 = "1i2cvvyknjmznag1raf1i3d6s91m084whk2vk5kywlbncmncx3bm"; +} +{ + lang = "ja"; + saneName = "ja"; + sha256 = "18b5j98ysg9ps232wj5b3rkxqhj002rr2yzkffsysmqm6232azw6"; +} +{ + lang = "kk"; + saneName = "kk"; + sha256 = "14n8y8wy8pbvxix4zgs2lvffcppya491y79pgr4zfgjbckz8hbw9"; +} +{ + lang = "km"; + saneName = "km"; + sha256 = "0qy7xzn8asv8nxq899fisbjdflz2dmg1kx8zmw78xxjyl6kdiqrc"; +} +{ + lang = "ko"; + saneName = "ko"; + sha256 = "0l9h9q8c6z8g4hc2vk6vla85gjk9ghkwpwd7mpqsa8q60qbqa1r3"; +} +{ + lang = "lt"; + saneName = "lt"; + sha256 = "0xq83xnx533075ml5xg4mnhi8a5k41v16riqd9rfgbwj82w098xz"; +} +{ + lang = "lv"; + saneName = "lv"; + sha256 = "1x1afwssvxzkk605j9895c3h363gnra9zjyw5fyvgh02hrfysv7f"; +} +{ + lang = "mr"; + saneName = "mr"; + sha256 = "1akl0l8dmsshwsvy0m9hlprkxlx345v1r5wh2zbyad3nzz1sa2ig"; +} +{ + lang = "nb"; + saneName = "nb"; + sha256 = "1div9bf6hhisrvcrlmdiwkzk4wnff2gdzwjp81nqldfhaw098hip"; +} +{ + lang = "nds"; + saneName = "nds"; + sha256 = "1ll2m6jxkwqg6z7bp816j04gf7a0x98yk3qxlp7an4khacqy60pl"; +} +{ + lang = "nl"; + saneName = "nl"; + sha256 = "0dchxgsr8m1awwahwqyrbrq55035rpkv6387z9qwmz8098yx1vgf"; +} +{ + lang = "nn"; + saneName = "nn"; + sha256 = "1liv2q1yblq55lk20sg4qma4kfa05c1wsp1y8zqv456h10ksmh67"; +} +{ + lang = "pa"; + saneName = "pa"; + sha256 = "031idmcpkcnr3qmbg94zwpzf8vw5wia8mndggis6shrf9gnnkhs2"; +} +{ + lang = "pl"; + saneName = "pl"; + sha256 = "1k5ng4gxn7gnhhh674fzwhhzwmawnxx5bn94dhizsqx3ix533vlw"; +} +{ + lang = "pt"; + saneName = "pt"; + sha256 = "0v4nv8d1v8fvsgb6mhxkymcbndjdc9qgx8kd5b2hpyqnppgib4vm"; +} +{ + lang = "pt_BR"; + saneName = "pt_BR"; + sha256 = "1i7siqyh0ds1g6w7vzsys6zdvgphs14hd4xxh66qn5s5zmrr0l83"; +} +{ + lang = "ro"; + saneName = "ro"; + sha256 = "02vf365r6mr0bghkj58f6d6ivkd4fcp6mxy9jz7ap8km8jjbiyky"; +} +{ + lang = "ru"; + saneName = "ru"; + sha256 = "0rjm6c6aw1kim61rgp8fkqgi9915d6kh1jk4kas064gkwwxl3q2p"; +} +{ + lang = "si"; + saneName = "si"; + sha256 = "12z8bvd1a0hzr9x05pv09lznnfh9mngxw86rhfyhx382zrbz1vha"; +} +{ + lang = "sk"; + saneName = "sk"; + sha256 = "16xbin5c8slxxdag7zl8xigmmklm6fl3icy4qdhaglvim07xf995"; +} +{ + lang = "sl"; + saneName = "sl"; + sha256 = "09flw3yr3slhqgjl3aq2p25rl46a90q7gd3p7812lmw3lwpcaxh6"; +} +{ + lang = "sr"; + saneName = "sr"; + sha256 = "1p4xlshvz6avnr9dc7yggn53lfh1i5hz14dr8i1ndwj8bhgrzy6m"; +} +{ + lang = "sv"; + saneName = "sv"; + sha256 = "10ma8f1csc2akg0vfwh1wmhj9bwwq0yfn1s5x5ighn67z4jxbp0s"; +} +{ + lang = "tg"; + saneName = "tg"; + sha256 = "065x638nr5wsxs9y0hldbdkp0wgyfnrjlsmyvhg96abrlbs4kgid"; +} +{ + lang = "th"; + saneName = "th"; + sha256 = "1qk9khh63qqj5pz92w6l1c1ailcm02mhka215b7qw3waackab3iq"; +} +{ + lang = "tr"; + saneName = "tr"; + sha256 = "1n7w8pmn4r4d3hqm88ya2j3phxsvgy8d57skym3lv30y4116yzkj"; +} +{ + lang = "ug"; + saneName = "ug"; + sha256 = "068s6ilx62l33iandrdisqd2405hhp5gpxpl7x95avrsy016ni1c"; +} +{ + lang = "uk"; + saneName = "uk"; + sha256 = "1jvs7bmppzzw1wahcmdy4cq7sblsl6vhrfz91ryc4jcr4klxy7k4"; +} +{ + lang = "vi"; + saneName = "vi"; + sha256 = "0knnc1f7pwfm10xiykajax1xp41psvak1n479n6dji3na0larf5s"; +} +{ + lang = "wa"; + saneName = "wa"; + sha256 = "0fw8d3ia3pxpkn6q03188z636z3gk2xciq3igkyjdyfmf14nbwv6"; +} +{ + lang = "zh_CN"; + saneName = "zh_CN"; + sha256 = "0s16ns3zjcabq3s27ak9isyqikd6gw5gyvxji5fly9mgcs1dkgmr"; +} +{ + lang = "zh_TW"; + saneName = "zh_TW"; + sha256 = "0fy6cib6c7xnacjybyizb3chynqd1fv70447glvjwls9v8avgcpl"; +} +] diff --git a/pkgs/desktops/kde-4.10/oxygen-icons.nix b/pkgs/desktops/kde-4.10/oxygen-icons.nix index 34af88a319319c867dbaaa19dd8840d9dc976d7f..4f6008865157f4398e9de884df814584c9ce5e26 100644 --- a/pkgs/desktops/kde-4.10/oxygen-icons.nix +++ b/pkgs/desktops/kde-4.10/oxygen-icons.nix @@ -3,7 +3,7 @@ kde { outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "10dpbgidn7rwdhm044ydd294dv97hrhaz7jakf1yncszqbhbxksc"; + outputHash = "13fyib1v03n3fpq27n2q1yg130qjnz80kwdqccq46za96xb6yrs9"; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/desktops/xfce/4_08.nix b/pkgs/desktops/xfce/4_08.nix deleted file mode 100644 index d29e3ac51ef0df4f052e0c01270c937bb1fc4184..0000000000000000000000000000000000000000 --- a/pkgs/desktops/xfce/4_08.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ pkgs, newScope }: let - -common = (import ./common.nix) { inherit pkgs newScope xfce_self; }; -callPackage = common.callPackage; - -xfce_self = common.xfce_common // rec { # the lines are very long but it seems better than the even-odd line approach - - #### CORE - - exo = callPackage ./core/exo.nix { v= "0.6.2"; h= "0f8zh5y057l7xffskjvky6k88hrnz6jyk35mvlfpmx26anlgd77l"; }; - libxfce4ui = callPackage ./core/libxfce4ui.nix { v= "4.8.1"; h= "0mlrcr8rqmv047xrb2dbh7f4knsppb1anx2b05s015h6v8lyvjrr"; }; - libxfce4util = callPackage ./core/libxfce4util.nix { v= "4.8.2"; h= "05n8586h2fwkibfld5fm4ygx1w66jnbqqb3li0ardjvm2n24k885"; }; - libxfcegui4 = callPackage ./core/libxfcegui4.nix { v= "4.8.1"; h= "0hr4h6a9p6w3qw1976p8v9c9pwhd9zhrjlbaph0p7nyz7j1836ih"; }; - thunar = callPackage ./core/thunar.nix { v= "1.2.3"; h= "19mczys6xr683r68g3s2njrrmnk1p73zypvwrhajw859c6nsjsp6"; }; - xfce4panel = callPackage ./core/xfce4-panel.nix { v= "4.8.6"; h= "00zdkg1jg4n2n109nxan8ji2m06r9mc4lnlrvb55xvj229m2dwb6"; }; - xfce4session = callPackage ./core/xfce4-session.nix { v= "4.8.2"; h= "1l608kik98jxbjl73waf8515hzji06lr80qmky2qlnp0b6js5g1i"; }; - xfce4settings = callPackage ./core/xfce4-settings.nix { v= "4.8.3"; h= "0bmw0s6jp2ws4n0f3387zwsyv46b0w89m6r70yb7wrqy9r3wqy6q"; }; - xfceutils = callPackage ./core/xfce-utils.nix { v= "4.8.3"; h= "09mr0amp2f632q9i3vykaa0x5nrfihfm9v5nxsx9vch8wvbp0l03"; }; - xfconf = callPackage ./core/xfconf.nix { v= "4.8.1"; h= "1jwkb73xcgqfly449jwbn2afiyx50p150z60x19bicps75sp6q4q"; }; - xfdesktop = callPackage ./core/xfdesktop.nix { v= "4.8.3"; h= "097lc9djmay0jyyl42jmvcfda75ndp265nzn0aa3hv795bsn1175"; }; - xfwm4 = callPackage ./core/xfwm4.nix { v= "4.8.3"; h= "0zi2g1d2jdgw5armlk9xjh4ykmydy266gdba86nmhy951gm8n3hb"; }; - - xfce4_appfinder = callPackage ./core/xfce4-appfinder.nix { v= "4.8.0"; h= "0zy7i9x4qjchmyb8nfpb7m2ply5n2aq35p9wrhb8lpz4am1ihx7x"; }; - - #### APPLICATIONS - - terminal = null; # newer versions don't build with 4.8 - - # versions > 0.3* don't build with xfce-4.8.* - ristretto = callPackage ./applications/ristretto.nix { v= "0.3.7"; h= "19mzy159j4qhd7pd1b83gimxfdg3mwdab9lq9kk505d21r7iqc9b"; }; - - xfce4mixer = callPackage ./applications/xfce4-mixer.nix { v= "4.8.0"; h= "1aqgjxvck6hx26sk3n4n5avhv02vs523mfclcvjb3xnks3yli7wz"; }; - -}; # xfce_self - -in xfce_self - diff --git a/pkgs/desktops/xfce/4_10.nix b/pkgs/desktops/xfce/4_10.nix deleted file mode 100644 index 3f846198e3f55ba1bb25cfe293338a24cfe21817..0000000000000000000000000000000000000000 --- a/pkgs/desktops/xfce/4_10.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ pkgs, newScope }: let - -common = (import ./common.nix) { inherit pkgs newScope xfce_self; }; -callPackage = common.callPackage; - -xfce_self = common.xfce_common // rec { # the lines are very long but it seems better than the even-odd line approach - - #### CORE - - exo = callPackage ./core/exo.nix { v= "0.10.2"; h= "1kknxiz703q4snmry65ajm26jwjslbgpzdal6bd090m3z25q51dk"; }; - libxfce4ui = callPackage ./core/libxfce4ui.nix { v= "4.10.0"; h= "1qm31s6568cz4c8rl9fsfq0xmf7pldxm0ki62gx1cpybihlgmfd2"; }; - libxfce4util = callPackage ./core/libxfce4util.nix { v= "4.10.0"; h= "13k0wwbbqvdmbj4xmk4nxdlgvrdgr5y6r3dk380mzfw053hzwy89"; }; - libxfcegui4 = callPackage ./core/libxfcegui4.nix { v= "4.10.0"; h= "0cs5im0ib0cmr1lhr5765yliqjfyxvk4kwy8h1l8bn3mj6bzk0ib"; }; - thunar = callPackage ./core/thunar.nix { v= "1.6.2"; h= "11dx38rvkfbp91pxrprymxhimsm90gvizp277x9s5rwnwcm1ggbx"; }; - xfce4panel = callPackage ./core/xfce4-panel.nix { v= "4.10.0"; h= "1f8903nx6ivzircl8d8s9zna4vjgfy0qhjk5d2x19g9bmycgj89k"; }; - xfce4session = callPackage ./core/xfce4-session.nix { v= "4.10.0"; h= "1kj65jkjhd0ysf0yxsf88wzpyv6n8i8qgd3gb502hf1x9jksk2mv"; }; - xfce4settings = callPackage ./core/xfce4-settings.nix { v= "4.10.0"; h= "0zppq747z9lrxyv5zrrvpalq7hb3gfhy9p7qbldisgv7m6dz0hq8"; }; - xfceutils = null; # removed in 4.10 - xfconf = callPackage ./core/xfconf.nix { v= "4.10.0"; h= "0xh520z0qh0ib0ijgnyrgii9h5d4pc53n6mx1chhyzfc86j1jlhp"; }; - xfdesktop = callPackage ./core/xfdesktop.nix { v= "4.10.0"; h= "0yrddj1lgk3xn4w340y89z7x2isks72ia36pka08kk2x8gpfcyl9"; }; - xfwm4 = callPackage ./core/xfwm4.nix { v= "4.10.0"; h= "170zzs7adj47srsi2cl723w9pl8k8awd7w1bpzxby7hj92zmf8s9"; }; - - xfce4_appfinder = callPackage ./core/xfce4-appfinder.nix { v= "4.9.4"; h= "12lgrbd1n50w9n8xkpai98s2aw8vmjasrgypc57sp0x0qafsqaxq"; }; - - #### APPLICATIONS - - ristretto = callPackage ./applications/ristretto.nix { v= "0.6.3"; h= "0y9d8w1plwp4vmxs44y8k8x15i0k0xln89k6jndhv6lf57g1cs1b"; }; - terminal = xfce4terminal; # it has changed its name - xfce4mixer = callPackage ./applications/xfce4-mixer.nix { v= "4.10.0"; h= "1pnsd00583l7p5d80rxbh58brzy3jnccwikbbbm730a33c08kid8"; }; - xfce4terminal = callPackage ./applications/terminal.nix { v= "0.6.1"; h= "1j6lpkq952mrl5p24y88f89wn9g0namvywhma639xxsswlkn8d31"; }; - -}; - -in xfce_self - diff --git a/pkgs/desktops/xfce/common.nix b/pkgs/desktops/xfce/common.nix deleted file mode 100644 index 8be4ac09e145691d3d300d59b1bf538c78674e06..0000000000000000000000000000000000000000 --- a/pkgs/desktops/xfce/common.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ pkgs, newScope, xfce_self }: rec { - - callPackage = newScope (deps // xfce_self); - - deps = rec { # xfce-global dependency overrides should be here - inherit (pkgs.gnome) libglade libwnck vte gtksourceview; - inherit (pkgs.perlPackages) URI; - - # The useful bits from ‘gnome-disk-utility’. - libgdu = callPackage ./support/libgdu.nix { }; - - # Gvfs is required by Thunar for the trash feature and for volume - # mounting. Should use the one from Gnome, but I don't want to mess - # with the Gnome packages (or pull in a zillion Gnome dependencies). - gvfs = callPackage ./support/gvfs.nix { }; - - # intelligent fetcher for Xfce - fetchXfce = rec { - generic = prepend : name : hash : - let lib = pkgs.lib; - p = builtins.parseDrvName name; - versions = lib.splitString "." p.version; - ver_maj = lib.concatStrings (lib.intersperse "." (lib.take 2 versions)); - name_low = lib.toLower p.name; - in pkgs.fetchurl { - url = "mirror://xfce/src/${prepend}/${name_low}/${ver_maj}/${name}.tar.bz2"; - sha256 = hash; - }; - core = generic "xfce"; - app = generic "apps"; - art = generic "art"; - }; - }; - - xfce_common = rec { - - inherit (deps) gvfs; # used by NixOS - - #### CORE - - garcon = callPackage ./core/garcon.nix { v= "0.2.0"; h= "0v7pkvxcayi86z4f173z5l7w270f3g369sa88z59w0y0p7ns7ph2"; }; - - # not used anymore TODO: really? Update to 2.99.2? - gtk_xfce_engine = callPackage ./core/gtk-xfce-engine.nix { }; - - # ToDo: segfaults after some work - tumbler = callPackage ./core/tumbler.nix { v= "0.1.27"; h= "0s9qj99b81asmlqa823nzykq8g6p9azcp2niak67y9bp52wv6q2c"; }; - - xfce4_power_manager = callPackage ./core/xfce4-power-manager.nix { v= "1.0.10"; h= "1w120k1sl4s459ijaxkqkba6g1p2sqrf9paljv05wj0wz12bpr40"; }; - - - #### APPLICATIONS - #TODO: correct links; more stuff - - xfce4notifyd = callPackage ./applications/xfce4-notifyd.nix { v= "0.2.2"; h= "0s4ilc36sl5k5mg5727rmqims1l3dy5pwg6dk93wyjqnqbgnhvmn"; }; - gigolo = callPackage ./applications/gigolo.nix { v= "0.4.1"; h= "1y8p9bbv1a4qgbxl4vn6zbag3gb7gl8qj75cmhgrrw9zrvqbbww2"; }; - xfce4taskmanager = callPackage ./applications/xfce4-taskmanager.nix { v= "1.0.0"; h= "1vm9gw7j4ngjlpdhnwdf7ifx6xrrn21011almx2vwidhk2f9zvy0"; }; - mousepad = callPackage ./applications/mousepad.nix { v= "0.3.0"; h= "0v84zwhjv2xynvisn5vmp7dbxfj4l4258m82ks7hn3adk437bwhh"; }; - thunar_volman = callPackage ./core/thunar-volman.nix { }; - - #### ART - - xfce4icontheme = callPackage ./art/xfce4-icon-theme.nix { v= "4.4.3"; h= "1yk6rx3zr9grm4jwpjvqdkl13pisy7qn1wm5cqzmd2kbsn96cy6l"; }; - - #### PANEL PLUGINS - - xfce4_systemload_plugin = callPackage ./panel-plugins/xfce4-systemload-plugin.nix { }; - xfce4_cpufreq_plugin = callPackage ./panel-plugins/xfce4-cpufreq-plugin.nix { }; - - }; -} - diff --git a/pkgs/desktops/xfce/core/xfce4-dev-tools.nix b/pkgs/desktops/xfce/core/xfce4-dev-tools.nix deleted file mode 100644 index e56eb3f0a7137ad8fb713597170a696261f00dd8..0000000000000000000000000000000000000000 --- a/pkgs/desktops/xfce/core/xfce4-dev-tools.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, autoconf, automake, libtool, intltool }: - -stdenv.mkDerivation rec { - p_name = "xfce4-dev-tools"; - ver_maj = "4.10"; - ver_min = "0"; - - src = fetchurl { - url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "1y1byfjciqhxqfxbjfp22bn5lxk3a01ng7zfjha8h5mzzfxlk5pp"; - }; - name = "${p_name}-${ver_maj}.${ver_min}"; - - buildInputs = [ pkgconfig glib ]; - - # not needed to build it but to use it - propagatedBuildInputs = [ autoconf automake libtool intltool ]; - - meta = { - homepage = http://foo-projects.org/~benny/projects/xfce4-dev-tools/; - description = "Tools and M4 macros for Xfce4 developers"; - license = "GPLv2+"; - }; -} diff --git a/pkgs/desktops/xfce/core/xfce4-session-systemd.patch b/pkgs/desktops/xfce/core/xfce4-session-systemd.patch deleted file mode 100644 index 7780491a8eda8237ae2cce4cc484b8efb669cdbb..0000000000000000000000000000000000000000 --- a/pkgs/desktops/xfce/core/xfce4-session-systemd.patch +++ /dev/null @@ -1,470 +0,0 @@ -From ae28aef315a7a6b90f1649ce6d1f30b842791cbf Mon Sep 17 00:00:00 2001 -From: Nick Schermer -Date: Sun, 04 Nov 2012 20:23:36 +0000 -Subject: Add shutdown/reboot functionality for systemd (bug #8729). - -Based on patch by Christian Hesse and Evangelos Foutras. ---- -diff --git a/configure.in.in b/configure.in.in -index 9aa4f8f..134d0f7 100644 ---- a/configure.in -+++ b/configure.in -@@ -96,6 +96,10 @@ XDT_CHECK_PACKAGE([DBUS], [dbus-1], [1.1.0]) - XDT_CHECK_PACKAGE([DBUS_GLIB], [dbus-glib-1], [0.84]) - XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.9.0]) - -+dnl Check for polkit / systemd integration -+XDT_CHECK_OPTIONAL_PACKAGE([SYSTEMD], [polkit-gobject-1], [0.100], -+ [systemd], [Systemd support (through polit)]) -+ - dnl Check for debugging support - XDT_FEATURE_DEBUG([xfsm_debug_default]) - -diff --git a/xfce4-session/Makefile.am b/xfce4-session/Makefile.am -index c015154..f748b2b 100644 ---- a/xfce4-session/Makefile.am -+++ b/xfce4-session/Makefile.am -@@ -38,8 +38,6 @@ xfce4_session_SOURCES = \ - xfsm-compat-gnome.h \ - xfsm-compat-kde.c \ - xfsm-compat-kde.h \ -- xfsm-consolekit.c \ -- xfsm-consolekit.h \ - xfsm-dns.c \ - xfsm-dns.h \ - xfsm-error.c \ -@@ -65,6 +63,16 @@ xfce4_session_SOURCES = \ - xfsm-upower.c \ - xfsm-upower.h - -+if HAVE_SYSTEMD -+xfce4_session_SOURCES += \ -+ xfsm-systemd.c \ -+ xfsm-systemd.h -+else -+xfce4_session_SOURCES += \ -+ xfsm-consolekit.c \ -+ xfsm-consolekit.h -+endif -+ - xfce4_session_CFLAGS = \ - $(LIBSM_CFLAGS) \ - $(LIBX11_CFLAGS) \ -@@ -72,6 +80,7 @@ xfce4_session_CFLAGS = \ - $(DBUS_CFLAGS) \ - $(DBUS_GLIB_CFLAGS) \ - $(LIBWNCK_CFLAGS) \ -+ $(SYSTEMD_CFLAGS) \ - $(XFCONF_CFLAGS) \ - $(GMODULE_CFLAGS) \ - $(PLATFORM_CFLAGS) -@@ -91,6 +100,7 @@ xfce4_session_LDADD = \ - $(DBUS_LIBS) \ - $(DBUS_GLIB_LIBS) \ - $(LIBWNCK_LIBS) \ -+ $(SYSTEMD_LIBS) \ - $(XFCONF_LIBS) \ - -lm - -diff --git a/xfce4-session/xfsm-shutdown.c b/xfce4-session/xfsm-shutdown.c -index d8757a8..4c483a7 100644 ---- a/xfce4-session/xfsm-shutdown.c -+++ b/xfce4-session/xfsm-shutdown.c -@@ -66,10 +66,13 @@ - #include - #include - #include --#include - #include - -- -+#ifdef HAVE_SYSTEMD -+#include -+#else -+#include -+#endif - - static void xfsm_shutdown_finalize (GObject *object); - static void xfsm_shutdown_sudo_free (XfsmShutdown *shutdown); -@@ -93,7 +96,11 @@ struct _XfsmShutdown - { - GObject __parent__; - -+#ifdef HAVE_SYSTEMD -+ XfsmSystemd *systemd; -+#else - XfsmConsolekit *consolekit; -+#endif - XfsmUPower *upower; - - /* kiosk settings */ -@@ -131,7 +138,11 @@ xfsm_shutdown_init (XfsmShutdown *shutdown) - { - XfceKiosk *kiosk; - -+#ifdef HAVE_SYSTEMD -+ shutdown->systemd = xfsm_systemd_get (); -+#else - shutdown->consolekit = xfsm_consolekit_get (); -+#endif - shutdown->upower = xfsm_upower_get (); - shutdown->helper_state = SUDO_NOT_INITIAZED; - shutdown->helper_require_password = FALSE; -@@ -150,7 +161,11 @@ xfsm_shutdown_finalize (GObject *object) - { - XfsmShutdown *shutdown = XFSM_SHUTDOWN (object); - -+#ifdef HAVE_SYSTEMD -+ g_object_unref (G_OBJECT (shutdown->systemd)); -+#else - g_object_unref (G_OBJECT (shutdown->consolekit)); -+#endif - g_object_unref (G_OBJECT (shutdown->upower)); - - /* close down helper */ -@@ -641,7 +656,11 @@ xfsm_shutdown_try_restart (XfsmShutdown *shutdown, - if (shutdown->helper_state == SUDO_AVAILABLE) - return xfsm_shutdown_sudo_try_action (shutdown, XFSM_SHUTDOWN_RESTART, error); - else -+#ifdef HAVE_SYSTEMD -+ return xfsm_systemd_try_restart (shutdown->systemd, error); -+#else - return xfsm_consolekit_try_restart (shutdown->consolekit, error); -+#endif - } - - -@@ -658,7 +677,11 @@ xfsm_shutdown_try_shutdown (XfsmShutdown *shutdown, - if (shutdown->helper_state == SUDO_AVAILABLE) - return xfsm_shutdown_sudo_try_action (shutdown, XFSM_SHUTDOWN_SHUTDOWN, error); - else -+#ifdef HAVE_SYSTEMD -+ return xfsm_systemd_try_shutdown (shutdown->systemd, error); -+#else - return xfsm_consolekit_try_shutdown (shutdown->consolekit, error); -+#endif - } - - -@@ -698,7 +721,11 @@ xfsm_shutdown_can_restart (XfsmShutdown *shutdown, - return TRUE; - } - -+#ifdef HAVE_SYSTEMD -+ if (xfsm_systemd_can_restart (shutdown->systemd, can_restart, error)) -+#else - if (xfsm_consolekit_can_restart (shutdown->consolekit, can_restart, error)) -+#endif - return TRUE; - - if (xfsm_shutdown_sudo_init (shutdown, error)) -@@ -725,7 +752,11 @@ xfsm_shutdown_can_shutdown (XfsmShutdown *shutdown, - return TRUE; - } - -+#ifdef HAVE_SYSTEMD -+ if (xfsm_systemd_can_shutdown (shutdown->systemd, can_shutdown, error)) -+#else - if (xfsm_consolekit_can_shutdown (shutdown->consolekit, can_shutdown, error)) -+#endif - return TRUE; - - if (xfsm_shutdown_sudo_init (shutdown, error)) -diff --git a/xfce4-session/xfsm-systemd.c b/xfce4-session/xfsm-systemd.c -new file mode 100644 -index 0000000..7bdd39d ---- /dev/null -+++ b/xfce4-session/xfsm-systemd.c -@@ -0,0 +1,229 @@ -+/*- -+ * Copyright (C) 2012 Christian Hesse -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2, or (at your option) -+ * any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -+ * MA 02110-1301 USA. -+ */ -+ -+#include -+ -+#include -+#include -+#include -+#include -+ -+#include -+ -+ -+ -+#define SYSTEMD_DBUS_NAME "org.freedesktop.login1" -+#define SYSTEMD_DBUS_PATH "/org/freedesktop/login1" -+#define SYSTEMD_DBUS_INTERFACE "org.freedesktop.login1.Manager" -+#define SYSTEMD_REBOOT_ACTION "Reboot" -+#define SYSTEMD_POWEROFF_ACTION "PowerOff" -+#define SYSTEMD_REBOOT_TEST "org.freedesktop.login1.reboot" -+#define SYSTEMD_POWEROFF_TEST "org.freedesktop.login1.power-off" -+ -+ -+ -+static void xfsm_systemd_finalize (GObject *object); -+ -+ -+ -+struct _XfsmSystemdClass -+{ -+ GObjectClass __parent__; -+}; -+ -+struct _XfsmSystemd -+{ -+ GObject __parent__; -+ -+ PolkitAuthority *authority; -+ PolkitSubject *subject; -+}; -+ -+ -+ -+G_DEFINE_TYPE (XfsmSystemd, xfsm_systemd, G_TYPE_OBJECT) -+ -+ -+ -+static void -+xfsm_systemd_class_init (XfsmSystemdClass *klass) -+{ -+ GObjectClass *gobject_class; -+ -+ gobject_class = G_OBJECT_CLASS (klass); -+ gobject_class->finalize = xfsm_systemd_finalize; -+} -+ -+ -+ -+static void -+xfsm_systemd_init (XfsmSystemd *systemd) -+{ -+ systemd->authority = polkit_authority_get_sync (NULL, NULL); -+ systemd->subject = polkit_unix_process_new (getpid()); -+} -+ -+ -+ -+static void -+xfsm_systemd_finalize (GObject *object) -+{ -+ XfsmSystemd *systemd = XFSM_SYSTEMD (object); -+ -+ g_object_unref (G_OBJECT (systemd->authority)); -+ g_object_unref (G_OBJECT (systemd->subject)); -+ -+ (*G_OBJECT_CLASS (xfsm_systemd_parent_class)->finalize) (object); -+} -+ -+ -+static gboolean -+xfsm_systemd_can_method (XfsmSystemd *systemd, -+ gboolean *can_method, -+ const gchar *method, -+ GError **error) -+{ -+ PolkitAuthorizationResult *res; -+ GError *local_error = NULL; -+ -+ *can_method = FALSE; -+ -+ res = polkit_authority_check_authorization_sync (systemd->authority, -+ systemd->subject, -+ method, -+ NULL, -+ POLKIT_CHECK_AUTHORIZATION_FLAGS_NONE, -+ NULL, -+ &local_error); -+ -+ if (res == NULL) -+ { -+ g_propagate_error (error, local_error); -+ return FALSE; -+ } -+ -+ *can_method = polkit_authorization_result_get_is_authorized (res) -+ || polkit_authorization_result_get_is_challenge (res); -+ -+ g_object_unref (G_OBJECT (res)); -+ -+ return TRUE; -+} -+ -+ -+ -+static gboolean -+xfsm_systemd_try_method (XfsmSystemd *systemd, -+ const gchar *method, -+ GError **error) -+{ -+ GDBusConnection *bus; -+ GError *local_error = NULL; -+ -+ bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, error); -+ if (G_UNLIKELY (bus == NULL)) -+ return FALSE; -+ -+ g_dbus_connection_call_sync (bus, -+ SYSTEMD_DBUS_NAME, -+ SYSTEMD_DBUS_PATH, -+ SYSTEMD_DBUS_INTERFACE, -+ method, -+ g_variant_new ("(b)", TRUE), -+ NULL, 0, G_MAXINT, NULL, -+ &local_error); -+ -+ g_object_unref (G_OBJECT (bus)); -+ -+ if (local_error != NULL) -+ { -+ g_propagate_error (error, local_error); -+ return FALSE; -+ } -+ -+ return TRUE; -+} -+ -+ -+ -+XfsmSystemd * -+xfsm_systemd_get (void) -+{ -+ static XfsmSystemd *object = NULL; -+ -+ if (G_LIKELY (object != NULL)) -+ { -+ g_object_ref (G_OBJECT (object)); -+ } -+ else -+ { -+ object = g_object_new (XFSM_TYPE_SYSTEMD, NULL); -+ g_object_add_weak_pointer (G_OBJECT (object), (gpointer) &object); -+ } -+ -+ return object; -+} -+ -+ -+ -+gboolean -+xfsm_systemd_try_restart (XfsmSystemd *systemd, -+ GError **error) -+{ -+ return xfsm_systemd_try_method (systemd, -+ SYSTEMD_REBOOT_ACTION, -+ error); -+} -+ -+ -+ -+gboolean -+xfsm_systemd_try_shutdown (XfsmSystemd *systemd, -+ GError **error) -+{ -+ return xfsm_systemd_try_method (systemd, -+ SYSTEMD_POWEROFF_ACTION, -+ error); -+} -+ -+ -+ -+gboolean -+xfsm_systemd_can_restart (XfsmSystemd *systemd, -+ gboolean *can_restart, -+ GError **error) -+{ -+ return xfsm_systemd_can_method (systemd, -+ can_restart, -+ SYSTEMD_REBOOT_TEST, -+ error); -+} -+ -+ -+ -+gboolean -+xfsm_systemd_can_shutdown (XfsmSystemd *systemd, -+ gboolean *can_shutdown, -+ GError **error) -+{ -+ return xfsm_systemd_can_method (systemd, -+ can_shutdown, -+ SYSTEMD_POWEROFF_TEST, -+ error); -+} -diff --git a/xfce4-session/xfsm-systemd.h b/xfce4-session/xfsm-systemd.h -new file mode 100644 -index 0000000..8223622 ---- /dev/null -+++ b/xfce4-session/xfsm-systemd.h -@@ -0,0 +1,55 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- -+ * -+ * Copyright (C) 2012 Christian Hesse -+ * -+ * Licensed under the GNU General Public License Version 2 -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -+ */ -+ -+#ifndef __XFSM_SYSTEMD_H__ -+#define __XFSM_SYSTEMD_H__ -+ -+typedef struct _XfsmSystemdClass XfsmSystemdClass; -+typedef struct _XfsmSystemd XfsmSystemd; -+ -+#define XFSM_TYPE_SYSTEMD (xfsm_systemd_get_type ()) -+#define XFSM_SYSTEMD(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), XFSM_TYPE_SYSTEMD, XfsmSystemd)) -+#define XFSM_SYSTEMD_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), XFSM_TYPE_SYSTEMD, XfsmSystemdClass)) -+#define XFSM_IS_SYSTEMD(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), XFSM_TYPE_SYSTEMD)) -+#define XFSM_IS_SYSTEMD_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), XFSM_TYPE_SYSTEMD)) -+#define XFSM_SYSTEMD_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), XFSM_TYPE_SYSTEMD, XfsmSystemdClass)) -+ -+GType xfsm_systemd_get_type (void) G_GNUC_CONST; -+ -+XfsmSystemd *xfsm_systemd_get (void); -+ -+gboolean xfsm_systemd_try_restart (XfsmSystemd *systemd, -+ GError **error); -+ -+gboolean xfsm_systemd_try_shutdown (XfsmSystemd *systemd, -+ GError **error); -+ -+gboolean xfsm_systemd_can_restart (XfsmSystemd *systemd, -+ gboolean *can_restart, -+ GError **error); -+ -+gboolean xfsm_systemd_can_shutdown (XfsmSystemd *systemd, -+ gboolean *can_shutdown, -+ GError **error); -+ -+G_END_DECLS -+ -+#endif /* __XFSM_SYSTEMD_H__ */ --- -cgit v0.9.1 diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index e5daaca9d5289632435b6402102483fd6e44a24c..b63a101b84f83f3b8610729ede4fef6cc81b148a 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -35,7 +35,7 @@ xfce_self = rec { # the lines are very long but it seems better than the even-od xfwm4 = callPackage ./core/xfwm4.nix { }; xfce4_appfinder = callPackage ./core/xfce4-appfinder.nix { }; - xfce4_dev_tools = callPackage ./core/xfce4-dev-tools.nix { }; # only if autotools are needed + #### APPLICATIONS from "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2" diff --git a/pkgs/development/compilers/Agda-executable/default.nix b/pkgs/development/compilers/Agda-executable/default.nix index 6b5e58e775205833fbc07d13b07ee5678bd72b7b..f9acff43ef713f40a1db7b00eb1a6e41904d4565 100644 --- a/pkgs/development/compilers/Agda-executable/default.nix +++ b/pkgs/development/compilers/Agda-executable/default.nix @@ -13,9 +13,6 @@ cabal.mkDerivation (self: { description = "Command-line program for type-checking and compiling Agda programs"; license = "unknown"; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/compilers/epic/default.nix b/pkgs/development/compilers/epic/default.nix index 9060d313be5ad67ec7cbb01badc1d7b15c50371c..1767a61a7d199acdb0a9334ed646be13c68149a9 100644 --- a/pkgs/development/compilers/epic/default.nix +++ b/pkgs/development/compilers/epic/default.nix @@ -14,9 +14,6 @@ cabal.mkDerivation (self: { description = "Compiler for a simple functional language"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/compilers/go/1.1.nix b/pkgs/development/compilers/go/1.1.nix index c3cbf8422bf9c51c5b93e070b81cfcc7c7cf8f16..39c79e9a3de1b92d147925bcf3646417d17cc1f5 100644 --- a/pkgs/development/compilers/go/1.1.nix +++ b/pkgs/development/compilers/go/1.1.nix @@ -7,11 +7,11 @@ let in stdenv.mkDerivation { - name = "go-1.1rc1"; + name = "go-1.1"; src = fetchurl { - url = http://go.googlecode.com/files/go1.1rc1.src.tar.gz; - sha1 = "c999c36e7bb5c9ef05d309b0bb4275feb62c44e3"; + url = http://go.googlecode.com/files/go1.1.src.tar.gz; + sha1 = "a464704ebbbdd552a39b5f9429b059c117d165b3"; }; buildInputs = [ bison glibc bash makeWrapper ]; @@ -49,7 +49,7 @@ stdenv.mkDerivation { sed -i 's,/bin/pwd,'"`type -P pwd`", src/pkg/os/os_test.go # Disable the hostname test sed -i '/TestHostname/areturn' src/pkg/os/os_test.go - # Disable a failing icmp test + # Disable a failing icmp test (maybe because not being root?) sed -i '/ip[46]:.*icmp.*nil/d' src/pkg/net/ipraw_test.go ''; diff --git a/pkgs/development/compilers/jdk/jdk6-linux.nix b/pkgs/development/compilers/jdk/jdk6-linux.nix index 368f017068760be5dee91a73fc84452af693a783..340bbdf91ac975ad46f714feebdb5c793df9637a 100644 --- a/pkgs/development/compilers/jdk/jdk6-linux.nix +++ b/pkgs/development/compilers/jdk/jdk6-linux.nix @@ -1,6 +1,6 @@ { swingSupport ? true , stdenv -, fetchurl +, requireFile , unzip , makeWrapper , xlibs ? null @@ -32,13 +32,15 @@ stdenv.mkDerivation { src = if stdenv.system == "i686-linux" then - fetchurl { - url = http://download.oracle.com/otn-pub/java/jdk/6u45-b06/jdk-6u45-linux-i586.bin; + requireFile { + name = "jdk-6u45-linux-i586.bin"; + url = http://www.oracle.com/technetwork/java/javase/downloads/jdk6downloads-1902814.html; sha256 = "0mx3d2qlal5zyz1a7ld1yk2rs8pf9sjxs2jzasais3nq30jmlfym"; } else if stdenv.system == "x86_64-linux" then - fetchurl { - url = http://download.oracle.com/otn-pub/java/jdk/6u45-b06/jdk-6u45-linux-x64.bin; + requireFile { + name = "jdk-6u45-linux-x64.bin"; + url = http://www.oracle.com/technetwork/java/javase/downloads/jdk6downloads-1902814.html; sha256 = "1s0j1pdr6y8c816d9i86rx4zp12nbhmas1rxksp0r53cn7m3ljbb"; } else diff --git a/pkgs/development/compilers/pakcs/adjust-buildsystem.patch b/pkgs/development/compilers/pakcs/adjust-buildsystem.patch new file mode 100644 index 0000000000000000000000000000000000000000..4de7683dcdd361a05ae2c60f394e8ad46d6f791f --- /dev/null +++ b/pkgs/development/compilers/pakcs/adjust-buildsystem.patch @@ -0,0 +1,44 @@ +diff -Naur pakcs-1.11.2-upstream/Makefile pakcs-1.11.2/Makefile +--- pakcs-1.11.2-upstream/Makefile 2013-03-21 04:58:38.000000000 -0430 ++++ pakcs-1.11.2/Makefile 2013-05-09 15:04:48.035646127 -0430 +@@ -55,7 +55,6 @@ + # + .PHONY: install + install: installscripts +- $(MAKE) frontend + # pre-compile all libraries: + @cd lib && $(MAKE) fcy + # install the Curry2Prolog compiler as a saved system: +@@ -66,11 +65,6 @@ + @cd lib && $(MAKE) acy + # prepare for separate compilation by compiling all librariers to Prolog code: + @if [ -r bin/pakcs ] ; then cd lib && $(MAKE) pl ; fi +- # 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 +- $(MAKE) tools + $(MAKE) docs + chmod -R go+rX . + +diff -Naur pakcs-1.11.2-upstream/scripts/pakcs.sh pakcs-1.11.2/scripts/pakcs.sh +--- pakcs-1.11.2-upstream/scripts/pakcs.sh 2013-03-21 04:52:59.000000000 -0430 ++++ pakcs-1.11.2/scripts/pakcs.sh 2013-05-09 03:14:23.500876628 -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 diff --git a/pkgs/development/compilers/pakcs/default.nix b/pkgs/development/compilers/pakcs/default.nix index 7f4ae9646af495dccb49ebab304e58d77518129e..bb4657d8afffec526f874d34fc717b284625e889 100644 --- a/pkgs/development/compilers/pakcs/default.nix +++ b/pkgs/development/compilers/pakcs/default.nix @@ -1,62 +1,101 @@ -{ stdenv, fetchurl, ghc, swiProlog, syb, mtl, makeWrapper, rlwrap, tk }: +{ stdenv, fetchurl, cabal, swiProlog, mtl, syb, makeWrapper, rlwrap, tk }: -stdenv.mkDerivation { - name = "pakcs-1.10.0"; +let + fname = "pakcs-1.11.2"; - src = fetchurl { - url = "http://www.informatik.uni-kiel.de/~pakcs/download/pakcs_src.tar.gz"; - sha256 = "6a4a45c9f3d0b61cfec8414943c2a852bec3665a7e2638b039193dd43e9802c4"; + fsrc = fetchurl { + url = "http://www.informatik.uni-kiel.de/~pakcs/download/${fname}-src.tar.gz"; + sha256 = "1x23kn91v44my4rd8j3247pj8i2myz82rzgbq07asi1x21bpvvmy"; }; - buildInputs = [ ghc swiProlog syb mtl makeWrapper rlwrap tk ]; +in +stdenv.mkDerivation rec { - prePatch = '' - # Remove copying pakcsrc into $HOME. - sed -i '/update-pakcsrc/d' Makefile + name = fname; - # Remove copying pakcsinitrc into $HOME - sed -i '68d' configure-pakcs - ''; + 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 = [ mtl syb curryBase ]; + }); + + src = fsrc; + + buildInputs = [ swiProlog makeWrapper rlwrap tk ]; + + patches = [ ./adjust-buildsystem.patch ]; - patches = [ ./pakcs-ghc741.patch ]; + configurePhase = '' + # Phony HOME. + mkdir phony-home + export HOME=$(pwd)/phony-home - preConfigure = '' - # Path to GHC and SWI Prolog - sed -i 's@GHC=@GHC=${ghc}/bin/ghc@' bin/.pakcs_variables - sed -i 's@SWIPROLOG=@SWIPROLOG=${swiProlog}/bin/swipl@' bin/.pakcs_variables + # SWI Prolog + sed -i 's@SWIPROLOG=@SWIPROLOG='${swiProlog}/bin/swipl'@' pakcsinitrc ''; - postInstall = '' - cp pakcsrc $out/ - cp update-pakcsrc $out/ - cp -r bin/ $out/ - cp -r cpns/ $out/ - cp -r curry2prolog/ $out/ - cp -r docs/ $out/ - cp -r examples/ $out/ - cp -r include/ $out/ - cp -r lib/ $out/ - cp -r mccparser/ $out/ - cp -r tools/ $out/ - cp -r www/ $out/ - - # The Prolog sources must be built in their final directory. - (cd $out/curry2prolog/ ; make) - - mkdir -p $out/share/emacs/site-lisp/curry-pakcs - for e in "$out/tools/emacs/"*.el ; do - ln -s $e $out/share/emacs/site-lisp/curry-pakcs/; - done + preBuild = '' + # Set up link to cymake, which has been built already. + ensureDir bin/.local + ln -s ${curryFront}/bin/cymake bin/.local/ + ''; - sed -i 's@which@type -P@' $out/bin/.pakcs_wrapper + installPhase = '' + # Prepare PAKCSHOME directory. + ensureDir $out/pakcs + for d in bin curry2prolog currytools lib tools cpns include www examples docs ; do + cp -r $d $out/pakcs ; + done + cp pakcsrc.default $out/pakcs + cp pakcsinitrc $out/pakcs + + # Fixing PAKCSHOME and related paths. + sed -i 's@PAKCSHOME=/tmp/.*@PAKCSHOME='$out/pakcs'@' $out/pakcs/bin/{pakcs,makecurrycgi,parsecurry,.makesavedstate} + + # Fix symbolic links into the tmp build dir. + ln -s ../currytools/CASS/cass $out/pakcs/bin/cass + ln -s ../currytools/currydoc/CurryDoc $out/pakcs/bin/currydoc + + # The Prolog sources must be rebuilt in their final directory, + # to switch the embedded references to the tmp build directory. + export TEMP=/tmp + (cd $out/pakcs/curry2prolog/ ; rm c2p.state ; make) + cp Makefile $out/pakcs + (cd $out/pakcs ; make tools) + (cd $out/pakcs/cpns ; make) + (cd $out/pakcs/www ; make) + + # Install bin. + ensureDir $out/bin + for b in makecurrycgi .makesavedstate pakcs parsecurry cleancurry \ + addtypes cass currybrowse currycreatemake currydoc currytest \ + dataToXml erd2curry ; do + ln -s $out/pakcs/bin/$b $out/bin/ ; + done - # Get the program name from the environment instead of the calling wrapper (for rlwrap). - sed -i 's@progname=`basename "$0"`@progname=$PAKCS_PROGNAME@' $out/bin/.pakcs_wrapper + # Place emacs lisp files in expected locations. + ensureDir $out/share/emacs/site-lisp/curry-pakcs + for e in "tools/emacs/"*.el ; do + cp $e $out/share/emacs/site-lisp/curry-pakcs/ ; + done - wrapProgram $out/bin/.pakcs_wrapper \ + # Wrap for rlwrap and tk support. + wrapProgram $out/pakcs/bin/pakcs \ --prefix PATH ":" "${rlwrap}/bin" \ --prefix PATH ":" "${tk}/bin" \ - --run 'export PAKCS_PROGNAME=`basename "$0"`' ''; meta = { @@ -77,6 +116,6 @@ stdenv.mkDerivation { ''; maintainers = [ stdenv.lib.maintainers.kkallio ]; - #platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/compilers/pakcs/pakcs-ghc741.patch b/pkgs/development/compilers/pakcs/pakcs-ghc741.patch deleted file mode 100644 index 439cb787d67d1cd20988905603e2085aaca2312c..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/pakcs/pakcs-ghc741.patch +++ /dev/null @@ -1,1004 +0,0 @@ -diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/AbstractCurry.hs pakcs-new/mccparser/src/AbstractCurry.hs ---- pakcs/mccparser/src/AbstractCurry.hs 2011-11-14 09:23:10.000000000 -0430 -+++ pakcs-new/mccparser/src/AbstractCurry.hs 2012-06-10 23:41:02.278126416 -0430 -@@ -29,7 +29,7 @@ - readCurry, writeCurry) where - - import PathUtils (writeModule,readModule) --import List(intersperse) -+import Data.List(intersperse) - - ------------------------------------------------------------------------------ - -- Definition of data types for representing abstract Curry programs: -diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/AnsiCodes.hs pakcs-new/mccparser/src/AnsiCodes.hs ---- pakcs/mccparser/src/AnsiCodes.hs 2011-11-14 09:23:10.000000000 -0430 -+++ pakcs-new/mccparser/src/AnsiCodes.hs 2012-06-10 23:41:02.278126416 -0430 -@@ -27,8 +27,8 @@ - - ) where - --import Char --import List -+import Data.Char -+import Data.List - - -- escape character - esc = chr 27 -diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/Base.lhs pakcs-new/mccparser/src/Base.lhs ---- pakcs/mccparser/src/Base.lhs 2011-11-14 09:23:07.000000000 -0430 -+++ pakcs-new/mccparser/src/Base.lhs 2012-06-10 23:41:02.302127057 -0430 -@@ -22,12 +22,12 @@ - > import FlatWithSrcRefs hiding (SrcRef, Fixity(..), TypeExpr, Expr(..)) - > import Env - > import TopEnv --> import List -+> import Data.List - > import Map --> import Monad -+> import Control.Monad - > import Set - > import Utils --> import Maybe -+> import Data.Maybe - - > import qualified FlatWithSrcRefs (Fixity(..), TypeExpr) - -diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/Cam.lhs pakcs-new/mccparser/src/Cam.lhs ---- pakcs/mccparser/src/Cam.lhs 2011-11-14 09:23:08.000000000 -0430 -+++ pakcs-new/mccparser/src/Cam.lhs 2012-06-10 23:41:02.302127057 -0430 -@@ -10,7 +10,7 @@ - \begin{verbatim} - - > module Cam where --> import Char -+> import Data.Char - - \end{verbatim} - An abstract machine code module consists of a list of import, data, -diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/CamPP.lhs pakcs-new/mccparser/src/CamPP.lhs ---- pakcs/mccparser/src/CamPP.lhs 2011-11-14 09:23:08.000000000 -0430 -+++ pakcs-new/mccparser/src/CamPP.lhs 2012-06-10 23:41:02.303127084 -0430 -@@ -9,7 +9,7 @@ - - > module CamPP where - > import Cam --> import Char -+> import Data.Char - > import Pretty - - > default(Int) -diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/CaseCompletion.hs pakcs-new/mccparser/src/CaseCompletion.hs ---- pakcs/mccparser/src/CaseCompletion.hs 2011-11-14 09:23:10.000000000 -0430 -+++ pakcs-new/mccparser/src/CaseCompletion.hs 2012-06-10 23:41:02.280126456 -0430 -@@ -21,7 +21,7 @@ - import Position (SrcRef) - import OldScopeEnv as ScopeEnv - import ILScope --import Maybe -+import Data.Maybe - - - ------------------------------------------------------------------------------- -diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/CCode.lhs pakcs-new/mccparser/src/CCode.lhs ---- pakcs/mccparser/src/CCode.lhs 2011-11-14 09:23:08.000000000 -0430 -+++ pakcs-new/mccparser/src/CCode.lhs 2012-06-10 23:41:02.303127084 -0430 -@@ -15,8 +15,8 @@ - \begin{verbatim} - - > module CCode where --> import List --> import Maybe -+> import Data.List -+> import Data.Maybe - > infixl 9 `CElem`,`CField` - > infixr 8 `CCast` - > infixl 7 `CMul`,`CDiv`,`CMod` -diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/CGen.lhs pakcs-new/mccparser/src/CGen.lhs ---- pakcs/mccparser/src/CGen.lhs 2011-11-14 09:23:08.000000000 -0430 -+++ pakcs-new/mccparser/src/CGen.lhs 2012-06-10 23:41:02.306127165 -0430 -@@ -13,10 +13,10 @@ - > import CCode - > import CPS - > import CElim --> import Char --> import List -+> import Data.Char -+> import Data.List - > import Map --> import Maybe -+> import Data.Maybe - > import Set - > import Utils - -diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/Combined.lhs pakcs-new/mccparser/src/Combined.lhs ---- pakcs/mccparser/src/Combined.lhs 2011-11-14 09:23:08.000000000 -0430 -+++ pakcs-new/mccparser/src/Combined.lhs 2012-06-10 23:41:02.306127165 -0430 -@@ -19,8 +19,8 @@ - - > module Combined where - > import Error --> import Monad --> import IO -+> import Control.Monad -+> import System.IO - > import IORefCompat - - \end{verbatim} -diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/config.hs pakcs-new/mccparser/src/config.hs ---- pakcs/mccparser/src/config.hs 2011-11-14 09:23:11.000000000 -0430 -+++ pakcs-new/mccparser/src/config.hs 2012-06-10 23:41:02.280126456 -0430 -@@ -9,9 +9,9 @@ - -- Martin Engelke (men@informatik.uni-kiel.de) - -- - --import Time --import System --import Directory -+import System.Time -+import System.Cmd -+import System.Directory - - - ------------------------------------------------------------------------------- -diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/CPretty.lhs pakcs-new/mccparser/src/CPretty.lhs ---- pakcs/mccparser/src/CPretty.lhs 2011-11-14 09:23:08.000000000 -0430 -+++ pakcs-new/mccparser/src/CPretty.lhs 2012-06-10 23:41:02.307127192 -0430 -@@ -18,7 +18,7 @@ - - > import CCode - > import Pretty --> import List -+> import Data.List - - > ppCFile :: CFile -> Doc - > ppCFile = vsep . map ppTopDecl -diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/CPS.lhs pakcs-new/mccparser/src/CPS.lhs ---- pakcs/mccparser/src/CPS.lhs 2011-11-14 09:23:08.000000000 -0430 -+++ pakcs-new/mccparser/src/CPS.lhs 2012-06-10 23:41:02.308127219 -0430 -@@ -12,7 +12,7 @@ - > cpsFunction, cpsApply, cpsVars, fromCaseBlock, caseBlockTag, - > fresh) where - > import Cam --> import List -+> import Data.List - > import Set - > import SCC - -diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/CurryBuilder.hs pakcs-new/mccparser/src/CurryBuilder.hs ---- pakcs/mccparser/src/CurryBuilder.hs 2011-11-14 09:23:10.000000000 -0430 -+++ pakcs-new/mccparser/src/CurryBuilder.hs 2012-06-10 23:46:43.708361686 -0430 -@@ -18,13 +18,13 @@ - import Ident - import PathUtils - import Env --import System --import Directory --import Time --import Monad --import Maybe --import List --import IO -+import System.Directory -+import System.Exit -+import System.Time -+import Control.Monad -+import Data.Maybe -+import Data.List -+import System.IO - - - ------------------------------------------------------------------------------- -diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/CurryCompiler.hs pakcs-new/mccparser/src/CurryCompiler.hs ---- pakcs/mccparser/src/CurryCompiler.hs 2011-11-14 09:23:10.000000000 -0430 -+++ pakcs-new/mccparser/src/CurryCompiler.hs 2012-06-10 23:46:11.828499672 -0430 -@@ -13,8 +13,8 @@ - import CurryCompilerOpts - import CompilerResults - import Modules --import System --import IO -+import System.Exit -+import System.IO - - - ------------------------------------------------------------------------------- -diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/CurryDeps.lhs pakcs-new/mccparser/src/CurryDeps.lhs ---- pakcs/mccparser/src/CurryDeps.lhs 2011-11-14 09:23:08.000000000 -0430 -+++ pakcs-new/mccparser/src/CurryDeps.lhs 2012-06-10 23:41:02.309127246 -0430 -@@ -20,11 +20,11 @@ - > import CurryParser(parseHeader) - > import SCC - > import Env --> import List --> import Maybe --> import Monad -+> import Data.List -+> import Data.Maybe -+> import Control.Monad - > import Error --> import IO -+> import System.IO - > import PathUtils - - > data Source = Source FilePath [ModuleIdent] -diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/CurryEnv.hs pakcs-new/mccparser/src/CurryEnv.hs ---- pakcs/mccparser/src/CurryEnv.hs 2011-11-14 09:23:11.000000000 -0430 -+++ pakcs-new/mccparser/src/CurryEnv.hs 2012-06-10 23:41:02.283126538 -0430 -@@ -15,7 +15,7 @@ - import Ident - import Base - import Env --import Maybe -+import Data.Maybe - - ------------------------------------------------------------------------------ - -diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/CurryHtml.hs pakcs-new/mccparser/src/CurryHtml.hs ---- pakcs/mccparser/src/CurryHtml.hs 2011-11-14 09:23:11.000000000 -0430 -+++ pakcs-new/mccparser/src/CurryHtml.hs 2012-06-10 23:48:58.040993372 -0430 -@@ -2,8 +2,8 @@ - - import SyntaxColoring - import Ident --import Maybe --import Char -+import Data.Maybe -+import Data.Char hiding (Space) - import System.Environment - import CurryDeps(getCurryPath) - import PathUtils (writeModule) -diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/CurryLexer.lhs pakcs-new/mccparser/src/CurryLexer.lhs ---- pakcs/mccparser/src/CurryLexer.lhs 2011-11-14 09:23:08.000000000 -0430 -+++ pakcs-new/mccparser/src/CurryLexer.lhs 2012-06-10 23:41:02.310127273 -0430 -@@ -15,8 +15,8 @@ - > import LexComb - > import Position - > import Map --> import Char --> import List -+> import Data.Char -+> import Data.List - - \end{verbatim} - \paragraph{Tokens} Note that the equality and ordering instances of -diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/CurrySubdir.hs pakcs-new/mccparser/src/CurrySubdir.hs ---- pakcs/mccparser/src/CurrySubdir.hs 2011-11-14 09:23:11.000000000 -0430 -+++ pakcs-new/mccparser/src/CurrySubdir.hs 2012-06-10 23:41:02.283126538 -0430 -@@ -1,9 +1,9 @@ - module CurrySubdir where - --import Directory -+import System.Directory - import System.Time (ClockTime) - import Control.Monad (when) --import List(intersperse) -+import Data.List(intersperse) - - -- some definitions from PathUtils - -diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/CurrySyntaxTools.lhs pakcs-new/mccparser/src/CurrySyntaxTools.lhs ---- pakcs/mccparser/src/CurrySyntaxTools.lhs 2011-11-14 09:23:08.000000000 -0430 -+++ pakcs-new/mccparser/src/CurrySyntaxTools.lhs 2012-06-10 23:41:02.314127381 -0430 -@@ -2,7 +2,7 @@ - - > import CurrySyntax - > import Ident --> import Maybe -+> import Data.Maybe - - >------------------------------------------------------------------------------ - -diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/cycc.hs pakcs-new/mccparser/src/cycc.hs ---- pakcs/mccparser/src/cycc.hs 2011-11-14 09:23:11.000000000 -0430 -+++ pakcs-new/mccparser/src/cycc.hs 2012-06-10 23:41:02.283126538 -0430 -@@ -7,9 +7,9 @@ - import PathUtils - import Options - import GetOpt --import Maybe --import IO --import System -+import Data.Maybe -+import System.IO -+import System.Cmd - - main :: IO () - main = -diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/cymake.hs pakcs-new/mccparser/src/cymake.hs ---- pakcs/mccparser/src/cymake.hs 2011-11-14 09:23:11.000000000 -0430 -+++ pakcs-new/mccparser/src/cymake.hs 2012-06-10 23:50:08.306892587 -0430 -@@ -14,13 +14,14 @@ - import GetOpt - import CurryBuilder - import CurryBuilderOpts --import System --import Maybe --import IO -+import System.Environment -+import System.Exit -+import Data.Maybe -+import System.IO - import CurryHtml --import List -+import Data.List - import Control.Monad (unless) --import Char (isDigit) -+import Data.Char (isDigit) - - - ------------------------------------------------------------------------------- -diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/cymk.hs pakcs-new/mccparser/src/cymk.hs ---- pakcs/mccparser/src/cymk.hs 2011-11-14 09:23:11.000000000 -0430 -+++ pakcs-new/mccparser/src/cymk.hs 2012-06-10 23:41:02.284126572 -0430 -@@ -7,11 +7,11 @@ - - import CurryDeps - import GetOpt --import Maybe --import Monad --import IO -+import Data.Maybe -+import Control.Monad -+import System.IO - import PathUtils --import System -+import System.Cmd - - data Options = - Options{ -diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/cyxml.hs pakcs-new/mccparser/src/cyxml.hs ---- pakcs/mccparser/src/cyxml.hs 2011-11-14 09:23:11.000000000 -0430 -+++ pakcs-new/mccparser/src/cyxml.hs 2012-06-10 23:41:02.285126603 -0430 -@@ -9,8 +9,8 @@ - -- Martin Engelke (men@informatik.uni-kiel.de) - -- - --import System --import Directory -+import System.Cmd -+import System.Directory - - - ------------------------------------------------------------------------------- -diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/Desugar.lhs pakcs-new/mccparser/src/Desugar.lhs ---- pakcs/mccparser/src/Desugar.lhs 2011-11-14 09:23:08.000000000 -0430 -+++ pakcs-new/mccparser/src/Desugar.lhs 2012-06-10 23:41:02.316127435 -0430 -@@ -64,12 +64,12 @@ - > import Base - > import Combined - > import TopEnv (qualRebindTopEnv) --> import List --> import Monad -+> import Data.List -+> import Control.Monad - > import Typing - > import Utils - > import Ident --> import Maybe -+> import Data.Maybe - - posE = undefined - -diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/DTransform.lhs pakcs-new/mccparser/src/DTransform.lhs ---- pakcs/mccparser/src/DTransform.lhs 2011-11-14 09:23:08.000000000 -0430 -+++ pakcs-new/mccparser/src/DTransform.lhs 2012-06-10 23:41:02.318127490 -0430 -@@ -18,7 +18,7 @@ - - > module DTransform(module DTransform) where - > import Ident --> import List -+> import Data.List - > import IL - - \end{verbatim} -diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/Error.lhs pakcs-new/mccparser/src/Error.lhs ---- pakcs/mccparser/src/Error.lhs 2011-11-14 09:23:08.000000000 -0430 -+++ pakcs-new/mccparser/src/Error.lhs 2012-06-10 23:41:02.318127490 -0430 -@@ -13,7 +13,7 @@ - \begin{verbatim} - - > module Error where --> import Monad -+> import Control.Monad - - > data Error a = Ok a | Error String deriving (Eq,Ord,Show) - -diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/Exports.lhs pakcs-new/mccparser/src/Exports.lhs ---- pakcs/mccparser/src/Exports.lhs 2011-11-14 09:23:09.000000000 -0430 -+++ pakcs-new/mccparser/src/Exports.lhs 2012-06-10 23:41:02.319127517 -0430 -@@ -14,9 +14,9 @@ - - > module Exports(expandInterface,exportInterface) where - > import Base --> import List -+> import Data.List - > import Map --> import Maybe -+> import Data.Maybe - > import Set - > import TopEnv - -diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/FlatCurry.hs pakcs-new/mccparser/src/FlatCurry.hs ---- pakcs/mccparser/src/FlatCurry.hs 2011-11-14 09:23:11.000000000 -0430 -+++ pakcs-new/mccparser/src/FlatCurry.hs 2012-06-10 23:41:02.286126629 -0430 -@@ -24,8 +24,8 @@ - writeFlatCurry) where - - import PathUtils (writeModule,maybeReadModule) --import Directory --import List(intersperse) -+import System.Directory -+import Data.List(intersperse) - import Control.Monad (liftM) - - ------------------------------------------------------------------------------ -diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/FlatCurry.lhs pakcs-new/mccparser/src/FlatCurry.lhs ---- pakcs/mccparser/src/FlatCurry.lhs 2011-11-14 09:23:09.000000000 -0430 -+++ pakcs-new/mccparser/src/FlatCurry.lhs 2012-06-10 23:41:02.320127544 -0430 -@@ -19,9 +19,9 @@ - > CaseType(..), CombType(..), Expr(..), BranchExpr(..), - > Pattern(..), Literal(..)) where - --import System --import Directory --import Char -+import System.Cmd -+import System.Directory -+import Data.Char - import ReadShowTerm - import PathUtils (doesModuleExist) - -diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/FlatInfo.lhs pakcs-new/mccparser/src/FlatInfo.lhs ---- pakcs/mccparser/src/FlatInfo.lhs 2011-11-14 09:23:09.000000000 -0430 -+++ pakcs-new/mccparser/src/FlatInfo.lhs 2012-06-10 23:41:02.320127544 -0430 -@@ -6,7 +6,7 @@ - > import CurrySyntax - > import qualified IL - > import Ident --> import Maybe -+> import Data.Maybe - - ------------------------------------------------------------------------------ - -diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/FlatWithSrcRefs.hs pakcs-new/mccparser/src/FlatWithSrcRefs.hs ---- pakcs/mccparser/src/FlatWithSrcRefs.hs 2011-11-14 09:23:11.000000000 -0430 -+++ pakcs-new/mccparser/src/FlatWithSrcRefs.hs 2012-06-10 23:41:02.286126629 -0430 -@@ -27,8 +27,8 @@ - writeFlatCurry,gshowsPrec) where - - import PathUtils (writeModule,maybeReadModule) --import Directory --import List(intersperse) -+import System.Directory -+import Data.List(intersperse) - import Control.Monad (liftM) - import Data.Generics hiding (Fixity) - import Position (SrcRef) -diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/Frontend.hs pakcs-new/mccparser/src/Frontend.hs ---- pakcs/mccparser/src/Frontend.hs 2011-11-14 09:23:11.000000000 -0430 -+++ pakcs-new/mccparser/src/Frontend.hs 2012-06-10 23:41:02.287126654 -0430 -@@ -33,10 +33,10 @@ - import Position - import PathUtils - import Env --import List --import Maybe --import Monad --import System -+import Data.List -+import Data.Maybe -+import Control.Monad -+import System.Cmd - import Prelude hiding (lex) - - -diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/GenAbstractCurry.hs pakcs-new/mccparser/src/GenAbstractCurry.hs ---- pakcs/mccparser/src/GenAbstractCurry.hs 2011-11-14 09:23:11.000000000 -0430 -+++ pakcs-new/mccparser/src/GenAbstractCurry.hs 2012-06-10 23:41:02.289126703 -0430 -@@ -18,9 +18,9 @@ - import Position - import TopEnv - import Env --import Maybe --import List --import Char -+import Data.Maybe -+import Data.List -+import Data.Char - - - ------------------------------------------------------------------------------- -diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/GenFlatCurry.hs pakcs-new/mccparser/src/GenFlatCurry.hs ---- pakcs/mccparser/src/GenFlatCurry.hs 2011-11-14 09:23:11.000000000 -0430 -+++ pakcs-new/mccparser/src/GenFlatCurry.hs 2012-06-10 23:41:02.292126785 -0430 -@@ -37,9 +37,9 @@ - import TopEnv - import Env - import Map --import Monad --import Maybe --import List -+import Control.Monad -+import Data.Maybe -+import Data.List - - - ------------------------------------------------------------------------------- -diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/GetOpt.hs pakcs-new/mccparser/src/GetOpt.hs ---- pakcs/mccparser/src/GetOpt.hs 2011-11-14 09:23:11.000000000 -0430 -+++ pakcs-new/mccparser/src/GetOpt.hs 2012-06-10 23:41:02.292126785 -0430 -@@ -19,7 +19,7 @@ - - module GetOpt (ArgOrder(..), OptDescr(..), ArgDescr(..), usageInfo, getOpt) where - --import List(isPrefixOf) -+import Data.List(isPrefixOf) - - data ArgOrder a -- what to do with options following non-options: - = RequireOrder -- no option processing after first non-option -diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/HeaderTable.lhs pakcs-new/mccparser/src/HeaderTable.lhs ---- pakcs/mccparser/src/HeaderTable.lhs 2011-11-14 09:23:09.000000000 -0430 -+++ pakcs-new/mccparser/src/HeaderTable.lhs 2012-06-10 23:41:02.321127571 -0430 -@@ -3,7 +3,7 @@ - > import CurrySyntax - > import Ident - > import Env --> import Maybe -+> import Data.Maybe - - - ------------------------------------------------------------------------------- -diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/Ident.lhs pakcs-new/mccparser/src/Ident.lhs ---- pakcs/mccparser/src/Ident.lhs 2011-11-14 09:23:09.000000000 -0430 -+++ pakcs-new/mccparser/src/Ident.lhs 2012-06-10 23:41:02.322127598 -0430 -@@ -49,9 +49,9 @@ - > addPositionIdent, removePositionIdent, positionOfIdent, - > addPositionModuleIdent, removePositionModuleIdent,addRef,addRefId, - > positionOfModuleIdent,positionOfQualIdent,updQualIdent ) where --> import Char --> import List --> import Maybe -+> import Data.Char -+> import Data.List -+> import Data.Maybe - > import Position - > import Data.Generics - -diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/ILCompile.lhs pakcs-new/mccparser/src/ILCompile.lhs ---- pakcs/mccparser/src/ILCompile.lhs 2011-11-14 09:23:09.000000000 -0430 -+++ pakcs-new/mccparser/src/ILCompile.lhs 2012-06-10 23:41:02.323127625 -0430 -@@ -18,10 +18,10 @@ - > import IL - > import qualified Cam - > import Env --> import List -+> import Data.List - > import Map --> import Maybe --> import Monad -+> import Data.Maybe -+> import Control.Monad - > import SCC - > import Combined - -diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/ILLift.lhs pakcs-new/mccparser/src/ILLift.lhs ---- pakcs/mccparser/src/ILLift.lhs 2011-11-14 09:23:09.000000000 -0430 -+++ pakcs-new/mccparser/src/ILLift.lhs 2012-06-10 23:41:02.323127625 -0430 -@@ -20,8 +20,8 @@ - > import IL - > import Ident - > import Combined --> import List --> import Monad -+> import Data.List -+> import Control.Monad - > import Utils - - > type LiftState a = St [QualIdent] a -diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/ILTrans.lhs pakcs-new/mccparser/src/ILTrans.lhs ---- pakcs/mccparser/src/ILTrans.lhs 2011-11-14 09:23:09.000000000 -0430 -+++ pakcs-new/mccparser/src/ILTrans.lhs 2012-06-10 23:41:02.325127679 -0430 -@@ -26,8 +26,8 @@ - > import Env - > import Set - > import Map --> import Maybe --> import List -+> import Data.Maybe -+> import Data.List - - \end{verbatim} - \paragraph{Modules} -diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/ILxml.lhs pakcs-new/mccparser/src/ILxml.lhs ---- pakcs/mccparser/src/ILxml.lhs 2011-11-14 09:23:09.000000000 -0430 -+++ pakcs-new/mccparser/src/ILxml.lhs 2012-06-10 23:41:02.326127706 -0430 -@@ -25,8 +25,8 @@ - > import qualified CurrySyntax as CS - > import CurryEnv - > import Pretty --> import Char(chr,ord,isAlphaNum) --> import Maybe -+> import Data.Char(chr,ord,isAlphaNum) -+> import Data.Maybe - - > -- identation level - > level::Int -diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/Imports.lhs pakcs-new/mccparser/src/Imports.lhs ---- pakcs/mccparser/src/Imports.lhs 2011-11-14 09:23:09.000000000 -0430 -+++ pakcs-new/mccparser/src/Imports.lhs 2012-06-10 23:41:02.327127733 -0430 -@@ -14,7 +14,7 @@ - > import Base - > import Env - > import TopEnv --> import Maybe -+> import Data.Maybe - > import Map - > import Set - -diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/InterfaceCheck.hs pakcs-new/mccparser/src/InterfaceCheck.hs ---- pakcs/mccparser/src/InterfaceCheck.hs 2011-11-14 09:23:11.000000000 -0430 -+++ pakcs-new/mccparser/src/InterfaceCheck.hs 2012-06-10 23:41:02.293126815 -0430 -@@ -10,7 +10,7 @@ - module InterfaceCheck where - - import FlatWithSrcRefs --import List -+import Data.List - - - ------------------------------------------------------------------------------- -diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/IntfCheck.lhs pakcs-new/mccparser/src/IntfCheck.lhs ---- pakcs/mccparser/src/IntfCheck.lhs 2011-11-14 09:23:09.000000000 -0430 -+++ pakcs-new/mccparser/src/IntfCheck.lhs 2012-06-10 23:41:02.328127760 -0430 -@@ -16,8 +16,8 @@ - - > module IntfCheck(intfCheck,fixInterface,intfEquiv) where - > import Base --> import Maybe --> import List(deleteFirstsBy) -+> import Data.Maybe -+> import Data.List(deleteFirstsBy) - > import Set - - \end{verbatim} -diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/KindCheck.lhs pakcs-new/mccparser/src/KindCheck.lhs ---- pakcs/mccparser/src/KindCheck.lhs 2011-11-14 09:23:09.000000000 -0430 -+++ pakcs-new/mccparser/src/KindCheck.lhs 2012-06-10 23:41:02.329127787 -0430 -@@ -25,7 +25,7 @@ - - > module KindCheck(kindCheck,kindCheckGoal) where - > import Base hiding (bindArity) --> import Maybe -+> import Data.Maybe - > import TopEnv - - \end{verbatim} -diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/LexComb.lhs pakcs-new/mccparser/src/LexComb.lhs ---- pakcs/mccparser/src/LexComb.lhs 2011-11-14 09:23:09.000000000 -0430 -+++ pakcs-new/mccparser/src/LexComb.lhs 2012-06-10 23:41:02.329127787 -0430 -@@ -19,7 +19,7 @@ - > module LexComb where - > import Position - > import Error --> import Char -+> import Data.Char - - > infixl 1 `thenP`, `thenP_` - -diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/Lift.lhs pakcs-new/mccparser/src/Lift.lhs ---- pakcs/mccparser/src/Lift.lhs 2011-11-14 09:23:09.000000000 -0430 -+++ pakcs-new/mccparser/src/Lift.lhs 2012-06-10 23:41:02.330127814 -0430 -@@ -22,8 +22,8 @@ - > import Env - > import TopEnv - > import Set --> import List --> import Monad -+> import Data.List -+> import Control.Monad - > import Combined - > import SCC - -diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/LLParseComb.lhs pakcs-new/mccparser/src/LLParseComb.lhs ---- pakcs/mccparser/src/LLParseComb.lhs 2011-11-14 09:23:09.000000000 -0430 -+++ pakcs-new/mccparser/src/LLParseComb.lhs 2012-06-10 23:41:02.330127814 -0430 -@@ -29,8 +29,8 @@ - > import Position - > import Set - > import Map --> import Maybe --> import Monad -+> import Data.Maybe -+> import Control.Monad - > import Error - > import LexComb - -diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/Map.lhs pakcs-new/mccparser/src/Map.lhs ---- pakcs/mccparser/src/Map.lhs 2011-11-14 09:23:09.000000000 -0430 -+++ pakcs-new/mccparser/src/Map.lhs 2012-06-10 23:41:02.331127841 -0430 -@@ -11,7 +11,7 @@ - - > module Map(FM, nullFM, zeroFM, unitFM, addToFM, deleteFromFM, - > lookupFM, fromListFM, toListFM) where --> import List -+> import Data.List - - \end{verbatim} - A 2-3 tree is either empty or a node with either two or three children -diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/Modules.lhs pakcs-new/mccparser/src/Modules.lhs ---- pakcs/mccparser/src/Modules.lhs 2011-11-14 09:23:09.000000000 -0430 -+++ pakcs-new/mccparser/src/Modules.lhs 2012-06-10 23:41:02.333127895 -0430 -@@ -55,10 +55,10 @@ - > import CaseCompletion - > import PathUtils - > import TypeSubst --> import List --> import IO --> import Maybe --> import Monad -+> import Data.List -+> import System.IO -+> import Data.Maybe -+> import Control.Monad - > import Pretty - > import Error - > import Env -diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/newer.lhs pakcs-new/mccparser/src/newer.lhs ---- pakcs/mccparser/src/newer.lhs 2011-11-14 09:23:10.000000000 -0430 -+++ pakcs-new/mccparser/src/newer.lhs 2012-06-10 23:41:02.333127895 -0430 -@@ -24,10 +24,10 @@ - code 2. - \begin{verbatim} - --> import IO --> import Directory --> import System --> import Time -+> import System.IO -+> import System.Directory -+> import System.Cmd -+> import System.Time - > import PathUtils (getModuleModTime) - - > main = -diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/OldScopeEnv.hs pakcs-new/mccparser/src/OldScopeEnv.hs ---- pakcs/mccparser/src/OldScopeEnv.hs 2011-11-14 09:23:11.000000000 -0430 -+++ pakcs-new/mccparser/src/OldScopeEnv.hs 2012-06-10 23:41:02.294126843 -0430 -@@ -8,7 +8,7 @@ - - import Ident - import Env --import Maybe -+import Data.Maybe - - - ------------------------------------------------------------------------------- -diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/PathUtils.lhs pakcs-new/mccparser/src/PathUtils.lhs ---- pakcs/mccparser/src/PathUtils.lhs 2011-11-14 09:23:10.000000000 -0430 -+++ pakcs-new/mccparser/src/PathUtils.lhs 2012-06-10 23:41:02.334127922 -0430 -@@ -15,8 +15,8 @@ - > listSep, pathList, lookupFile, - > currySubdir,writeModule,readModule, - > doesModuleExist,maybeReadModule,getModuleModTime) where --> -- import List --> import Directory -+> -- import Data.List -+> import System.Directory - > import CurrySubdir - - \end{verbatim} -diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/PrecCheck.lhs pakcs-new/mccparser/src/PrecCheck.lhs ---- pakcs/mccparser/src/PrecCheck.lhs 2011-11-14 09:23:10.000000000 -0430 -+++ pakcs-new/mccparser/src/PrecCheck.lhs 2012-06-10 23:41:02.335127950 -0430 -@@ -18,7 +18,7 @@ - - > module PrecCheck(precCheck,precCheckGoal) where - > import Base --> import List -+> import Data.List - > import Env - > import TopEnv - -diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/Pretty.lhs pakcs-new/mccparser/src/Pretty.lhs ---- pakcs/mccparser/src/Pretty.lhs 2011-11-14 09:23:10.000000000 -0430 -+++ pakcs-new/mccparser/src/Pretty.lhs 2012-06-10 23:41:02.337128004 -0430 -@@ -180,7 +180,7 @@ - - -- Don't import Util( assertPanic ) because it makes a loop in the module structure - --import Ratio -+import Data.Ratio - infixl 6 <> - infixl 6 <+> - infixl 5 $$, $+$ -diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/Set.lhs pakcs-new/mccparser/src/Set.lhs ---- pakcs/mccparser/src/Set.lhs 2011-11-14 09:23:10.000000000 -0430 -+++ pakcs-new/mccparser/src/Set.lhs 2012-06-10 23:41:02.338128031 -0430 -@@ -11,9 +11,9 @@ - \begin{verbatim} - - > module Set where --> import List -+> import Data.List - > import Map --> import Maybe -+> import Data.Maybe - - > infixl 8 `addToSet`, `deleteFromSet` - > infixl 7 `unionSet`, `intersectionSet` -diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/Simplify.lhs pakcs-new/mccparser/src/Simplify.lhs ---- pakcs/mccparser/src/Simplify.lhs 2011-11-14 09:23:10.000000000 -0430 -+++ pakcs-new/mccparser/src/Simplify.lhs 2012-06-10 23:41:02.339128058 -0430 -@@ -26,10 +26,10 @@ - > import Base - > import Combined - > import Env --> import Monad -+> import Control.Monad - > import SCC - > import Typing --> import List (partition) -+> import Data.List (partition) - - > type SimplifyState a = StateT ValueEnv (ReaderT EvalEnv (StateT Int Id)) a - > type InlineEnv = Env Ident Expression -diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/smake.hs pakcs-new/mccparser/src/smake.hs ---- pakcs/mccparser/src/smake.hs 2011-11-14 09:23:12.000000000 -0430 -+++ pakcs-new/mccparser/src/smake.hs 2012-06-10 23:41:02.296126896 -0430 -@@ -22,11 +22,11 @@ - -- Martin Engelke (men@informatik.uni-kiel.de) - -- - --import System --import Directory --import Time --import Monad --import Maybe -+import System.Cmd -+import System.Directory -+import System.Time -+import Control.Monad -+import Data.Maybe - import PathUtils (getModuleModTime) - - -diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/SyntaxCheck.lhs pakcs-new/mccparser/src/SyntaxCheck.lhs ---- pakcs/mccparser/src/SyntaxCheck.lhs 2011-11-14 09:23:10.000000000 -0430 -+++ pakcs-new/mccparser/src/SyntaxCheck.lhs 2012-06-10 23:41:02.342128139 -0430 -@@ -24,9 +24,9 @@ - > import Base - > import Env - > import NestEnv --> import List --> import Maybe --> import Monad -+> import Data.List -+> import Data.Maybe -+> import Control.Monad - > import Combined - > import Utils - -diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/SyntaxColoring.hs pakcs-new/mccparser/src/SyntaxColoring.hs ---- pakcs/mccparser/src/SyntaxColoring.hs 2011-11-14 09:23:11.000000000 -0430 -+++ pakcs-new/mccparser/src/SyntaxColoring.hs 2012-06-10 23:48:14.526817048 -0430 -@@ -10,9 +10,9 @@ - import Frontend - import Ident - import CurrySyntax --import Char --import Maybe --import List -+import Data.Char hiding (Space) -+import Data.Maybe -+import Data.List - import Debug.Trace - import Message - import Control.Exception -diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/TopEnv.lhs pakcs-new/mccparser/src/TopEnv.lhs ---- pakcs/mccparser/src/TopEnv.lhs 2011-11-14 09:23:10.000000000 -0430 -+++ pakcs-new/mccparser/src/TopEnv.lhs 2012-06-10 23:41:02.342128139 -0430 -@@ -41,7 +41,7 @@ - > allImports,moduleImports,localBindings) where - > import Env - > import Ident --> import Maybe -+> import Data.Maybe - > import Utils - - > data Source = Local | Import [ModuleIdent] deriving (Eq,Show) -diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/TypeCheck.lhs pakcs-new/mccparser/src/TypeCheck.lhs ---- pakcs/mccparser/src/TypeCheck.lhs 2011-11-14 09:23:10.000000000 -0430 -+++ pakcs-new/mccparser/src/TypeCheck.lhs 2012-06-10 23:45:05.513706248 -0430 -@@ -33,9 +33,9 @@ - > import SCC - > import TypeSubst - > import Utils --> import List --> import Monad --> import Maybe -+> import Data.List -+> import Control.Monad -+> import Data.Maybe - - > infixl 5 $-$ - -@@ -1136,9 +1136,6 @@ - > where tvs = [tv | tv <- nub (typeVars ty), tv `notElemSet` gvs] - > tvs' = map TypeVariable [0..] - --> replicateM :: Monad m => Int -> m a -> m [a] --> replicateM n = sequence . replicate n -- - \end{verbatim} - \paragraph{Auxiliary Functions} - The functions \texttt{constrType}, \texttt{varType}, and -diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/Types.lhs pakcs-new/mccparser/src/Types.lhs ---- pakcs/mccparser/src/Types.lhs 2011-11-14 09:23:10.000000000 -0430 -+++ pakcs-new/mccparser/src/Types.lhs 2012-06-10 23:41:02.346128247 -0430 -@@ -13,8 +13,8 @@ - - > module Types where - > import Ident --> import List --> import Maybe -+> import Data.List -+> import Data.Maybe - - \end{verbatim} - A type is either a type variable, an application of a type constructor -diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/TypeSubst.lhs pakcs-new/mccparser/src/TypeSubst.lhs ---- pakcs/mccparser/src/TypeSubst.lhs 2011-11-14 09:23:10.000000000 -0430 -+++ pakcs-new/mccparser/src/TypeSubst.lhs 2012-06-10 23:41:02.346128247 -0430 -@@ -12,8 +12,8 @@ - > module TypeSubst(module TypeSubst, idSubst,bindSubst,compose) where - > import Base - > import TopEnv --> import Maybe --> import List -+> import Data.Maybe -+> import Data.List - > import Subst - - > type TypeSubst = Subst Int Type -diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/Typing.lhs pakcs-new/mccparser/src/Typing.lhs ---- pakcs/mccparser/src/Typing.lhs 2011-11-14 09:23:10.000000000 -0430 -+++ pakcs-new/mccparser/src/Typing.lhs 2012-06-10 23:41:02.347128274 -0430 -@@ -12,10 +12,10 @@ - > import Base - > import TypeSubst - > import Combined --> import Monad -+> import Control.Monad - > import TopEnv - > import Utils --> import Maybe -+> import Data.Maybe - - \end{verbatim} - During the transformation of Curry source code into the intermediate -diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/Unlit.lhs pakcs-new/mccparser/src/Unlit.lhs ---- pakcs/mccparser/src/Unlit.lhs 2011-11-14 09:23:10.000000000 -0430 -+++ pakcs-new/mccparser/src/Unlit.lhs 2012-06-10 23:41:02.347128274 -0430 -@@ -27,7 +27,7 @@ - \begin{verbatim} - - > module Unlit(unlit) where --> import Char -+> import Data.Char - > import Position - - \end{verbatim} -diff -Naur '--exclude=*.o' '--exclude=*.hi' '--exclude=*~' '--exclude=cymake' pakcs/mccparser/src/WarnCheck.hs pakcs-new/mccparser/src/WarnCheck.hs ---- pakcs/mccparser/src/WarnCheck.hs 2011-11-14 09:23:11.000000000 -0430 -+++ pakcs-new/mccparser/src/WarnCheck.hs 2012-06-10 23:41:02.300127003 -0430 -@@ -17,8 +17,8 @@ - import ScopeEnv (ScopeEnv) - import Message - import Env --import Monad --import List -+import Control.Monad -+import Data.List - - - ------------------------------------------------------------------------------- diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/default.nix index e7c2c80ac55c82129eb000eb788b30f14854818e..a7c9dbc9073614af41f13be88a6ab54ef5515732 100644 --- a/pkgs/development/compilers/scala/default.nix +++ b/pkgs/development/compilers/scala/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out - rm "bin/"*.bat + rm bin/*.bat + rm lib/scalacheck.jar mv * $out ''; diff --git a/pkgs/development/compilers/sdcc/default.nix b/pkgs/development/compilers/sdcc/default.nix index ebc052764f2d24b63b4b527831967ea698dd284d..a22b0d9ea00e8a0a01fc4d64b8fbed71252389af 100644 --- a/pkgs/development/compilers/sdcc/default.nix +++ b/pkgs/development/compilers/sdcc/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ${if gputils == null then "--disable-pic14-port --disable-pic16-port" else ""} ''; - meta = { + meta = with stdenv.lib; { description = "Small Device C Compiler"; longDescription = '' SDCC is a retargettable, optimizing ANSI - C compiler suite that targets @@ -27,6 +27,8 @@ stdenv.mkDerivation rec { PIC18 targets. It can be retargeted for other microprocessors. ''; homepage = http://sdcc.sourceforge.net/; - license = stdenv.lib.licenses.gpl2; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [maintainers.bjornfor]; }; } diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index c153abea247a5f8535b95c34a5e66156b8c7ae03..13a0081a2574b61b57599c6c804ca9a30bc53a73 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -1,24 +1,18 @@ -{ stdenv, fetchurl, yacc, flex, pkgconfig, glib, dbus, dbus_tools, libiconvOrEmpty }: +{ stdenv, fetchurl, yacc, flex, pkgconfig, glib, libintlOrEmpty }: stdenv.mkDerivation rec { - p_name = "vala"; - ver_maj = "0.19"; - ver_min = "0"; + + version = "0.17.2"; + name = "vala-${version}"; src = fetchurl { - url = "mirror://gnome/sources/${p_name}/${ver_maj}/${name}.tar.xz"; - sha256 = "1vn524hcnaggz8zx49mvf7p4z1mscrlj2syg7jjhph8nak5wi0bp"; + url = "mirror://gnome/sources/vala/0.17/${name}.tar.xz"; + sha256 = "09i2s0dwmrk147ind2dx7nq845g12fp6fsjqrphhrr0dbi0zzgh3"; }; - name = "${p_name}-${ver_maj}.${ver_min}"; - - postPatch = "patchShebangs ."; nativeBuildInputs = [ yacc flex pkgconfig ]; - buildInputs = [ glib ] ++ libiconvOrEmpty - ++ stdenv.lib.optional doCheck [ dbus dbus_tools ]; - - doCheck = false; # problems when launching dbus tests + buildInputs = [ glib ] ++ libintlOrEmpty; meta = { description = "Compiler for the GObject type system"; diff --git a/pkgs/development/compilers/yasm/default.nix b/pkgs/development/compilers/yasm/default.nix index ed97e8f1b28ae319fc87a46e1c804a4adac3cbcd..02614106706cff2f6050d6b880399d29eacd5766 100644 --- a/pkgs/development/compilers/yasm/default.nix +++ b/pkgs/development/compilers/yasm/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "yasm-1.1.0"; - + name = "yasm-1.2.0"; + src = fetchurl { url = "http://www.tortall.net/projects/yasm/releases/${name}.tar.gz"; - sha256 = "e5d56b582f3d0c30ed5c4fc221063e4175602307ea645520889458133671c232"; + sha256 = "0cfg7ji3ia2in628w42wrfvw2ixmmm4rghwmv2k202mraysgm3vn"; }; meta = { diff --git a/pkgs/development/interpreters/php/5.3.nix b/pkgs/development/interpreters/php/5.3.nix index fce9c0f152b21a13c786d79051abe5315127fa74..35508230ebdf99803f90886aa8c22f8a16c2fb24 100644 --- a/pkgs/development/interpreters/php/5.3.nix +++ b/pkgs/development/interpreters/php/5.3.nix @@ -9,7 +9,7 @@ in composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in { - version = "5.3.24"; + version = "5.3.25"; name = "php-${version}"; @@ -201,7 +201,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) src = fetchurl { url = "http://nl.php.net/get/php-${version}.tar.bz2/from/this/mirror"; - sha256 = "00sphz1y6bjb2qshbcbadh5f2xvhfy82rfdc62qjfn6337gwlfzw"; + sha256 = "15dwks0823m0vc3qv58yxfvchwx9ydg5gjvjy8kpc5w3syras76m"; name = "php-${version}.tar.bz2"; }; diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix index 823920ed1021bcd3f47b19c3666b5d8eb6be4aa0..13707709a7cfabaf6cfbf472590c87f3743918b6 100644 --- a/pkgs/development/interpreters/php/5.4.nix +++ b/pkgs/development/interpreters/php/5.4.nix @@ -9,7 +9,7 @@ in composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in { - version = "5.4.14"; + version = "5.4.15"; name = "php-${version}"; @@ -197,7 +197,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) src = fetchurl { url = "http://nl.php.net/get/php-${version}.tar.bz2/from/this/mirror"; - sha256 = "02p23g4gjijazq16r5kwbkval2lkw76g0086n0zynlf67f2g6l2l"; + sha256 = "0dh159svdrakvm9nsyg3yyln7cqqzpxgs2163cqxplnc93d8a8id"; name = "php-${version}.tar.bz2"; }; diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix index 7dc4708e3cf0d70918edb83c1d7c9ce2d9568903..9fb2ab377dfcac21c19e73ff27a2e1eacd3cc3b7 100644 --- a/pkgs/development/interpreters/python/2.7/default.nix +++ b/pkgs/development/interpreters/python/2.7/default.nix @@ -9,11 +9,11 @@ with stdenv.lib; let majorVersion = "2.7"; - version = "${majorVersion}.4"; + version = "${majorVersion}.3"; src = fetchurl { url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.bz2"; - sha256 = "0nd3x4j2w8pi9ac3pawrzb5i3s88hw0aasr08dprdv7q81fp0pq3"; + sha256 = "0g3672il41rcfjk7sphfqdsa6qf53y8g3ai8yk1sslxi3khmfr3j"; }; patches = diff --git a/pkgs/development/interpreters/python/3.3/default.nix b/pkgs/development/interpreters/python/3.3/default.nix index 16973c6226ee8a3089176b3beeaa72d42a2bab2e..1471abe287a7e9e10e771e767719ae62ec89cd22 100644 --- a/pkgs/development/interpreters/python/3.3/default.nix +++ b/pkgs/development/interpreters/python/3.3/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation { readlineSupport = readline != null; opensslSupport = openssl != null; tkSupport = (tk != null) && (tcl != null) && (libX11 != null) && (xproto != null); - libPrefix = "python${majorVersion}m"; + libPrefix = "python${majorVersion}"; }; enableParallelBuilding = true; diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index d0e4fee3359504c41b54d363d65c9b724f454791..347647fd87e6d173de831374e7c52dcecbcd3c91 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation rec { pname = "racket"; - version = "5.3.3"; + version = "5.3.4"; name = "${pname}-${version}"; src = fetchurl { url = "http://download.racket-lang.org/installers/${version}/${pname}/${name}-src-unix.tgz"; - sha256 = "1qp0fmsh4dkxvlj35xnwdcf4m97jcf927cwhnckjicqx1lfa0wj7"; + sha256 = "0yrdmpdvzf092869y6zjjjxl6j2kypgiv7qrfkv7lj8w01pbh7sd"; }; # Various racket executables do run-time searches for these. diff --git a/pkgs/development/libraries/GConf/3.x.nix b/pkgs/development/libraries/GConf/3.x.nix new file mode 100644 index 0000000000000000000000000000000000000000..82c0c1f2c4359ac606ba8384d4538525a8a290ec --- /dev/null +++ b/pkgs/development/libraries/GConf/3.x.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, glib, dbus_glib, pkgconfig, libxml2, gtk3, intltool, polkit }: + +stdenv.mkDerivation { + name = "GConf-3.2.3"; + + src = fetchurl { + url = mirror://gnome/sources/GConf/3.2/GConf-3.2.3.tar.xz; + sha256 = "0jd1z9gb1b7mv4g07qm554va6idasf3swgrfqflypdh9s38mvdcy"; + }; + + propagatedBuildInputs = [ glib dbus_glib ]; + buildInputs = [ polkit gtk3 libxml2 ]; + nativeBuildInputs = [ pkgconfig intltool ]; + + configureFlags = "--disable-orbit"; + + meta = { + homepage = http://projects.gnome.org/gconf/; + description = "A system for storing application preferences"; + maintainers = [ stdenv.lib.maintainers.urkud ]; + inherit (gtk3.meta) platforms; + }; +} diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix index 899c3bb5c8d883c200c00bc1846740d32efe695c..8ff643ce5b18cea67268d50fb2a3479b9ab0c363 100644 --- a/pkgs/development/libraries/SDL/default.nix +++ b/pkgs/development/libraries/SDL/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, audiofile +{ stdenv, fetchurl, pkgconfig , openglSupport ? false, mesa ? null , alsaSupport ? true, alsaLib ? null , x11Support ? true, x11 ? null, libXrandr ? null @@ -16,26 +16,25 @@ assert pulseaudioSupport -> pulseaudio != null; let configureFlagsFun = attrs: '' - --disable-oss --disable-video-x11-xme + --disable-oss --disable-x11-shared --disable-alsa-shared --enable-rpath --disable-pulseaudio-shared - --disable-osmesa-shared ${if alsaSupport then "--with-alsa-prefix=${attrs.alsaLib}/lib" else ""} ''; in stdenv.mkDerivation rec { - name = "SDL-1.2.15"; + name = "SDL-1.2.14"; src = fetchurl { url = "http://www.libsdl.org/release/${name}.tar.gz"; - sha256 = "005d993xcac8236fpvd1iawkz4wqjybkpn8dbwaliqz5jfkidlyn"; + sha256 = "1dnrxr18cyar0xd13dca7h8wp1fin4n3iyncxfq6pjrlf0l7x4jx"; }; # Since `libpulse*.la' contain `-lgdbm', PulseAudio must be propagated. propagatedBuildInputs = stdenv.lib.optionals x11Support [ x11 libXrandr ] ++ stdenv.lib.optional pulseaudioSupport pulseaudio; - buildInputs = [ pkgconfig audiofile ] ++ - stdenv.lib.optional openglSupport [ mesa ] ++ + buildInputs = [ pkgconfig ] ++ + stdenv.lib.optional openglSupport mesa ++ stdenv.lib.optional alsaSupport alsaLib; # XXX: By default, SDL wants to dlopen() PulseAudio, in which case diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/2.6.x.nix similarity index 83% rename from pkgs/development/libraries/atk/default.nix rename to pkgs/development/libraries/atk/2.6.x.nix index d8e69fbf603e194527ce21faec6be60a5d3b5f50..4dd0ae1eeafbc2865d9fa82ebbd585db63bb2ddc 100644 --- a/pkgs/development/libraries/atk/default.nix +++ b/pkgs/development/libraries/atk/2.6.x.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, perl, glib }: stdenv.mkDerivation rec { - name = "atk-2.8.0"; + name = "atk-2.6.0"; src = fetchurl { - url = "mirror://gnome/sources/atk/2.8/${name}.tar.xz"; - sha256 = "1x3dd3hg9l1j9dq70xwph13vxdp6a9wbfcnryryf1wr6c8bij9dj"; + url = "mirror://gnome/sources/atk/2.6/${name}.tar.xz"; + sha256 = "eff663f90847620bb68c9c2cbaaf7f45e2ff44163b9ab3f10d15be763680491f"; }; nativeBuildInputs = [ pkgconfig perl ]; diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 65f826c7ed43cb810fb891753d20f423957dcb2e..8c9f55426d53fe44380a78af250ad684d1ce9388 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -1,33 +1,29 @@ { postscriptSupport ? true , pdfSupport ? true , pngSupport ? true -, xcbSupport ? true # no longer experimental since 1.12 -, glSupport ? false +, xcbSupport ? false , gobjectSupport ? true, glib , stdenv, fetchurl, pkgconfig, x11, fontconfig, freetype, xlibs -, expat -, zlib, libpng, pixman, libxcb ? null, xcbutil ? null, mesa ? null +, zlib, libpng, pixman, libxcb ? null, xcbutil ? null , libiconvOrEmpty, libintlOrEmpty }: assert postscriptSupport -> zlib != null; assert pngSupport -> libpng != null; assert xcbSupport -> libxcb != null && xcbutil != null; -assert glSupport -> mesa != null; stdenv.mkDerivation rec { - name = "cairo-1.12.14"; + name = "cairo-1.12.4"; src = fetchurl { url = "http://cairographics.org/releases/${name}.tar.xz"; - sha256 = "04xcykglff58ygs0dkrmmnqljmpjwp2qgwcz8sijqkdpz7ix3l4n"; + sha1 = "f4158981ed01e73c94fb8072074b17feee61a68b"; }; - buildInputs = with xlibs; - [ pkgconfig x11 fontconfig expat ] - ++ stdenv.lib.optional (!stdenv.isDarwin) libXrender + buildInputs = + [ pkgconfig x11 fontconfig ] + ++ stdenv.lib.optional (!stdenv.isDarwin) xlibs.libXrender ++ stdenv.lib.optionals xcbSupport [ libxcb xcbutil ] - ++ stdenv.lib.optionals glSupport [ mesa ] ++ libintlOrEmpty ++ libiconvOrEmpty; @@ -40,12 +36,17 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-tee" ] ++ stdenv.lib.optional xcbSupport "--enable-xcb" - ++ stdenv.lib.optional glSupport "--enable-gl" ++ stdenv.lib.optional pdfSupport "--enable-pdf"; - preConfigure = + preConfigure = '' + # Work around broken `Requires.private' that prevents Freetype + # `-I' flags to be propagated. + sed -i "src/cairo.pc.in" \ + -es'|^Cflags:\(.*\)$|Cflags: \1 -I${freetype}/include/freetype2 -I${freetype}/include|g' + '' + # On FreeBSD, `-ldl' doesn't exist. - (stdenv.lib.optionalString stdenv.isFreeBSD + + (stdenv.lib.optionalString stdenv.isFreeBSD '' for i in "util/"*"/Makefile.in" boilerplate/Makefile.in do cat "$i" | sed -es/-ldl//g > t diff --git a/pkgs/development/libraries/dbus-cplusplus/default.nix b/pkgs/development/libraries/dbus-cplusplus/default.nix index 0a4b80d3f3ea4a4252118fbdbf7e7a3ec1009fb4..2704b9586b1a23284c85aece1aaa78841e7792d7 100644 --- a/pkgs/development/libraries/dbus-cplusplus/default.nix +++ b/pkgs/development/libraries/dbus-cplusplus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, dbus, glib, gtkmm, pkgconfig, expat }: +{ stdenv, fetchurl, dbus, glib, gtkmm, pkgconfig }: stdenv.mkDerivation rec { name = "dbus-cplusplus-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0qafmy2i6dzx4n1dqp6pygyy6gjljnb7hwjcj2z11c1wgclsq4dw"; }; - buildInputs = [ dbus glib gtkmm pkgconfig expat ]; + buildInputs = [ dbus glib gtkmm pkgconfig ]; configureFlags = "--disable-ecore"; diff --git a/pkgs/development/libraries/dbus-glib/default.nix b/pkgs/development/libraries/dbus-glib/default.nix index be6cf442a49f974f955b0353a38463087bda2f69..47e83e7780ccb0edbb2f7fa7ac94008782a731c5 100644 --- a/pkgs/development/libraries/dbus-glib/default.nix +++ b/pkgs/development/libraries/dbus-glib/default.nix @@ -1,20 +1,18 @@ { stdenv, fetchurl, pkgconfig, expat, gettext, libiconv, dbus, glib }: stdenv.mkDerivation rec { - name = "dbus-glib-0.100.2"; + name = "dbus-glib-0.98"; src = fetchurl { url = "${meta.homepage}/releases/dbus-glib/${name}.tar.gz"; - sha256 = "1ibav91yg70f2l3l18cr0hf4mna1h9d4mrg0c60w4l8zjbd45fx5"; + sha256 = "04fiwld5yaxyggxlvdmbaqkngh4fn8gfkkqckcp3274bpgb82z19"; }; nativeBuildInputs = [ pkgconfig gettext ]; buildInputs = [ expat ] ++ stdenv.lib.optional (!stdenv.isLinux) libiconv; - propagatedBuildInputs = [ dbus.libs glib ]; - - doCheck = true; + propagatedBuildInputs = [ dbus glib ]; passthru = { inherit dbus glib; }; diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index 914ab96b5805c78ee2f8898530b600561a3927e5..5716ac6648a0926faa2a0b035151446461b4cb75 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -1,104 +1,71 @@ -{ stdenv, fetchurl, pkgconfig, autoconf, automake, libtool -, expat, systemd, glib, dbus_glib, python -, libX11, libICE, libSM, useX11 ? true }: +{ stdenv, fetchurl, pkgconfig, expat, libX11, libICE, libSM, useX11 ? true }: let - version = "1.6.10"; # 1.7.* isn't recommended, even for gnome 3.8 - sha256 = "11jyj6aw8yf75hqv7v0601n2xms08k0mys6dyql164m7ad56yg8z"; + version = "1.6.4"; - inherit (stdenv) lib; + src = fetchurl { + url = "http://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz"; + sha256 = "1wacqyfkcpayg7f8rvx9awqg275n5pksxq5q7y21lxjx85x6pfjz"; + }; + + patches = [ ./ignore-missing-includedirs.patch ]; - buildInputsX = lib.optionals useX11 [ libX11 libICE libSM ]; + configureFlags = "--localstatedir=/var --sysconfdir=/etc --with-session-socket-dir=/tmp"; + +in rec { - # also other parts than "libs" need this statically linked lib - makeInternalLib = "(cd dbus && make libdbus-internal.la)"; + libs = stdenv.mkDerivation { + name = "dbus-library-" + version; + nativeBuildInputs = [ pkgconfig ]; - # A generic builder for individual parts (subdirs) of D-Bus - dbus_drv = name: subdirs: merge: stdenv.mkDerivation (lib.mergeAttrsByFuncDefaultsClean [{ + buildInputs = [ expat ]; - name = "dbus-${name}-${version}"; + # FIXME: dbus has optional systemd integration when checking + # at_console policies. How to enable this without introducing a + # circular dependency between dbus and systemd? - src = fetchurl { - url = "http://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz"; - inherit sha256; - }; + inherit src patches configureFlags; - configureFlags = [ - "--localstatedir=/var" - "--sysconfdir=/etc" - "--with-session-socket-dir=/tmp" - "--with-systemdsystemunitdir=$(out)/lib/systemd" - ]; + preConfigure = + '' + sed -i '/mkinstalldirs.*localstatedir/d' bus/Makefile.in + sed -i '/SUBDIRS/s/ tools//' Makefile.in + ''; - preConfigure = '' - patchShebangs . - substituteInPlace tools/Makefile.am --replace 'install-localstatelibDATA:' 'disabled:' - autoreconf -fi - ''; + # Enable X11 autolaunch support in libdbus. This doesn't actually + # depend on X11 (it just execs dbus-launch in dbus.tools), + # contrary to what the configure script demands. + NIX_CFLAGS_COMPILE = "-DDBUS_ENABLE_X11_AUTOLAUNCH=1"; installFlags = "sysconfdir=$(out)/etc"; + }; - doCheck = true; + tools = stdenv.mkDerivation { + name = "dbus-tools-" + version; - patches = [ - ./ignore-missing-includedirs.patch ./implement-getgrouplist.patch - ./ucred-dirty-hack.patch ./no-create-dirs.patch - ]; + inherit src patches; - nativeBuildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ expat ]; - buildInputs = [ autoconf automake libtool ]; # ToDo: optional selinux? - - # build only the specified subdirs - postPatch = "sed '/SUBDIRS/s/=.*/=" + subdirs + "/' -i Makefile.am\n" - # use already packaged libdbus instead of trying to build it again - + lib.optionalString (name != "libs") '' - for mfile in */Makefile.am; do - sed 's,\$(top_builddir)/dbus/\(libdbus-[0-9]\),${libs}/lib/\1,g' -i "$mfile" - done - ''; - - } merge ]); - - libs = dbus_drv "libs" "dbus" { - buildInputs = [ systemd.headers ]; - patches = [ ./systemd.patch ]; # bypass systemd detection - - # Enable X11 autolaunch support in libdbus. This doesn't actually depend on X11 - # (it just execs dbus-launch in dbus.tools), contrary to what the configure script demands. - NIX_CFLAGS_COMPILE = "-DDBUS_ENABLE_X11_AUTOLAUNCH=1"; - }; + configureFlags = "${configureFlags} --with-dbus-daemondir=${daemon}/bin"; -in rec { + nativeBuildInputs = [ pkgconfig ]; - # This package has been split because most applications only need dbus.lib - # which serves as an interface to a *system-wide* daemon, - # see e.g. http://en.wikipedia.org/wiki/D-Bus#Architecture . - # Also some circular dependencies get split by this (like with systemd). + buildInputs = [ expat libs ] + ++ stdenv.lib.optionals useX11 [ libX11 libICE libSM ]; - inherit libs; + NIX_LDFLAGS = "-ldbus-1"; - tools = dbus_drv "tools" "tools" { - configureFlags = [ "--with-dbus-daemondir=${daemon}/bin" ]; - buildInputs = buildInputsX ++ [ libs daemon systemd dbus_glib ]; - NIX_CFLAGS_LINK = "-Wl,--as-needed -ldbus-1"; - }; + preConfigure = + '' + sed -i 's@$(top_builddir)/dbus/libdbus-1.la@@' tools/Makefile.in + substituteInPlace tools/Makefile.in --replace 'install-localstatelibDATA:' 'disabled:' + ''; - daemon = dbus_drv "daemon" "bus" { - preBuild = makeInternalLib; - buildInputs = [ systemd ]; - }; + postConfigure = "cd tools"; - # Some of the tests don't work yet; in fact, @vcunat tried several packages - # containing dbus testing, and all of them have some test failure. - tests = dbus_drv "tests" "test" { - preBuild = makeInternalLib; - buildInputs = buildInputsX ++ [ systemd libs tools daemon dbus_glib python ]; - NIX_CFLAGS_LINK = "-Wl,--as-needed -ldbus-1"; + installFlags = "localstatedir=$TMPDIR/var"; }; - docs = dbus_drv "docs" "doc" { - postInstall = ''rm -r "$out/lib"''; - }; + # I'm too lazy to separate daemon and libs now. + daemon = libs; } diff --git a/pkgs/development/libraries/dbus/implement-getgrouplist.patch b/pkgs/development/libraries/dbus/implement-getgrouplist.patch deleted file mode 100644 index e3a4a25cb720108c61a27af447e0b01f7783247c..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/dbus/implement-getgrouplist.patch +++ /dev/null @@ -1,108 +0,0 @@ -Compatibility patch for Illumos/Solaris and possibly other platforms. -Implements getgrouplist when not provided by OS. -Without it, only the user's primary group is used in authentication! ---- 1970-01-01 00:00:00.000000000 +0000 -+++ dbus-1.6.8/dbus/getgrouplist.c 2013-02-28 13:10:51.081792722 +0000 -@@ -0,0 +1,89 @@ -+/* $OpenBSD: getgrouplist.c,v 1.12 2005/08/08 08:05:34 espie Exp $ */ -+/* -+ * Copyright (c) 1991, 1993 -+ * The Regents of the University of California. All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in the -+ * documentation and/or other materials provided with the distribution. -+ * 3. Neither the name of the University nor the names of its contributors -+ * may be used to endorse or promote products derived from this software -+ * without specific prior written permission. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND -+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE -+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -+ * SUCH DAMAGE. -+ */ -+ -+/* OPENBSD ORIGINAL: lib/libc/gen/getgrouplist.c */ -+ -+/* -+ * get credential -+ */ -+#include -+#include -+#include -+#include -+ -+int -+getgrouplist(const char *uname, gid_t agroup, gid_t *groups, int *grpcnt) -+{ -+ struct group *grp; -+ int i, ngroups; -+ int ret, maxgroups; -+ int bail; -+ -+ ret = 0; -+ ngroups = 0; -+ maxgroups = *grpcnt; -+ -+ /* -+ * install primary group -+ */ -+ if (ngroups >= maxgroups) { -+ *grpcnt = ngroups; -+ return (-1); -+ } -+ groups[ngroups++] = agroup; -+ -+ /* -+ * Scan the group file to find additional groups. -+ */ -+ setgrent(); -+ while ((grp = getgrent())) { -+ if (grp->gr_gid == agroup) -+ continue; -+ for (bail = 0, i = 0; bail == 0 && i < ngroups; i++) -+ if (groups[i] == grp->gr_gid) -+ bail = 1; -+ if (bail) -+ continue; -+ for (i = 0; grp->gr_mem[i]; i++) { -+ if (!strcmp(grp->gr_mem[i], uname)) { -+ if (ngroups >= maxgroups) { -+ ret = -1; -+ goto out; -+ } -+ groups[ngroups++] = grp->gr_gid; -+ break; -+ } -+ } -+ } -+out: -+ endgrent(); -+ *grpcnt = ngroups; -+ return (ret); -+} ---- dbus-1.6.8/dbus/dbus-sysdeps-unix.c.orig 2013-02-28 13:08:52.171215237 +0000 -+++ dbus-1.6.8/dbus/dbus-sysdeps-unix.c 2013-02-28 13:13:52.224615146 +0000 -@@ -21,6 +21,10 @@ - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ -+#ifndef HAVE_GETGROUPLIST -+#include "getgrouplist.c" -+#define HAVE_GETGROUPLIST -+#endif - - #include - diff --git a/pkgs/development/libraries/dbus/no-create-dirs.patch b/pkgs/development/libraries/dbus/no-create-dirs.patch deleted file mode 100644 index cf10d97759918b2e365b1ae188c1b29e727d08bc..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/dbus/no-create-dirs.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/bus/Makefile.am b/bus/Makefile.am -index 6cbc09a..be60bb8 100644 ---- a/bus/Makefile.am -+++ b/bus/Makefile.am -@@ -212,7 +212,6 @@ clean-local: - /bin/rm *.bb *.bbg *.da *.gcov || true - - install-data-hook: -- $(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus - $(mkinstalldirs) $(DESTDIR)$(configdir)/system.d - $(mkinstalldirs) $(DESTDIR)$(configdir)/session.d - $(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/services -diff --git a/tools/Makefile.am b/tools/Makefile.am -index cfd54b8..b6e28f9 100644 ---- a/tools/Makefile.am -+++ b/tools/Makefile.am -@@ -74,7 +74,7 @@ CLEANFILES = \ - - # create the /var/lib/dbus directory for dbus-uuidgen - install-data-local: -- $(MKDIR_P) $(DESTDIR)$(localstatedir)/lib/dbus -+ : - - installcheck-local: -- test -d $(DESTDIR)$(localstatedir)/lib/dbus -+ : diff --git a/pkgs/development/libraries/dbus/systemd.patch b/pkgs/development/libraries/dbus/systemd.patch deleted file mode 100644 index 7e6cb1f87d07afa8008accfe3d57045230d035b9..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/dbus/systemd.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 24fcc9e..98e0459 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1167,7 +1167,8 @@ else - PKG_CHECK_MODULES(SYSTEMD, - [libsystemd-login >= 32, libsystemd-daemon >= 32], - have_systemd=yes, -- have_systemd=no) -+ have_systemd=yes) -+ AC_MSG_NOTICE([NixOS: do not care whether we found systemd or not]) - fi - - if test x$have_systemd = xyes; then diff --git a/pkgs/development/libraries/dbus/ucred-dirty-hack.patch b/pkgs/development/libraries/dbus/ucred-dirty-hack.patch deleted file mode 100644 index a07abcc15fb0ee35d686afc3d15c1f4c6fa2c888..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/dbus/ucred-dirty-hack.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c -index b4ecc96..267984a 100644 ---- a/dbus/dbus-sysdeps-unix.c -+++ b/dbus/dbus-sysdeps-unix.c -@@ -1635,6 +1635,13 @@ write_credentials_byte (int server_fd, - } - } - -+struct ucred -+{ -+ pid_t pid; /* PID of sending process. */ -+ uid_t uid; /* UID of sending process. */ -+ gid_t gid; /* GID of sending process. */ -+}; -+ - /** - * Reads a single byte which must be nul (an error occurs otherwise), - * and reads unix credentials if available. Clears the credentials diff --git a/pkgs/development/libraries/enginepkcs11/default.nix b/pkgs/development/libraries/enginepkcs11/default.nix index edd646f94fab95018d9bfa687fdf2456fc2c701b..8c570c5421d61cccf4d1a7fa4775e5cf7cbdb155 100644 --- a/pkgs/development/libraries/enginepkcs11/default.nix +++ b/pkgs/development/libraries/enginepkcs11/default.nix @@ -4,7 +4,10 @@ stdenv.mkDerivation rec { name = "engine_pkcs11-0.1.8"; src = fetchurl { - url = "http://www.opensc-project.org/files/engine_pkcs11/${name}.tar.gz"; + urls = [ + "http://www.opensc-project.org/files/engine_pkcs11/${name}.tar.gz" + "http://www.openadk.org/distfiles/${name}.tar.gz" + ]; sha256 = "1rd20rxy12rfx3kwwvk5sqvc1ll87z60rqak1ksfwbf4wx0pwzfy"; }; diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix index 2067f3457b635cd99d48fa8ffc3ef62a88374d1f..116fe3c0c20fed3a95f708f2a03a2f220356b5aa 100644 --- a/pkgs/development/libraries/fontconfig/default.nix +++ b/pkgs/development/libraries/fontconfig/default.nix @@ -1,26 +1,18 @@ { stdenv, fetchurl, pkgconfig, freetype, expat }: stdenv.mkDerivation rec { - name = "fontconfig-2.10.2"; + name = "fontconfig-2.10.1"; src = fetchurl { - url = "http://fontconfig.org/release/${name}.tar.bz2"; - sha256 = "0llraqw86jmw4vzv7inskp3xxm2gc64my08iwq5mzncgfdbfza4f"; + url = "http://fontconfig.org/release/${name}.tar.gz"; + sha256 = "08h252crb3aqciwdk81jypmz2i7618dzqn3zlr87w1f017wjp4f3"; }; - infinality_patch = with freetype.infinality; if useInfinality - then let subvers = "1"; - in fetchurl { - url = "${base_URL}/fontconfig-infinality-1-${vers}_${subvers}.tar.bz2"; - sha256 = "1fm5xx0mx2243jrq5rxk4v0ajw2nawpj23399h710bx6hd1rviq7"; - } - else null; + buildInputs = [ pkgconfig freetype ]; - buildInputs = [ pkgconfig freetype expat ]; + propagatedBuildInputs = [ expat ]; # !!! shouldn't be necessary, but otherwise pango breaks - #propagatedBuildInputs = [ expat ]; # !!! shouldn't be necessary, but otherwise pango breaks - - configureFlags = "--sysconfdir=/etc --with-cache-dir=/var/cache/fontconfig --disable-docs --with-default-fonts="; + configureFlags = "--with-confdir=/etc/fonts --with-cache-dir=/var/cache/fontconfig --disable-docs --with-default-fonts="; # We should find a better way to access the arch reliably. crossArch = stdenv.cross.arch or null; @@ -34,11 +26,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; # Don't try to write to /etc/fonts or /var/cache/fontconfig at install time. - installFlags = "sysconfdir=$(out)/etc RUN_FC_CACHE_TEST=false fc_cachedir=$(TMPDIR)/dummy"; - - postInstall = if !freetype.infinality.useInfinality then "" else '' - cd "$out/etc/fonts" && tar xvf ${infinality_patch} - ''; + installFlags = "CONFDIR=$(out)/etc/fonts RUN_FC_CACHE_TEST=false fc_cachedir=$(TMPDIR)/dummy"; meta = { description = "A library for font customization and configuration"; diff --git a/pkgs/development/libraries/fox/default.nix b/pkgs/development/libraries/fox/default.nix index 76cc1d5c3d291996c73a87ed22634135209e4948..87e47e1b046eaff4d3dd0b49078662b62ac8af34 100644 --- a/pkgs/development/libraries/fox/default.nix +++ b/pkgs/development/libraries/fox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, x11 }: +{ stdenv, fetchurl, x11, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor, libXrandr, libXft }: let version = "1.7.9"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { md5 = "b5897e9c664967f5042e57070037ff18"; }; - buildInputs = [ x11 ]; + buildInputs = [ x11 libpng libjpeg libtiff zlib bzip2 libXcursor libXrandr libXft ]; doCheck = true; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { Current aims are to make FOX completely platform independent, and thus programs written against the FOX library will be only a compile away from running on a variety of platforms. ''; homepage = "http://fox-toolkit.org"; - license = "LGPL"; + license = "LGPLv3"; maintainers = [ stdenv.lib.maintainers.bbenoist ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/libraries/fox/fox-1.6.nix b/pkgs/development/libraries/fox/fox-1.6.nix index e8961621cab1c818f1c9a2ea68daaa982608e35b..540c2c61d946922672ef6001dfcc74cf96628fd5 100644 --- a/pkgs/development/libraries/fox/fox-1.6.nix +++ b/pkgs/development/libraries/fox/fox-1.6.nix @@ -1,7 +1,8 @@ -{ stdenv, fetchurl, x11 }: +{ stdenv, fetchurl, x11, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor +, libXrandr, mesa, libXft, libXfixes, xinput }: let - version = "1.6.9"; + version = "1.6.48"; in stdenv.mkDerivation rec { @@ -9,10 +10,11 @@ stdenv.mkDerivation rec { src = fetchurl { url = "ftp://ftp.fox-toolkit.org/pub/${name}.tar.gz"; - md5 = "8ab8274237431865f57b2f5596374a65"; + sha256 = "1i0q0357lrd41jjr2nkf2a7ls5ls2nwrkxbfc7202vy22942lb9k"; }; - buildInputs = [ x11 ]; + buildInputs = [ x11 libpng libjpeg libtiff zlib bzip2 libXcursor libXrandr + libXft mesa libXfixes xinput ]; doCheck = true; @@ -27,7 +29,7 @@ stdenv.mkDerivation rec { Current aims are to make FOX completely platform independent, and thus programs written against the FOX library will be only a compile away from running on a variety of platforms. ''; homepage = "http://fox-toolkit.org"; - license = "LGPL"; + license = "LGPLv3"; maintainers = [ stdenv.lib.maintainers.bbenoist ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index cff22e9bc577da9677f3001a266fcbed066c3e63..b26789930a4b7cfecfbd665441af3210817151be 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -1,50 +1,22 @@ { stdenv, fetchurl, gnumake - # FreeType supports sub-pixel rendering. This is patented by +, # FreeType supports sub-pixel rendering. This is patented by # Microsoft, so it is disabled by default. This option allows it to # be enabled. See http://www.freetype.org/patents.html. -, useEncumberedCode ? false -, useInfinality ? true + useEncumberedCode ? false }: -assert !(useEncumberedCode && useInfinality); # probably wouldn't make sense - -let - - version = "2.4.11"; - - infinality = rec { - inherit useInfinality; - vers = "20130104"; - subvers = "04"; - sha256 = "0dqglig34lfcw0w6sm6vmich0pcvq303vyh8jzqapvxgvrpr2156"; - - base_URL = "http://www.infinality.net/fedora/linux/zips"; - url = "${base_URL}/freetype-infinality-${version}-${vers}_${subvers}-x86_64.tar.bz2"; - }; - -in - stdenv.mkDerivation rec { - name = "freetype-${version}"; + name = "freetype-2.4.10"; src = fetchurl { url = "mirror://sourceforge/freetype/${name}.tar.bz2"; - sha256 = "0gxyzxqpyf8g85y6g1zc1wqrh71prbbk8xfw4m8rwzb4ck5hp7gg"; + sha256 = "0bwrkqpygayfc1rf6rr1nb8l3svgn1fmjz8davg2hnf46cn293hc"; }; - infinality_patch = if useInfinality - then fetchurl { inherit (infinality) url sha256; } - else null; - configureFlags = "--disable-static"; - NIX_CFLAGS_COMPILE = with stdenv.lib; - " -fno-strict-aliasing" # from Gentoo, see https://bugzilla.redhat.com/show_bug.cgi?id=506840 - + optionalString useEncumberedCode " -DFT_CONFIG_OPTION_SUBPIXEL_RENDERING=1" - + optionalString useInfinality " -DTT_CONFIG_OPTION_SUBPIXEL_HINTING=1"; - - patches = [ ./enable-validation.patch ] # from Gentoo - ++ stdenv.lib.optional useInfinality [ infinality_patch ]; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString useEncumberedCode + "-DFT_CONFIG_OPTION_SUBPIXEL_RENDERING=1"; # The asm for armel is written with the 'asm' keyword. CFLAGS = stdenv.lib.optionalString stdenv.isArm "-std=gnu99"; @@ -54,8 +26,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - doCheck = true; - postInstall = '' ln -s freetype2/freetype $out/include/freetype @@ -68,12 +38,9 @@ stdenv.mkDerivation rec { configureFlags = "--disable-static CC_BUILD=gcc"; }; - passthru = { inherit infinality; }; # for fontconfig - meta = { description = "A font rendering engine"; homepage = http://www.freetype.org/; - license = if useEncumberedCode then "unfree" - else "GPLv2+"; # or the FreeType License (BSD + advertising clause) + license = "GPLv2+"; # or the FreeType License (BSD + advertising clause) }; } diff --git a/pkgs/development/libraries/freetype/enable-validation.patch b/pkgs/development/libraries/freetype/enable-validation.patch deleted file mode 100644 index 44f3bf6e1c9487a321430f62f0455a8353690511..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/freetype/enable-validation.patch +++ /dev/null @@ -1,22 +0,0 @@ -Enables gxvalid and otvalid modules for use with ftvalid. - ---- freetype-2.2.1/modules.cfg.orig 2006-07-07 21:01:09.000000000 -0400 -+++ freetype-2.2.1/modules.cfg 2006-07-07 21:01:54.000000000 -0400 -@@ -110,7 +110,7 @@ - AUX_MODULES += cache - - # TrueType GX/AAT table validation. Needs ftgxval.c below. --# AUX_MODULES += gxvalid -+AUX_MODULES += gxvalid - - # Support for streams compressed with gzip (files with suffix .gz). - # -@@ -124,7 +124,7 @@ - - # OpenType table validation. Needs ftotval.c below. - # --# AUX_MODULES += otvalid -+AUX_MODULES += otvalid - - # Auxiliary PostScript driver component to share common code. - # diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/2.26.x.nix similarity index 77% rename from pkgs/development/libraries/gdk-pixbuf/default.nix rename to pkgs/development/libraries/gdk-pixbuf/2.26.x.nix index c466905e4917c10e3beff6c371ec634e40dc38bc..2876c9b943411b7b8515c20158e1b5a801508352 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/2.26.x.nix @@ -1,12 +1,11 @@ -{ stdenv, fetchurl, pkgconfig, glib, libtiff, libjpeg, libpng, libX11, xz -, jasper }: +{ stdenv, fetchurl, pkgconfig, glib, libtiff, libjpeg, libpng, libX11, xz, jasper }: stdenv.mkDerivation rec { - name = "gdk-pixbuf-2.28.1"; + name = "gdk-pixbuf-2.26.1"; src = fetchurl { - url = "mirror://gnome/sources/gdk-pixbuf/2.28/${name}.tar.xz"; - sha256 = "1fy2a05xhfg7gy4l4aajsbmgj62zxhikdxqh6bicihxmzm1vg85y"; + url = "mirror://gnome/sources/gdk-pixbuf/2.26/${name}.tar.xz"; + sha256 = "a60af12b58d9cc15ba4c680c6730ce5d38e8d664af1d575a379385b94b4ec7ba"; }; # !!! We might want to factor out the gdk-pixbuf-xlib subpackage. diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..2e7a8d33cb016caa8a9ab564674dea65831e72ea --- /dev/null +++ b/pkgs/development/libraries/git2/default.nix @@ -0,0 +1,22 @@ +{stdenv, fetchurl, cmake, zlib, python}: + +stdenv.mkDerivation rec { + version = "0.18.0"; + name = "libgit2-${version}"; + + src = fetchurl { + name = "${name}.tar.gz"; + url = "https://github.com/libgit2/libgit2/tarball/v${version}"; + md5 = "50409ddb0c34713677b33ef617e92c94"; + }; + + nativeBuildInputs = [ cmake python ]; + buildInputs = [ zlib ]; + + meta = { + description = "the Git linkable library"; + homepage = http://libgit2.github.com/; + license = with stdenv.lib.licenses; gpl2; + platforms = with stdenv.lib.platforms; all; + }; +} diff --git a/pkgs/development/libraries/glew/default.nix b/pkgs/development/libraries/glew/default.nix index db36944dcb2411399a5fc3b1b923aabc931a5ccc..77686c9a7de6ed53c0cb17aa4b241668031c0156 100644 --- a/pkgs/development/libraries/glew/default.nix +++ b/pkgs/development/libraries/glew/default.nix @@ -1,23 +1,25 @@ { stdenv, fetchurl, mesa, x11, libXmu, libXi }: stdenv.mkDerivation rec { - name = "glew-1.7.0"; + name = "glew-1.9.0"; src = fetchurl { url = "mirror://sourceforge/glew/${name}.tgz"; - sha256 = "02aw6sc4v1434m7awfcxqb0v987i2ykg3fncnp21i9g1n4zsclqn"; + sha256 = "11xpmsw7m5qn7y8fa2ihhqcislz1bdd83mp99didd5ac84756dlv"; }; buildInputs = [ mesa x11 libXmu libXi ]; - installPhase = " - GLEW_DEST=\$out make install - mkdir -pv \$out/share/doc/glew - cp -r README.txt LICENSE.txt doc \$out/share/doc/glew - "; - - meta = { - description = "Cross-platform open-source C/C++ extension loading library"; + installPhase = '' + GLEW_DEST=$out make install + mkdir -pv $out/share/doc/glew + mkdir -p $out/lib/pkgconfig + cp glew*.pc $out/lib/pkgconfig + cp -r README.txt LICENSE.txt doc $out/share/doc/glew + ''; + + meta = { + description = "An OpenGL extension loading library for C(++)"; homepage = http://glew.sourceforge.net/; license = ["BSD" "GLX" "SGI-B" "GPL2"]; # License description copied from gentoo-1.4.0 }; diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/2.34.x.nix similarity index 64% rename from pkgs/development/libraries/glib/default.nix rename to pkgs/development/libraries/glib/2.34.x.nix index 47d8d9433245f2017b2d4ab022995c98e85a11a0..69ed44aeccaa8aecb894f8fcd8d7e3814cac1b91 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/2.34.x.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, gettext, perl, libiconvOrEmpty, zlib, libffi -, python, pcre, libelf }: +{ stdenv, fetchurl, pkgconfig, gettext, perl, libiconvOrNull, zlib, libffi +, python, pcre }: # TODO: # * Add gio-module-fam @@ -11,29 +11,16 @@ # Reminder: add 'sed -e 's@python2\.[0-9]@python@' -i # $out/bin/gtester-report' to postInstall if this is solved -let - # some packages don't get "Cflags" from pkgconfig correctly - # and then fail to build when directly including like - flattenInclude = '' - for dir in $out/include/*; do - cp -r $dir/* "$out/include/" - rm -r "$dir" - ln -s . "$dir" - done - ln -sr -t "$out/include/" $out/lib/*/include/* 2>/dev/null || true - ''; -in - stdenv.mkDerivation (rec { - name = "glib-2.36.1"; + name = "glib-2.34.0"; src = fetchurl { - url = "mirror://gnome/sources/glib/2.36/${name}.tar.xz"; - sha256 = "090bw5par3dfy5m6dhq393pmy92zpw3d7rgbzqjc14jfg637bqvx"; + url = "mirror://gnome/sources/glib/2.34/${name}.tar.xz"; + sha256 = "f69b112f8848be35139d9099b62bc81649241f78f6a775516f0d4c9b47f65144"; }; # configure script looks for d-bus but it is only needed for tests - buildInputs = [ libelf ] ++ libiconvOrEmpty; + buildInputs = [ libiconvOrNull ]; nativeBuildInputs = [ perl pkgconfig gettext python ]; @@ -41,16 +28,11 @@ stdenv.mkDerivation (rec { configureFlags = "--with-pcre=system --disable-fam"; - postConfigure = "sed '/SANE_MALLOC_PROTOS/s,^,//,' -i config.h"; # https://bugzilla.gnome.org/show_bug.cgi?id=698716 :-) - enableParallelBuilding = true; - postInstall = ''rm -rvf $out/share/gtk-doc''; + passthru.gioModuleDir = "lib/gio/modules"; - passthru = { - gioModuleDir = "lib/gio/modules"; - inherit flattenInclude; - }; + postInstall = ''rm -rvf $out/share/gtk-doc''; meta = { description = "GLib, a C library of programming buildings blocks"; diff --git a/pkgs/development/libraries/gmime/default.nix b/pkgs/development/libraries/gmime/default.nix index 99859b9f34efe49a942e33e9991ebacd24047ddb..02145d08c28953676f97b53ae1d97c1ab3655816 100644 --- a/pkgs/development/libraries/gmime/default.nix +++ b/pkgs/development/libraries/gmime/default.nix @@ -1,15 +1,14 @@ -{ stdenv, fetchurl, pkgconfig, glib, zlib, libgpgerror }: +{ stdenv, fetchurl, pkgconfig, glib, zlib }: stdenv.mkDerivation rec { - name = "gmime-2.6.15"; - + name = "gmime-2.4.24"; + src = fetchurl { - url = "mirror://gnome/sources/gmime/2.6/${name}.tar.xz"; - sha256 = "16n9gmlwn6rphi59hrwy6dpn785s3r13h2kmrn3k61l2kfws1hml"; + url = "mirror://gnome/sources/gmime/2.4/${name}.tar.gz"; + sha256 = "2f538d68e215f075d16575a6da9acb87983db9e2df0d7d403858048881a0dd15"; }; - - nativeBuildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ glib zlib libgpgerror ]; + + buildInputs = [ pkgconfig glib zlib ]; meta = { homepage = http://spruce.sourceforge.net/gmime/; diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index b96d5b25bb1c6f0d3ef98cc3d74e1610e5aa8b59..fe1d519f562556da761061c7584b5b3175a7f38b 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, glib, flex, bison, pkgconfig, libffi, python, gdk_pixbuf }: +{ stdenv, fetchurl, glib, flex, bison, pkgconfig, libffi, python }: stdenv.mkDerivation rec { - name = "gobject-introspection-1.34.2"; + name = "gobject-introspection-1.34.0"; - buildInputs = [ flex bison glib pkgconfig python gdk_pixbuf ]; + buildInputs = [ flex bison glib pkgconfig python ]; propagatedBuildInputs = [ libffi ]; # Tests depend on cairo, which is undesirable (it pulls in lots of @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gobject-introspection/1.34/${name}.tar.xz"; - sha256 = "0a9lq0y67sr3g37l1hy0biqn046jr9wnd05hvwi8j8g2bjilhydw"; + sha256 = "80e211ea95404fc7c5fa3b04ba69ee0b29af70847af315155ab06b8cff832c85"; }; postInstall = "rm -rf $out/share/gtk-doc"; diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.24.x.nix similarity index 81% rename from pkgs/development/libraries/gtk+/2.x.nix rename to pkgs/development/libraries/gtk+/2.24.x.nix index c8224fa18e6d11effb201584d57e84dff1bd429b..c259f700573026d632397d7b238bc8afee7ca24d 100644 --- a/pkgs/development/libraries/gtk+/2.x.nix +++ b/pkgs/development/libraries/gtk+/2.24.x.nix @@ -8,22 +8,22 @@ assert xineramaSupport -> xlibs.libXinerama != null; assert cupsSupport -> cups != null; stdenv.mkDerivation rec { - name = "gtk+-2.24.17"; + name = "gtk+-2.24.14"; src = fetchurl { url = "mirror://gnome/sources/gtk+/2.24/${name}.tar.xz"; - sha256 = "05gl82k82w3gjrzr4vmj3ski7mp1b0jbhc49wgl9hv8mc2sb4iz9"; + sha256 = "8bd1b8b511a3004e8972badf467ce829e6855cdff15540b9344dc934c68008ac"; }; enableParallelBuilding = true; nativeBuildInputs = [ perl pkgconfig ]; - propagatedBuildInputs = with xlibs; - [ glib cairo pango gdk_pixbuf atk - libXrandr libXrender libXcomposite libXi libXcursor + propagatedBuildInputs = + [ xlibs.xlibs glib atk pango gdk_pixbuf cairo + xlibs.libXrandr xlibs.libXrender xlibs.libXcomposite xlibs.libXi ] - ++ stdenv.lib.optional xineramaSupport libXinerama + ++ stdenv.lib.optional xineramaSupport xlibs.libXinerama ++ stdenv.lib.optionals cupsSupport [ cups ]; configureFlags = "--with-xinput=yes"; diff --git a/pkgs/development/libraries/gtk+/3-default.nix b/pkgs/development/libraries/gtk+/3.2.x.nix similarity index 68% rename from pkgs/development/libraries/gtk+/3-default.nix rename to pkgs/development/libraries/gtk+/3.2.x.nix index 1b296e2c398586e4b583de03db53b6fd115e6d1e..cace1b626f49c9646341e79070cc22fc9c302554 100644 --- a/pkgs/development/libraries/gtk+/3-default.nix +++ b/pkgs/development/libraries/gtk+/3.2.x.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig -, expat, glib, cairo, pango, gdk_pixbuf, atk, at_spi2_atk, xlibs +{ stdenv, fetchurl, pkgconfig, glib, atk, pango, cairo, perl, xlibs +, gdk_pixbuf, xz , xineramaSupport ? true , cupsSupport ? true, cups ? null }: @@ -8,20 +8,22 @@ assert xineramaSupport -> xlibs.libXinerama != null; assert cupsSupport -> cups != null; stdenv.mkDerivation rec { - name = "gtk+-3.8.0"; + name = "gtk+-3.2.4"; src = fetchurl { - url = "mirror://gnome/sources/gtk+/3.8/${name}.tar.xz"; - sha256 = "0bi5dip7l6d08c6v9c9aipwsi8hq38xjljqv86nmnpvbkpc4a4yv"; + url = "mirror://gnome/sources/gtk+/3.2/${name}.tar.xz"; + sha256 = "f981bf514858c00d7084bd6f6c34b3c60b8aebdb959e7aca6faa59ed67c136bd"; }; enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig ]; - propagatedBuildInputs = with xlibs; [ - expat glib cairo pango gdk_pixbuf atk at_spi2_atk - libXrandr libXrender libXcomposite libXi libXcursor - ] ++ stdenv.lib.optional xineramaSupport libXinerama + nativeBuildInputs = [ perl pkgconfig ]; + + propagatedBuildInputs = + [ xlibs.xlibs glib atk pango gdk_pixbuf cairo + xlibs.libXrandr xlibs.libXrender xlibs.libXcomposite xlibs.libXi + ] + ++ stdenv.lib.optional xineramaSupport xlibs.libXinerama ++ stdenv.lib.optionals cupsSupport [ cups ]; postInstall = "rm -rf $out/share/gtk-doc"; diff --git a/pkgs/development/libraries/gtkmm/3.x.nix b/pkgs/development/libraries/gtkmm/3.x.nix index 5c4a13fe507c53b6d2df7aa61bbcc666a04b37ea..d3681b4b3867108b1b7d051e5642bc894d84250d 100644 --- a/pkgs/development/libraries/gtkmm/3.x.nix +++ b/pkgs/development/libraries/gtkmm/3.x.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, gtk3, glibmm, cairomm, pangomm, atkmm }: -stdenv.mkDerivation rec { - name = "gtkmm-3.7.12"; # gnome 3.8 release; stable 3.6 has problems with our new glibc +stdenv.mkDerivation { + name = "gtkmm-3.2.0"; src = fetchurl { - url = "mirror://gnome/sources/gtkmm/3.7/${name}.tar.xz"; - sha256 = "05nrilm34gid7kqlq09hcdd7942prn2vbr1qgqvdhgy4x8pvz9p9"; + url = mirror://gnome/sources/gtkmm/3.2/gtkmm-3.2.0.tar.xz; + sha256 = "1wkljr2vjvjg5mggi4rvk9k4j2kzh8lc106k2yp8gqjlhk2xm5b1"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index 8c848218d30f8042b696e10a669991d591316cc3..5755e747a6b54b8a0e3693cf01b012e7e9f31af9 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, freetype }: stdenv.mkDerivation rec { - name = "harfbuzz-0.9.12"; + name = "harfbuzz-0.9.4"; src = fetchurl { url = "http://www.freedesktop.org/software/harfbuzz/release/${name}.tar.bz2"; - sha256 = "19cx5y2m20rp7z5j7mwqfb4ph2g8lrri69zim44x362y4w5gfly6"; + sha256 = "2572f9a810d17a735ef565115463827d075af2371ee5b68e6d77231381f4bddc"; }; buildInputs = [ pkgconfig glib freetype ]; diff --git a/pkgs/development/libraries/haskell/AC-Vector/default.nix b/pkgs/development/libraries/haskell/AC-Vector/default.nix index e4b78876c57aebcf4937d75c8787d61b84fb1202..bbcfd4a0c9219153cd5e2085e7c54e7dcdf6ca0c 100644 --- a/pkgs/development/libraries/haskell/AC-Vector/default.nix +++ b/pkgs/development/libraries/haskell/AC-Vector/default.nix @@ -8,9 +8,6 @@ cabal.mkDerivation (self: { description = "Efficient geometric vectors and transformations"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/Agda/default.nix b/pkgs/development/libraries/haskell/Agda/default.nix index 0c3a87a4059e6c5e78cb7609e9af14ea6a8cc492..ea32e6358987beed04e5fceaeb8c2b7856953ed4 100644 --- a/pkgs/development/libraries/haskell/Agda/default.nix +++ b/pkgs/development/libraries/haskell/Agda/default.nix @@ -21,9 +21,6 @@ cabal.mkDerivation (self: { description = "A dependently typed functional programming language and proof assistant"; license = "unknown"; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/AspectAG/default.nix b/pkgs/development/libraries/haskell/AspectAG/default.nix index 89661b14481bba92f6949e218154f4ffa15d7ae6..6cbd760b4acad136d86943704e38d988ba7ea17b 100644 --- a/pkgs/development/libraries/haskell/AspectAG/default.nix +++ b/pkgs/development/libraries/haskell/AspectAG/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Attribute Grammars in the form of an EDSL"; license = "LGPL"; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/Boolean/default.nix b/pkgs/development/libraries/haskell/Boolean/default.nix index 2a8fc76b53c1381e871cda151fcc6d6ba98d949e..bc8e9dca159c5ef9b50a57f3a82fafd19c34121a 100644 --- a/pkgs/development/libraries/haskell/Boolean/default.nix +++ b/pkgs/development/libraries/haskell/Boolean/default.nix @@ -8,9 +8,6 @@ cabal.mkDerivation (self: { description = "Generalized booleans and numbers"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/Chart/default.nix b/pkgs/development/libraries/haskell/Chart/default.nix index 31789974b6bc9745ed269ab33e9eba13503ecd36..a59e4ca7f422de6257865c0b6f7e7f4e7b61c1fc 100644 --- a/pkgs/development/libraries/haskell/Chart/default.nix +++ b/pkgs/development/libraries/haskell/Chart/default.nix @@ -14,9 +14,6 @@ cabal.mkDerivation (self: { description = "A library for generating 2D Charts and Plots"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/ChasingBottoms/default.nix b/pkgs/development/libraries/haskell/ChasingBottoms/default.nix index d2ed408c401f412a6a2cb16e980a747dbcb3bdf3..719e5eb2cee981aeeae34e15577634e3fa3cd8fc 100644 --- a/pkgs/development/libraries/haskell/ChasingBottoms/default.nix +++ b/pkgs/development/libraries/haskell/ChasingBottoms/default.nix @@ -2,15 +2,14 @@ cabal.mkDerivation (self: { pname = "ChasingBottoms"; - version = "1.3.0.5"; - sha256 = "0g3c52c8gpm0xlnxxdgazz0f7zpnjvdx5vffsv1zr3vcn3kp1xy0"; + version = "1.3.0.6"; + sha256 = "1l40n1ylzrbp0lhm80q9djl8mf39zvmw7zzlg0gzxsqbzwbsggx8"; isLibrary = true; isExecutable = true; buildDepends = [ mtl QuickCheck random syb ]; meta = { description = "For testing partial and infinite values"; - license = "unknown"; + license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/ConfigFile/default.nix b/pkgs/development/libraries/haskell/ConfigFile/default.nix index bdc86cf1385ad7c375a66dc07ed714bab47fca88..29d417562ccbb635c08cd6551c9d6fed9e1c9abd 100644 --- a/pkgs/development/libraries/haskell/ConfigFile/default.nix +++ b/pkgs/development/libraries/haskell/ConfigFile/default.nix @@ -12,9 +12,6 @@ cabal.mkDerivation (self: { description = "Configuration file reading & writing"; license = "LGPL"; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/CouchDB/default.nix b/pkgs/development/libraries/haskell/CouchDB/default.nix index ee584e2ed8fe00e7f9d38a6cb1d9e24b489b3a00..4a413e2e7b8510efaf5e8a2437305af163ff5eb5 100644 --- a/pkgs/development/libraries/haskell/CouchDB/default.nix +++ b/pkgs/development/libraries/haskell/CouchDB/default.nix @@ -11,9 +11,6 @@ cabal.mkDerivation (self: { description = "CouchDB interface"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/Crypto/default.nix b/pkgs/development/libraries/haskell/Crypto/default.nix index feb28002355a05bc0d1a5d59e10ff6e848463bb0..c7d10d0160d8d5d2f246ccbb6e408f7a6660dd6f 100644 --- a/pkgs/development/libraries/haskell/Crypto/default.nix +++ b/pkgs/development/libraries/haskell/Crypto/default.nix @@ -11,9 +11,6 @@ cabal.mkDerivation (self: { description = "Collects together existing Haskell cryptographic functions into a package"; license = "unknown"; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/DAV/default.nix b/pkgs/development/libraries/haskell/DAV/default.nix index a412ee9eeb5cd99af10d093cb715e77ab92998be..c330f082e8901abdfee6bcc9fa000a8212aa4041 100644 --- a/pkgs/development/libraries/haskell/DAV/default.nix +++ b/pkgs/development/libraries/haskell/DAV/default.nix @@ -18,6 +18,5 @@ cabal.mkDerivation (self: { description = "RFC 4918 WebDAV support"; license = self.stdenv.lib.licenses.gpl3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/DSH/default.nix b/pkgs/development/libraries/haskell/DSH/default.nix index 94fdb79fbcb1e95e73853d5e5cfbc9e975b17d9b..409afcd45b0745870c769254461f66e45cb11768 100644 --- a/pkgs/development/libraries/haskell/DSH/default.nix +++ b/pkgs/development/libraries/haskell/DSH/default.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Database Supported Haskell"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/Diff/default.nix b/pkgs/development/libraries/haskell/Diff/default.nix index 134a7fc3f986a39f3b1cf0652361d9a932917f31..04149400ff8c405ee970239b82348de04a4c2390 100644 --- a/pkgs/development/libraries/haskell/Diff/default.nix +++ b/pkgs/development/libraries/haskell/Diff/default.nix @@ -8,9 +8,6 @@ cabal.mkDerivation (self: { description = "O(ND) diff algorithm in haskell"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/FerryCore/default.nix b/pkgs/development/libraries/haskell/FerryCore/default.nix index e7167baab7d7b6793737433d827e39c3f609ce19..daef52bec7522b3dac3fef564f2c18d784c948c0 100644 --- a/pkgs/development/libraries/haskell/FerryCore/default.nix +++ b/pkgs/development/libraries/haskell/FerryCore/default.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Ferry Core Components"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/GLFW/default.nix b/pkgs/development/libraries/haskell/GLFW/default.nix index cb266ac99ce549f8613b83321be3e12c7e70d3a9..f204bcdf655438021c5140e980963451e6e34c2f 100644 --- a/pkgs/development/libraries/haskell/GLFW/default.nix +++ b/pkgs/development/libraries/haskell/GLFW/default.nix @@ -11,9 +11,6 @@ cabal.mkDerivation (self: { description = "A Haskell binding for GLFW"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/GLURaw/default.nix b/pkgs/development/libraries/haskell/GLURaw/1.3.0.0.nix similarity index 81% rename from pkgs/development/libraries/haskell/GLURaw/default.nix rename to pkgs/development/libraries/haskell/GLURaw/1.3.0.0.nix index 91bd5737cf93733f25b46731e64a3b69d54c4f2e..d719e8179d45b8a7bee576829affb84153515beb 100644 --- a/pkgs/development/libraries/haskell/GLURaw/default.nix +++ b/pkgs/development/libraries/haskell/GLURaw/1.3.0.0.nix @@ -11,9 +11,6 @@ cabal.mkDerivation (self: { description = "A raw binding for the OpenGL graphics system"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix b/pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix index 302b1fb8fb9e45603cd892a1993ff76fa787c6c0..32e45aebeb27a78ed0ca9e1e07d9e56d56df274e 100644 --- a/pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix +++ b/pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix @@ -11,9 +11,6 @@ cabal.mkDerivation (self: { description = "A binding for the OpenGL Utility Toolkit"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix b/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix index 13f513551c4f179caf9211f3e321de6f64188b33..64bc7feaf17681baec9466825de799c55a2d1978 100644 --- a/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix +++ b/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix @@ -12,9 +12,6 @@ cabal.mkDerivation (self: { description = "A binding for the OpenGL Utility Toolkit"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/GLUT/2.1.2.2.nix b/pkgs/development/libraries/haskell/GLUT/2.1.2.2.nix index 955fd51b702b0f4d33801ffcfde50e423aada7a7..2b9a0fadfc92f218576dc18d25eeaf1e396f9a84 100644 --- a/pkgs/development/libraries/haskell/GLUT/2.1.2.2.nix +++ b/pkgs/development/libraries/haskell/GLUT/2.1.2.2.nix @@ -12,9 +12,6 @@ cabal.mkDerivation (self: { description = "A binding for the OpenGL Utility Toolkit"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/GLUT/2.2.2.1.nix b/pkgs/development/libraries/haskell/GLUT/2.2.2.1.nix index 3248631be3e241e1a3198070c2102fb9fd306a33..e5ff3951d3c39109adfc0065d55f6f720057dce4 100644 --- a/pkgs/development/libraries/haskell/GLUT/2.2.2.1.nix +++ b/pkgs/development/libraries/haskell/GLUT/2.2.2.1.nix @@ -13,9 +13,6 @@ cabal.mkDerivation (self: { description = "A binding for the OpenGL Utility Toolkit"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/GLUT/2.3.1.0.nix b/pkgs/development/libraries/haskell/GLUT/2.3.1.0.nix index 4e80684cbae9997b422877fd112f5c9979c37b85..d65dfa15c6f357475b5b64ab7be9232d3564076b 100644 --- a/pkgs/development/libraries/haskell/GLUT/2.3.1.0.nix +++ b/pkgs/development/libraries/haskell/GLUT/2.3.1.0.nix @@ -13,9 +13,6 @@ cabal.mkDerivation (self: { description = "A binding for the OpenGL Utility Toolkit"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/GLUT/2.4.0.0.nix b/pkgs/development/libraries/haskell/GLUT/2.4.0.0.nix index 710f2b2ab84472a645baf1a99e07b73ef7e0b134..a7a7e7f371adfde3b7103e19e30e22c9c7de2113 100644 --- a/pkgs/development/libraries/haskell/GLUT/2.4.0.0.nix +++ b/pkgs/development/libraries/haskell/GLUT/2.4.0.0.nix @@ -13,9 +13,6 @@ cabal.mkDerivation (self: { description = "A binding for the OpenGL Utility Toolkit"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/Glob/default.nix b/pkgs/development/libraries/haskell/Glob/default.nix index 922b18d9f83af53888a812f6bdcbb3a98062a9f3..08ae4617956971300bc5c3ef29affbd8e92834e4 100644 --- a/pkgs/development/libraries/haskell/Glob/default.nix +++ b/pkgs/development/libraries/haskell/Glob/default.nix @@ -10,6 +10,5 @@ cabal.mkDerivation (self: { description = "Globbing library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/GlomeVec/default.nix b/pkgs/development/libraries/haskell/GlomeVec/default.nix index 421e64ee7a24478f3c6ad437f73689fc29c7af7c..d22273f2030bd44a8f493574f4ca51956a19a6aa 100644 --- a/pkgs/development/libraries/haskell/GlomeVec/default.nix +++ b/pkgs/development/libraries/haskell/GlomeVec/default.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Simple 3D vector library"; license = "GPL"; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/Graphalyze/default.nix b/pkgs/development/libraries/haskell/Graphalyze/default.nix index 88563876132e57246fa9d6af4e60e3c311839f52..d61abc7a245d8d13ceecfd87a3779f31d4db3ce8 100644 --- a/pkgs/development/libraries/haskell/Graphalyze/default.nix +++ b/pkgs/development/libraries/haskell/Graphalyze/default.nix @@ -13,9 +13,6 @@ cabal.mkDerivation (self: { description = "Graph-Theoretic Analysis library"; license = "unknown"; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix b/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix index 40091d3e7ba48b4f4677e2015f92b45ec6ac8f71..50994384c9668d10f48c3d86a8336e06569e9bdb 100644 --- a/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix +++ b/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix @@ -13,9 +13,6 @@ cabal.mkDerivation (self: { description = "ODBC driver for HDBC"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/HDBC/HDBC-postgresql.nix b/pkgs/development/libraries/haskell/HDBC/HDBC-postgresql.nix index a78d46541f74f3ceaf6bf64bdf8def62d2060c7a..b66ed3ce28f611d1af5d553f8363d9f3fb8c3fa1 100644 --- a/pkgs/development/libraries/haskell/HDBC/HDBC-postgresql.nix +++ b/pkgs/development/libraries/haskell/HDBC/HDBC-postgresql.nix @@ -15,9 +15,6 @@ cabal.mkDerivation (self: { description = "PostgreSQL driver for HDBC"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/HDBC/HDBC-sqlite3.nix b/pkgs/development/libraries/haskell/HDBC/HDBC-sqlite3.nix index aa983026c91590b4dfc7fe224ba02c9022ebc32b..783c4c186e2c200f553052455ae0c1c2820f7d48 100644 --- a/pkgs/development/libraries/haskell/HDBC/HDBC-sqlite3.nix +++ b/pkgs/development/libraries/haskell/HDBC/HDBC-sqlite3.nix @@ -13,9 +13,6 @@ cabal.mkDerivation (self: { description = "Sqlite v3 driver for HDBC"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/HDBC/HDBC.nix b/pkgs/development/libraries/haskell/HDBC/HDBC.nix index c39c68d9f76b127b39d9d4589b3d1eac7359c397..a8275c31b8582ae2110ac1e46a93cd720157cf59 100644 --- a/pkgs/development/libraries/haskell/HDBC/HDBC.nix +++ b/pkgs/development/libraries/haskell/HDBC/HDBC.nix @@ -12,9 +12,6 @@ cabal.mkDerivation (self: { description = "Haskell Database Connectivity"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/HList/default.nix b/pkgs/development/libraries/haskell/HList/default.nix index 657e4899b7b2c8797a192d1ff917dd7e283b3c2f..35b03f77dde64d9d56e61d51992899b61758aa5a 100644 --- a/pkgs/development/libraries/haskell/HList/default.nix +++ b/pkgs/development/libraries/haskell/HList/default.nix @@ -8,9 +8,6 @@ cabal.mkDerivation (self: { description = "Heterogeneous lists"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/HStringTemplate/default.nix b/pkgs/development/libraries/haskell/HStringTemplate/default.nix index ee150c3e946dc7a1f2e27786e22343335528da38..6f96bbbcb7f4b8c16b5a2f51550fddf69b0eb550 100644 --- a/pkgs/development/libraries/haskell/HStringTemplate/default.nix +++ b/pkgs/development/libraries/haskell/HStringTemplate/default.nix @@ -14,9 +14,6 @@ cabal.mkDerivation (self: { description = "StringTemplate implementation in Haskell"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/HTTP/4000.0.6.nix b/pkgs/development/libraries/haskell/HTTP/4000.0.6.nix index 69e84d88f88174957fd20ce0b10a5d6ecba3b8f1..ac4ac232edf8e6f2484ec6e7a539e725ba019ef8 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.0.6.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.0.6.nix @@ -11,9 +11,6 @@ cabal.mkDerivation (self: { description = "A library for client-side HTTP"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/HTTP/4000.0.9.nix b/pkgs/development/libraries/haskell/HTTP/4000.0.9.nix index 1f17f7488855e74a08b5a4ce16aee4ba24f6a3c6..0beebbfe2944f30269aa6e4d9f9f8efaa9d28778 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.0.9.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.0.9.nix @@ -11,9 +11,6 @@ cabal.mkDerivation (self: { description = "A library for client-side HTTP"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/HTTP/4000.1.1.nix b/pkgs/development/libraries/haskell/HTTP/4000.1.1.nix index 405e7672bfb3df9b2222007f9390ecea19155773..31cfdddac79ea628608b68c2fb6b4328538763fb 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.1.1.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.1.1.nix @@ -11,9 +11,6 @@ cabal.mkDerivation (self: { description = "A library for client-side HTTP"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/HTTP/4000.1.2.nix b/pkgs/development/libraries/haskell/HTTP/4000.1.2.nix index 1a54d1ed8bb52f7b1675998bffefcdb086820f82..8d4a39526b2adb9f4f573d0bc30b1a7328888b45 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.1.2.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.1.2.nix @@ -11,9 +11,6 @@ cabal.mkDerivation (self: { description = "A library for client-side HTTP"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.1.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.1.nix index 11af0863cf173a08162b1970299362fa0fa8c9e7..f3da4a5ccf22547ca8d37de3defb25983c056f6b 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.2.1.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.2.1.nix @@ -16,9 +16,6 @@ cabal.mkDerivation (self: { description = "A library for client-side HTTP"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.2.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.2.nix index b21d853b7146f2e314307e6cef2d514c559e2c40..e6238a5e738ffe697fd84b24e861548b6e564246 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.2.2.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.2.2.nix @@ -16,9 +16,6 @@ cabal.mkDerivation (self: { description = "A library for client-side HTTP"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.3.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.3.nix index 78ba7772b1ec2a571c5d8dd9093e833776ae32bd..d9e422f9e895d517867c25b6ecbab9f771d2658a 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.2.3.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.2.3.nix @@ -16,9 +16,6 @@ cabal.mkDerivation (self: { description = "A library for client-side HTTP"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.5.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.5.nix index ca17c1869ab8e95e61e2d29e004e3ce802bb7fe9..93ba5e949db802e8390dcd1dc4f2a87dc3c44055 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.2.5.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.2.5.nix @@ -18,9 +18,6 @@ cabal.mkDerivation (self: { description = "A library for client-side HTTP"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.8.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.8.nix index 3ad33fe86c13e018bb5d2dca11d6eb5636171736..1b52261dea0899f2cc3f41106522b69e01847bb7 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.2.8.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.2.8.nix @@ -18,9 +18,6 @@ cabal.mkDerivation (self: { description = "A library for client-side HTTP"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.0.3.nix b/pkgs/development/libraries/haskell/HUnit/1.2.0.3.nix index ebf561825ce0b0be9d538c0613ef5e6d503747f3..01130de10cd96f685c1590bed0d140dbdda0255b 100644 --- a/pkgs/development/libraries/haskell/HUnit/1.2.0.3.nix +++ b/pkgs/development/libraries/haskell/HUnit/1.2.0.3.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "A unit testing framework for Haskell"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix b/pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix index ec65d160e866ffb1879ad8e59adaf8e8366235c0..e14aad1a015c3c5df85a92451c60b3600c0a8309 100644 --- a/pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix +++ b/pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix @@ -11,9 +11,6 @@ cabal.mkDerivation (self: { description = "A unit testing framework for Haskell"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.2.3.nix b/pkgs/development/libraries/haskell/HUnit/1.2.2.3.nix index 9c58da37b503786db8cd3339d19239f0626d77d7..2cb9f859f462dd2e57f0e256fb85b06edd8bd9e5 100644 --- a/pkgs/development/libraries/haskell/HUnit/1.2.2.3.nix +++ b/pkgs/development/libraries/haskell/HUnit/1.2.2.3.nix @@ -11,9 +11,6 @@ cabal.mkDerivation (self: { description = "A unit testing framework for Haskell"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.4.2.nix b/pkgs/development/libraries/haskell/HUnit/1.2.4.2.nix index e0dd6bd2bc17805fbec49606c1c9c5f3fbcfe462..8ad518ee1f6d1a0f1f72b13d0d47b57175aa8e14 100644 --- a/pkgs/development/libraries/haskell/HUnit/1.2.4.2.nix +++ b/pkgs/development/libraries/haskell/HUnit/1.2.4.2.nix @@ -11,9 +11,6 @@ cabal.mkDerivation (self: { description = "A unit testing framework for Haskell"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.4.3.nix b/pkgs/development/libraries/haskell/HUnit/1.2.4.3.nix index 2682c0ab4202f9bd23101888b47a546cbfb0375b..9ac01e70865dcec8315f70943fbd682ffdc6e593 100644 --- a/pkgs/development/libraries/haskell/HUnit/1.2.4.3.nix +++ b/pkgs/development/libraries/haskell/HUnit/1.2.4.3.nix @@ -12,9 +12,6 @@ cabal.mkDerivation (self: { description = "A unit testing framework for Haskell"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.5.1.nix b/pkgs/development/libraries/haskell/HUnit/1.2.5.1.nix index e98d2a78518094e921c688b8249aefd5cd1d1f09..06ac5fa1bbf6582fac5df09e5702d25d1ca9eb19 100644 --- a/pkgs/development/libraries/haskell/HUnit/1.2.5.1.nix +++ b/pkgs/development/libraries/haskell/HUnit/1.2.5.1.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "A unit testing framework for Haskell"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.5.2.nix b/pkgs/development/libraries/haskell/HUnit/1.2.5.2.nix index cbebb60b17480425b8268ee1467a96fcd33fdd71..b94e0f20733b8ccf92e39b88fca3b463a93e5daa 100644 --- a/pkgs/development/libraries/haskell/HUnit/1.2.5.2.nix +++ b/pkgs/development/libraries/haskell/HUnit/1.2.5.2.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "A unit testing framework for Haskell"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/HaXml/default.nix b/pkgs/development/libraries/haskell/HaXml/default.nix index d598c09148f8381959f441a3789051a7eb1fd1e0..b490cf75d96cc67643a86ddf95f55e791c47391b 100644 --- a/pkgs/development/libraries/haskell/HaXml/default.nix +++ b/pkgs/development/libraries/haskell/HaXml/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "HaXml"; - version = "1.23.3"; - sha256 = "1gp3vjv8g0i9bd0sryfjarzp7n8ddfbrib68jzhqgjkqbyj2bs8g"; + version = "1.24"; + sha256 = "18kvavqa84k2121ppxngn39fjz4w63chngb3255w1fhdz13v3ydn"; isLibrary = true; isExecutable = true; buildDepends = [ filepath polyparse random ]; @@ -12,9 +12,6 @@ cabal.mkDerivation (self: { description = "Utilities for manipulating XML documents"; license = "LGPL"; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/HaskellForMaths/default.nix b/pkgs/development/libraries/haskell/HaskellForMaths/default.nix index 0e344a86545093170677db10e5c47bea81cba8e5..417ded6da54f586b34c5db6c935373a7c7d5da0e 100644 --- a/pkgs/development/libraries/haskell/HaskellForMaths/default.nix +++ b/pkgs/development/libraries/haskell/HaskellForMaths/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Combinatorics, group theory, commutative algebra, non-commutative algebra"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/Hipmunk/default.nix b/pkgs/development/libraries/haskell/Hipmunk/default.nix index 1f917fafc3c54c7f8e39872c7f14b8ea7ea2b116..fee7144914293cfd60673b080b3535893d82fb74 100644 --- a/pkgs/development/libraries/haskell/Hipmunk/default.nix +++ b/pkgs/development/libraries/haskell/Hipmunk/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "A Haskell binding for Chipmunk"; license = "unknown"; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/HsOpenSSL/default.nix b/pkgs/development/libraries/haskell/HsOpenSSL/default.nix index 2adf5701eb04b2cd725fbbdd362cfbc26cc649ea..9eefaaef84a0075f65bb9c3311ee041bf4b5e210 100644 --- a/pkgs/development/libraries/haskell/HsOpenSSL/default.nix +++ b/pkgs/development/libraries/haskell/HsOpenSSL/default.nix @@ -11,9 +11,6 @@ cabal.mkDerivation (self: { description = "(Incomplete) OpenSSL binding for Haskell"; license = self.stdenv.lib.licenses.publicDomain; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/HsSyck/default.nix b/pkgs/development/libraries/haskell/HsSyck/default.nix index f27d1f97f374d56ffecf16ae5a68c537ee5fdd40..56e999d7b83eb75ca4baf69150d1cb521468419c 100644 --- a/pkgs/development/libraries/haskell/HsSyck/default.nix +++ b/pkgs/development/libraries/haskell/HsSyck/default.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Fast, lightweight YAML loader and dumper"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/IORefCAS/default.nix b/pkgs/development/libraries/haskell/IORefCAS/default.nix index 7e7c23c0a85484fc8e89d9cc2dd1f6144e54aeda..8025ef13bc283c375eb03bd76aac9b60e25f9542 100644 --- a/pkgs/development/libraries/haskell/IORefCAS/default.nix +++ b/pkgs/development/libraries/haskell/IORefCAS/default.nix @@ -1,18 +1,16 @@ -{ cabal, bitsAtomic, HUnit, QuickCheck }: +{ cabal, bitsAtomic, HUnit, QuickCheck, time }: cabal.mkDerivation (self: { pname = "IORefCAS"; - version = "0.2"; - sha256 = "18hyy3jqr9yky5r873816fqnywrwba90sq6zx61i2vkqlfbll1k9"; + version = "0.2.0.1"; + sha256 = "06vfck59x30mqa9h2ljd4r2cx1ks91b9gwcr928brp7filsq9fdb"; buildDepends = [ bitsAtomic ]; - testDepends = [ bitsAtomic HUnit QuickCheck ]; + testDepends = [ bitsAtomic HUnit QuickCheck time ]; meta = { + homepage = "https://github.com/rrnewton/haskell-lockfree-queue/wiki"; description = "Atomic compare and swap for IORefs and STRefs"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/IOSpec/default.nix b/pkgs/development/libraries/haskell/IOSpec/default.nix index b01de9175c021634540f15b8b2b27a131c4d9412..84b5f6fe6107e3ba9318a97f36575e9efdf51d63 100644 --- a/pkgs/development/libraries/haskell/IOSpec/default.nix +++ b/pkgs/development/libraries/haskell/IOSpec/default.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "A pure specification of the IO monad"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/IfElse/default.nix b/pkgs/development/libraries/haskell/IfElse/default.nix index 632de1f30e5b5ff107f062ee763f7a36e7331ab0..960868e3ab0a5b9b69e42da4d2a1a1563c81cb9d 100644 --- a/pkgs/development/libraries/haskell/IfElse/default.nix +++ b/pkgs/development/libraries/haskell/IfElse/default.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Anaphoric and miscellaneous useful control-flow"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/JsContracts/default.nix b/pkgs/development/libraries/haskell/JsContracts/default.nix index 95a7ab52fd3a1f764782a4c4f17383efec367988..713e67fbf608cd30ae998560f3904246b9e42d4b 100644 --- a/pkgs/development/libraries/haskell/JsContracts/default.nix +++ b/pkgs/development/libraries/haskell/JsContracts/default.nix @@ -12,9 +12,6 @@ cabal.mkDerivation (self: { description = "Design-by-contract for JavaScript"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/JuicyPixels/default.nix b/pkgs/development/libraries/haskell/JuicyPixels/default.nix index 7e377ebc66cde93d0908a6e4c1510faec2ff0753..c289c00925679c827740dab3113bc8c69c3aad02 100644 --- a/pkgs/development/libraries/haskell/JuicyPixels/default.nix +++ b/pkgs/development/libraries/haskell/JuicyPixels/default.nix @@ -14,9 +14,6 @@ cabal.mkDerivation (self: { description = "Picture loading/serialization (in png, jpeg, bitmap, radiance and gif)"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/List/default.nix b/pkgs/development/libraries/haskell/List/default.nix index ca221a5a9de8f23b62f8238df2a92492c50f1452..65c90c0824ea1c216c43677ea8039f4de40cbadb 100644 --- a/pkgs/development/libraries/haskell/List/default.nix +++ b/pkgs/development/libraries/haskell/List/default.nix @@ -10,6 +10,5 @@ cabal.mkDerivation (self: { description = "List monad transformer and class"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/ListLike/default.nix b/pkgs/development/libraries/haskell/ListLike/default.nix index 68d7f25e431b850ae5636f5ab605f40f0a76b3eb..2fa427b1f57e79b780dab416584f4c5b3bf70aff 100644 --- a/pkgs/development/libraries/haskell/ListLike/default.nix +++ b/pkgs/development/libraries/haskell/ListLike/default.nix @@ -11,9 +11,6 @@ cabal.mkDerivation (self: { description = "Generic support for list-like structures"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/ListZipper/default.nix b/pkgs/development/libraries/haskell/ListZipper/default.nix index f2c56fdd2ce46cc88cc766d30dd42e211a000ea3..d7307bde5d71a3ddc2b492941bbb519dca83b0a3 100644 --- a/pkgs/development/libraries/haskell/ListZipper/default.nix +++ b/pkgs/development/libraries/haskell/ListZipper/default.nix @@ -9,6 +9,5 @@ cabal.mkDerivation (self: { description = "Simple zipper for lists"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/MaybeT/default.nix b/pkgs/development/libraries/haskell/MaybeT/default.nix index 348560508622bec243c2fa28d4a83e099be75413..a29997f9de95ee76f3935d6395c963f88716bbce 100644 --- a/pkgs/development/libraries/haskell/MaybeT/default.nix +++ b/pkgs/development/libraries/haskell/MaybeT/default.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "MaybeT monad transformer"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/MemoTrie/default.nix b/pkgs/development/libraries/haskell/MemoTrie/default.nix index 195af40d1f0370e5fd2f2a779b7a6d9978730017..f3bd183d13734218f4324da9b87cd5ec00952728 100644 --- a/pkgs/development/libraries/haskell/MemoTrie/default.nix +++ b/pkgs/development/libraries/haskell/MemoTrie/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Trie-based memo functions"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/MissingH/default.nix b/pkgs/development/libraries/haskell/MissingH/default.nix index c2b6b067b2f145b462ecc68c9e471150d9ebbc35..659a1158d0f3c7289f5bec2137371241d852a9d1 100644 --- a/pkgs/development/libraries/haskell/MissingH/default.nix +++ b/pkgs/development/libraries/haskell/MissingH/default.nix @@ -16,9 +16,6 @@ cabal.mkDerivation (self: { description = "Large utility library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/MonadCatchIO-mtl/default.nix b/pkgs/development/libraries/haskell/MonadCatchIO-mtl/default.nix index b9be1488e4e398b65d40884bd2d26f729934c8ab..9b044f6dbab5d06fee048116f6da42bbdcca593c 100644 --- a/pkgs/development/libraries/haskell/MonadCatchIO-mtl/default.nix +++ b/pkgs/development/libraries/haskell/MonadCatchIO-mtl/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Monad-transformer version of the Control.Exception module"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix b/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix index e675ae6b6a1c6bfff55f5623f6c41e8bef55651d..4edd801d08d86e75dd6a3ad6e3278aff1cbb7946 100644 --- a/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix +++ b/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Monad-transformer compatible version of the Control.Exception module"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/MonadPrompt/default.nix b/pkgs/development/libraries/haskell/MonadPrompt/default.nix index daf961f15506515894d036f91949d69b0b0b2cb4..6d8e66952e40d82c985042c0c77041569cca2fba 100644 --- a/pkgs/development/libraries/haskell/MonadPrompt/default.nix +++ b/pkgs/development/libraries/haskell/MonadPrompt/default.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "MonadPrompt, implementation & examples"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/MonadRandom/default.nix b/pkgs/development/libraries/haskell/MonadRandom/default.nix index 70430f9f3c75bcde2f3e5725ab4bd977c5f89865..738b69f28325ee672f7da4c6af289e8a36c953da 100644 --- a/pkgs/development/libraries/haskell/MonadRandom/default.nix +++ b/pkgs/development/libraries/haskell/MonadRandom/default.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Random-number generation monad"; license = "unknown"; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/NanoProlog/default.nix b/pkgs/development/libraries/haskell/NanoProlog/default.nix index 4bf301bd66d0dc5c0e78a046c332ec809cd1681a..490aeb4167b5a68a575b2bbfd7938ac1562db0a0 100644 --- a/pkgs/development/libraries/haskell/NanoProlog/default.nix +++ b/pkgs/development/libraries/haskell/NanoProlog/default.nix @@ -11,9 +11,6 @@ cabal.mkDerivation (self: { description = "Very small interpreter for a Prolog-like language"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/NumInstances/default.nix b/pkgs/development/libraries/haskell/NumInstances/default.nix index 1e55feeb9897fdd43d5200489d708d26c8eec363..d276697a6d9516c54ef5af225b1d704b57b4daf6 100644 --- a/pkgs/development/libraries/haskell/NumInstances/default.nix +++ b/pkgs/development/libraries/haskell/NumInstances/default.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Instances of numeric classes for functions and tuples"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/ObjectName/default.nix b/pkgs/development/libraries/haskell/ObjectName/default.nix index 0be7c3dd22c91ee937527de418a495afdc6ac53e..27f9b444a7113c18b4646ee90fddf1a3b19be70e 100644 --- a/pkgs/development/libraries/haskell/ObjectName/default.nix +++ b/pkgs/development/libraries/haskell/ObjectName/default.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Explicitly handled object names"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/OneTuple/default.nix b/pkgs/development/libraries/haskell/OneTuple/default.nix index 2ecc841a8a479dbd334778ec819c1e4ce6ed034e..945e12438b58e4c7a97b34d700dc3dd355df62eb 100644 --- a/pkgs/development/libraries/haskell/OneTuple/default.nix +++ b/pkgs/development/libraries/haskell/OneTuple/default.nix @@ -8,9 +8,6 @@ cabal.mkDerivation (self: { description = "Singleton Tuple"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/OpenAL/default.nix b/pkgs/development/libraries/haskell/OpenAL/default.nix index 534fa1c8667dde41a96f2fd46898c7a6202fb266..a04aea993fa2c7433652bc3520ba9a3aa8720819 100644 --- a/pkgs/development/libraries/haskell/OpenAL/default.nix +++ b/pkgs/development/libraries/haskell/OpenAL/default.nix @@ -11,9 +11,6 @@ cabal.mkDerivation (self: { description = "A binding to the OpenAL cross-platform 3D audio API"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/OpenGL/2.2.1.1.nix b/pkgs/development/libraries/haskell/OpenGL/2.2.1.1.nix index e74fcdca02456c3dadacca9b7e4993f3ef3f07f5..2e4ac90c79e11088dfe18f1a6024c6307a8d1451 100644 --- a/pkgs/development/libraries/haskell/OpenGL/2.2.1.1.nix +++ b/pkgs/development/libraries/haskell/OpenGL/2.2.1.1.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "A binding for the OpenGL graphics system"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix b/pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix index 65e3da59367aa886a7555075c34d12aec1b400ee..25133657ccb4880d8657a1c56cb3b460be478a80 100644 --- a/pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix +++ b/pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "A binding for the OpenGL graphics system"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/OpenGL/2.2.3.1.nix b/pkgs/development/libraries/haskell/OpenGL/2.2.3.1.nix index cf1bee122afcb510dcdee5a6366e6d2a9f191abc..33e9c4d21a0a83d26be10d24d92f0de9630236b8 100644 --- a/pkgs/development/libraries/haskell/OpenGL/2.2.3.1.nix +++ b/pkgs/development/libraries/haskell/OpenGL/2.2.3.1.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "A binding for the OpenGL graphics system"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/OpenGL/2.4.0.2.nix b/pkgs/development/libraries/haskell/OpenGL/2.4.0.2.nix index 73b5c741bbb29ad1b769a4cca57adc42faa41335..c8cfd796afd0055987e33b11237f5f8b08d06681 100644 --- a/pkgs/development/libraries/haskell/OpenGL/2.4.0.2.nix +++ b/pkgs/development/libraries/haskell/OpenGL/2.4.0.2.nix @@ -13,9 +13,6 @@ cabal.mkDerivation (self: { description = "A binding for the OpenGL graphics system"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/OpenGL/2.6.0.1.nix b/pkgs/development/libraries/haskell/OpenGL/2.6.0.1.nix index 1e56e88de384aae8248832ce5e10076422f11659..318bdf197486b44373f4704285c8c3368eb97687 100644 --- a/pkgs/development/libraries/haskell/OpenGL/2.6.0.1.nix +++ b/pkgs/development/libraries/haskell/OpenGL/2.6.0.1.nix @@ -13,9 +13,6 @@ cabal.mkDerivation (self: { description = "A binding for the OpenGL graphics system"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/OpenGL/2.8.0.0.nix b/pkgs/development/libraries/haskell/OpenGL/2.8.0.0.nix index 7714f08e698f94eb587ed2b2b297738d0c902830..72183c86192cc9fb31983966d63484af1a04a08b 100644 --- a/pkgs/development/libraries/haskell/OpenGL/2.8.0.0.nix +++ b/pkgs/development/libraries/haskell/OpenGL/2.8.0.0.nix @@ -11,9 +11,6 @@ cabal.mkDerivation (self: { description = "A binding for the OpenGL graphics system"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/OpenGLRaw/default.nix b/pkgs/development/libraries/haskell/OpenGLRaw/1.3.0.0.nix similarity index 79% rename from pkgs/development/libraries/haskell/OpenGLRaw/default.nix rename to pkgs/development/libraries/haskell/OpenGLRaw/1.3.0.0.nix index c0d62685e49fa1ecdac8b42d75051adf44b9f4af..a6a45bf5b248c5ad172954d979c358f71d64aa16 100644 --- a/pkgs/development/libraries/haskell/OpenGLRaw/default.nix +++ b/pkgs/development/libraries/haskell/OpenGLRaw/1.3.0.0.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "A raw binding for the OpenGL graphics system"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/PSQueue/default.nix b/pkgs/development/libraries/haskell/PSQueue/default.nix index ff3bd0b8fb5f682a451a68e2f5973aa7176b5d01..32497935cdbe767c94b5fc78ab18821a5e198e6f 100644 --- a/pkgs/development/libraries/haskell/PSQueue/default.nix +++ b/pkgs/development/libraries/haskell/PSQueue/default.nix @@ -8,9 +8,6 @@ cabal.mkDerivation (self: { description = "Priority Search Queue"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/Pathfinder/default.nix b/pkgs/development/libraries/haskell/Pathfinder/default.nix index 90df60cc8e6e2874ad31f0e8eec3b6646a3ff9af..19d7d8abaa5474e250cfbe95aa2e5cf234adf4d5 100644 --- a/pkgs/development/libraries/haskell/Pathfinder/default.nix +++ b/pkgs/development/libraries/haskell/Pathfinder/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Relational optimiser and code generator"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/QuickCheck/1.2.0.0.nix b/pkgs/development/libraries/haskell/QuickCheck/1.2.0.0.nix index a459fd9531756edb019eeb4c85707315d0327bf0..3cf80d93336e9d9a82d8194a491c1a8d63292f0c 100644 --- a/pkgs/development/libraries/haskell/QuickCheck/1.2.0.0.nix +++ b/pkgs/development/libraries/haskell/QuickCheck/1.2.0.0.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Automatic testing of Haskell programs"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/QuickCheck/1.2.0.1.nix b/pkgs/development/libraries/haskell/QuickCheck/1.2.0.1.nix index c104a4be27a8070f36a8ecaed62b20407fac0c24..6ba32ce71c0ba925e149115883d4382ac86f41ca 100644 --- a/pkgs/development/libraries/haskell/QuickCheck/1.2.0.1.nix +++ b/pkgs/development/libraries/haskell/QuickCheck/1.2.0.1.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Automatic testing of Haskell programs"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.1.1.1.nix b/pkgs/development/libraries/haskell/QuickCheck/2.1.1.1.nix index 828255a9860c2a82711b71e79cc395c2ae04dc49..2f305b8a23ceb7de6b397ed022bb2ad0afbbeaad 100644 --- a/pkgs/development/libraries/haskell/QuickCheck/2.1.1.1.nix +++ b/pkgs/development/libraries/haskell/QuickCheck/2.1.1.1.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Automatic testing of Haskell programs"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.4.0.1.nix b/pkgs/development/libraries/haskell/QuickCheck/2.4.0.1.nix index ac9ac3d2a7de1091b377ec0de3dd248567098a11..4e634078a7d8b874c88487e8128644b9d68426b1 100644 --- a/pkgs/development/libraries/haskell/QuickCheck/2.4.0.1.nix +++ b/pkgs/development/libraries/haskell/QuickCheck/2.4.0.1.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Automatic testing of Haskell programs"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.4.1.1.nix b/pkgs/development/libraries/haskell/QuickCheck/2.4.1.1.nix index 8eb413d2b31c1b6a22acd8cc9ca2c06f0514eca4..e2d274dca05cbd1f3b9e7d62ed934b7f40bd4d7b 100644 --- a/pkgs/development/libraries/haskell/QuickCheck/2.4.1.1.nix +++ b/pkgs/development/libraries/haskell/QuickCheck/2.4.1.1.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Automatic testing of Haskell programs"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.4.2.nix b/pkgs/development/libraries/haskell/QuickCheck/2.4.2.nix index 69a1c1dc417a4bff287535dbe400211b8662a191..b3202cdc4b93a031be28a014e49c846c4b691832 100644 --- a/pkgs/development/libraries/haskell/QuickCheck/2.4.2.nix +++ b/pkgs/development/libraries/haskell/QuickCheck/2.4.2.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Automatic testing of Haskell programs"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.5.1.1.nix b/pkgs/development/libraries/haskell/QuickCheck/2.5.1.1.nix index 98548b9386385103772d3a63f9a0b70bd4cbde3a..24e16a4955f5d9fd7102d3723e441aed69163fed 100644 --- a/pkgs/development/libraries/haskell/QuickCheck/2.5.1.1.nix +++ b/pkgs/development/libraries/haskell/QuickCheck/2.5.1.1.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Automatic testing of Haskell programs"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.6.nix b/pkgs/development/libraries/haskell/QuickCheck/2.6.nix index 8a94139890880c7d71cfd58dcf6adb5d71ee7d75..39c97859e6573760c26f4d9e1654dec90309f145 100644 --- a/pkgs/development/libraries/haskell/QuickCheck/2.6.nix +++ b/pkgs/development/libraries/haskell/QuickCheck/2.6.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Automatic testing of Haskell programs"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/RSA/default.nix b/pkgs/development/libraries/haskell/RSA/default.nix index cdaa5b5136b334d41d0cfaad22b24dbc6b5e65bd..c5257c5b26204dc9ecd939ed886dd9e9317a5dc0 100644 --- a/pkgs/development/libraries/haskell/RSA/default.nix +++ b/pkgs/development/libraries/haskell/RSA/default.nix @@ -15,9 +15,6 @@ cabal.mkDerivation (self: { description = "Implementation of RSA, using the padding schemes of PKCS#1 v2.1."; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/Ranged-sets/default.nix b/pkgs/development/libraries/haskell/Ranged-sets/default.nix index 6a6211b6263afad168ee6c50412273a6ac7ab0a2..e65752e35b4c319c9c215f7d79cbd9b6d97a350e 100644 --- a/pkgs/development/libraries/haskell/Ranged-sets/default.nix +++ b/pkgs/development/libraries/haskell/Ranged-sets/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Ranged sets for Haskell"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/ReadArgs/default.nix b/pkgs/development/libraries/haskell/ReadArgs/default.nix index 1adec3b3d6d9d54dedb78857f305869661b3d16b..12c3e34571e860045b7500c22dd35080b9a93c81 100644 --- a/pkgs/development/libraries/haskell/ReadArgs/default.nix +++ b/pkgs/development/libraries/haskell/ReadArgs/default.nix @@ -13,6 +13,5 @@ cabal.mkDerivation (self: { description = "Simple command line argument parsing"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/RepLib/default.nix b/pkgs/development/libraries/haskell/RepLib/default.nix index d49242256f22ee3a1dd570b768c623b1482e1100..15cba0c0b283f856b3c15e61ee345ab00880da63 100644 --- a/pkgs/development/libraries/haskell/RepLib/default.nix +++ b/pkgs/development/libraries/haskell/RepLib/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Generic programming library with representation types"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/SDL-image/default.nix b/pkgs/development/libraries/haskell/SDL-image/default.nix index e6695f01358019a508736153d42c48232d84353a..6c61813ac30807a4a1948f8ac50e3dac0404b65e 100644 --- a/pkgs/development/libraries/haskell/SDL-image/default.nix +++ b/pkgs/development/libraries/haskell/SDL-image/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Binding to libSDL_image"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/SDL-mixer/default.nix b/pkgs/development/libraries/haskell/SDL-mixer/default.nix index 674282e30a8696d0faf5a4f72a35e451dd8712cd..8690d7e89163735b8bb1cc8fcb90e05546ed0dbf 100644 --- a/pkgs/development/libraries/haskell/SDL-mixer/default.nix +++ b/pkgs/development/libraries/haskell/SDL-mixer/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Binding to libSDL_mixer"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/SDL-ttf/default.nix b/pkgs/development/libraries/haskell/SDL-ttf/default.nix index 50b7bcd33105cb72c028458ac7c60adb524fd71f..f1a0489167e555bb7df0eae56361431cc6c72c3c 100644 --- a/pkgs/development/libraries/haskell/SDL-ttf/default.nix +++ b/pkgs/development/libraries/haskell/SDL-ttf/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Binding to libSDL_ttf"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/SDL/default.nix b/pkgs/development/libraries/haskell/SDL/default.nix index 0d333097b451150bc0a37b03855e5c76579a9eb1..62731657e82a8a506a0485ef39cfd9f5ce14ef94 100644 --- a/pkgs/development/libraries/haskell/SDL/default.nix +++ b/pkgs/development/libraries/haskell/SDL/default.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Binding to libSDL"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/SHA/default.nix b/pkgs/development/libraries/haskell/SHA/default.nix index b0c30d93605ceb48d8a1d64760325d23b0426f1f..3434127008429b4d1dde1197a4f43b94163883d9 100644 --- a/pkgs/development/libraries/haskell/SHA/default.nix +++ b/pkgs/development/libraries/haskell/SHA/default.nix @@ -11,9 +11,6 @@ cabal.mkDerivation (self: { description = "Implementations of the SHA suite of message digest functions"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/SMTPClient/default.nix b/pkgs/development/libraries/haskell/SMTPClient/default.nix index ea9c60adeabb8cb7f4dc372dbfd35f8366035bc8..91c128756f42c2c054facc102a3bc58e382a1ea5 100644 --- a/pkgs/development/libraries/haskell/SMTPClient/default.nix +++ b/pkgs/development/libraries/haskell/SMTPClient/default.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "A simple SMTP client library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/SafeSemaphore/default.nix b/pkgs/development/libraries/haskell/SafeSemaphore/default.nix index b43c22244fe2e223538da5dc883de5d1318eefe6..d4cc749027760b0f0e2972df163f2463259e4f36 100644 --- a/pkgs/development/libraries/haskell/SafeSemaphore/default.nix +++ b/pkgs/development/libraries/haskell/SafeSemaphore/default.nix @@ -11,6 +11,5 @@ cabal.mkDerivation (self: { description = "Much safer replacement for QSemN, QSem, and SampleVar"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/Shellac/Shellac.nix b/pkgs/development/libraries/haskell/Shellac/Shellac.nix index 8f36e8ebc0885ef037ae7ad48fef2bda77bd9bcf..d896eab923d977686fdb269c875dae38605ee9f3 100644 --- a/pkgs/development/libraries/haskell/Shellac/Shellac.nix +++ b/pkgs/development/libraries/haskell/Shellac/Shellac.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "A framework for creating shell envinronments"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/StateVar/default.nix b/pkgs/development/libraries/haskell/StateVar/default.nix index 95148607b6fe4e07ce684e321ab0cb63fc16eecd..3b27022bea074d9dcbe7494fd0f8a7a7c205ce78 100644 --- a/pkgs/development/libraries/haskell/StateVar/default.nix +++ b/pkgs/development/libraries/haskell/StateVar/default.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "State variables"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/Stream/default.nix b/pkgs/development/libraries/haskell/Stream/default.nix index aea9af862d229530e0ea5f0ff65b1fcf38f19bd4..a95b307613732ba9210a0cea7faf5853bac4deea 100644 --- a/pkgs/development/libraries/haskell/Stream/default.nix +++ b/pkgs/development/libraries/haskell/Stream/default.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "A library for manipulating infinite lists"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/TableAlgebra/default.nix b/pkgs/development/libraries/haskell/TableAlgebra/default.nix index f1c212d7a4911d4b20e0a580a26204240a152e26..c4960813f3ebc4942f6052ad21a132fc64fa99f0 100644 --- a/pkgs/development/libraries/haskell/TableAlgebra/default.nix +++ b/pkgs/development/libraries/haskell/TableAlgebra/default.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Ferry Table Algebra"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/Tensor/default.nix b/pkgs/development/libraries/haskell/Tensor/default.nix index 3856409819dfec2b18ca66027f1576d953f2541e..d62b42833a3e53525aa573e465cf8709656ff097 100644 --- a/pkgs/development/libraries/haskell/Tensor/default.nix +++ b/pkgs/development/libraries/haskell/Tensor/default.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Tensor data types"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/Vec/default.nix b/pkgs/development/libraries/haskell/Vec/default.nix index dd305cab560bf0ebd29473cefade9f73e12e275c..85fdcfd0b4afdbfa069d7f99828e9e6c73781955 100644 --- a/pkgs/development/libraries/haskell/Vec/default.nix +++ b/pkgs/development/libraries/haskell/Vec/default.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Fixed-length lists and low-dimensional linear algebra"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/WebBits-Html/1.0.1.nix b/pkgs/development/libraries/haskell/WebBits-Html/1.0.1.nix index 18371c57f082eee4bae4449134c5575643831376..d69ac78b83d1f2c433b675b617074003e95b89c8 100644 --- a/pkgs/development/libraries/haskell/WebBits-Html/1.0.1.nix +++ b/pkgs/development/libraries/haskell/WebBits-Html/1.0.1.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "JavaScript analysis tools"; license = "LGPL"; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/WebBits-Html/1.0.2.nix b/pkgs/development/libraries/haskell/WebBits-Html/1.0.2.nix index cd34f3161f3d3820901efa8da1e4631f791df329..26f14a08774812ec350ec94ca71ae910724a278c 100644 --- a/pkgs/development/libraries/haskell/WebBits-Html/1.0.2.nix +++ b/pkgs/development/libraries/haskell/WebBits-Html/1.0.2.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "JavaScript analysis tools"; license = "LGPL"; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/WebBits/1.0.nix b/pkgs/development/libraries/haskell/WebBits/1.0.nix index 89161608843eaa6df44dc8b7b62c1e3520f02e3e..49bcd8ed112a87362450dfa7f36961cfb8da87dd 100644 --- a/pkgs/development/libraries/haskell/WebBits/1.0.nix +++ b/pkgs/development/libraries/haskell/WebBits/1.0.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "JavaScript analysis tools"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/WebBits/2.0.nix b/pkgs/development/libraries/haskell/WebBits/2.0.nix index 88502db4dfff76b840a2e2964e586fbf37ee66b5..0638ce06ef91355ab679007125a1562cf4f1094a 100644 --- a/pkgs/development/libraries/haskell/WebBits/2.0.nix +++ b/pkgs/development/libraries/haskell/WebBits/2.0.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "JavaScript analysis tools"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/WebBits/2.2.nix b/pkgs/development/libraries/haskell/WebBits/2.2.nix index 6603117c77e1293fe8d2078b7f5366c9b07c5200..4240d7b9ce94f7e16cc67d77de1bad684658b7f4 100644 --- a/pkgs/development/libraries/haskell/WebBits/2.2.nix +++ b/pkgs/development/libraries/haskell/WebBits/2.2.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "JavaScript analysis tools"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/X11-xft/default.nix b/pkgs/development/libraries/haskell/X11-xft/default.nix index d9eee5f5e1c5bb33d1ab9b5681fb98ee5389c22a..1690ec9031e66f13e56e7894699e89c9aa81ce5d 100644 --- a/pkgs/development/libraries/haskell/X11-xft/default.nix +++ b/pkgs/development/libraries/haskell/X11-xft/default.nix @@ -13,9 +13,6 @@ cabal.mkDerivation (self: { description = "Bindings to the Xft, X Free Type interface library, and some Xrender parts"; license = "LGPL"; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/X11/default.nix b/pkgs/development/libraries/haskell/X11/default.nix index fa1cc44d990956c1c676531f263dc056a9b1cdf5..c304a58b9a51be4e42ee583f1ef32b11a8e13e69 100644 --- a/pkgs/development/libraries/haskell/X11/default.nix +++ b/pkgs/development/libraries/haskell/X11/default.nix @@ -15,9 +15,6 @@ cabal.mkDerivation (self: { description = "A binding to the X11 graphics library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/Zwaluw/default.nix b/pkgs/development/libraries/haskell/Zwaluw/default.nix index 125da2a795e1c117df7af2b7a3ea4a6e038f2bb8..1cb214b94b01a6031ad0fe407fc52aafca42ddc6 100644 --- a/pkgs/development/libraries/haskell/Zwaluw/default.nix +++ b/pkgs/development/libraries/haskell/Zwaluw/default.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Combinators for bidirectional URL routing"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/abstract-deque/default.nix b/pkgs/development/libraries/haskell/abstract-deque/default.nix index c527d34f738bdcc96ff42c4b0e2e200ee0df1e47..475abb0b3a9bb9d2df040ec2c3d1e835e4e86d64 100644 --- a/pkgs/development/libraries/haskell/abstract-deque/default.nix +++ b/pkgs/development/libraries/haskell/abstract-deque/default.nix @@ -1,18 +1,16 @@ -{ cabal, HUnit }: +{ cabal, HUnit, random, testFramework, testFrameworkHunit }: cabal.mkDerivation (self: { pname = "abstract-deque"; - version = "0.1.6"; - sha256 = "13s8xbr31sqj8n3bh4xp82fqw5d5g1a27fpfqw69jfmr5xc9s1za"; - buildDepends = [ HUnit ]; + version = "0.2"; + sha256 = "0cq1k74b854flfvh7qhfnpngn4vyzp1az1rkaara23wlylydgs89"; + buildDepends = [ HUnit random ]; + testDepends = [ HUnit random testFramework testFrameworkHunit ]; meta = { homepage = "https://github.com/rrnewton/haskell-lockfree-queue/wiki"; description = "Abstract, parameterized interface to mutable Deques"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/abstract-par/default.nix b/pkgs/development/libraries/haskell/abstract-par/default.nix index 797d42319bb6260ba844ae24873134135618e2a5..033fc242321da930a3ee2100d68a5edae0c87ade 100644 --- a/pkgs/development/libraries/haskell/abstract-par/default.nix +++ b/pkgs/development/libraries/haskell/abstract-par/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Type classes generalizing the functionality of the 'monad-par' library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/accelerate-cuda/default.nix b/pkgs/development/libraries/haskell/accelerate-cuda/default.nix index 22fdb877ff4dba7cdd2f5b8f2669160a9ab18ad8..aee3b666890c65d48fc1b7a116fb5a32a7f8e6ac 100644 --- a/pkgs/development/libraries/haskell/accelerate-cuda/default.nix +++ b/pkgs/development/libraries/haskell/accelerate-cuda/default.nix @@ -1,25 +1,22 @@ { cabal, accelerate, binary, cryptohash, cuda, fclabels, filepath -, hashable, hashtables, languageCQuote, mainlandPretty, mtl, srcloc -, text, transformers, unorderedContainers +, hashable, hashtables, languageCQuote, mainlandPretty, mtl +, SafeSemaphore, srcloc, text, transformers, unorderedContainers }: cabal.mkDerivation (self: { pname = "accelerate-cuda"; - version = "0.12.1.2"; - sha256 = "184rxdp9idvhrqa0k3fqcm3nrgjcs3f53dz7wrhhpfa3iqrr6vd4"; + version = "0.13.0.1"; + sha256 = "0nswa73ajvmh1s6n2nks4zm3ybfm8v46wd789cs09f5s90ingpsj"; buildDepends = [ accelerate binary cryptohash cuda fclabels filepath hashable - hashtables languageCQuote mainlandPretty mtl srcloc text - transformers unorderedContainers + hashtables languageCQuote mainlandPretty mtl SafeSemaphore srcloc + text transformers unorderedContainers ]; meta = { - homepage = "http://www.cse.unsw.edu.au/~chak/project/accelerate/"; + homepage = "https://github.com/AccelerateHS/accelerate-cuda/"; description = "Accelerate backend for NVIDIA GPUs"; license = self.stdenv.lib.licenses.bsd3; platforms = self.stdenv.lib.platforms.none; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/accelerate-examples/default.nix b/pkgs/development/libraries/haskell/accelerate-examples/default.nix index 095d2ff16649f8b41205e5c26507a024db7bb6dc..b9536052dd2d768440e36681a1a032f8a9c91220 100644 --- a/pkgs/development/libraries/haskell/accelerate-examples/default.nix +++ b/pkgs/development/libraries/haskell/accelerate-examples/default.nix @@ -1,31 +1,29 @@ -{ cabal, accelerate, accelerateCuda, accelerateIo, attoparsec, bmp -, bytestringLexing, cmdargs, criterion, cuda, deepseq, fclabels -, filepath, gloss, hashtables, mtl, mwcRandom, pgm, QuickCheck -, random, testFramework, testFrameworkQuickcheck2, vector -, vectorAlgorithms +{ cabal, accelerate, accelerateCuda, accelerateFft, accelerateIo +, attoparsec, bmp, bytestringLexing, cereal, cmdargs, criterion +, cuda, deepseq, fclabels, filepath, gloss, hashtables, mtl +, mwcRandom, pgm, QuickCheck, random, repa, repaIo, testFramework +, testFrameworkQuickcheck2, vector, vectorAlgorithms }: cabal.mkDerivation (self: { pname = "accelerate-examples"; - version = "0.12.1.0"; - sha256 = "0vlax90yy9h4ljm87ffmnqv881nr4ssbc968mbbwi2704hn4chhb"; + version = "0.13.0.0"; + sha256 = "18f8p47sf10zn678540qzzf5pl18w9f068s83lpz4lk0r5gf4lzx"; isLibrary = false; isExecutable = true; buildDepends = [ - accelerate accelerateCuda accelerateIo attoparsec bmp - bytestringLexing cmdargs criterion cuda deepseq fclabels filepath - gloss hashtables mtl mwcRandom pgm QuickCheck random testFramework - testFrameworkQuickcheck2 vector vectorAlgorithms + accelerate accelerateCuda accelerateFft accelerateIo attoparsec bmp + bytestringLexing cereal cmdargs criterion cuda deepseq fclabels + filepath gloss hashtables mtl mwcRandom pgm QuickCheck random repa + repaIo testFramework testFrameworkQuickcheck2 vector + vectorAlgorithms ]; configureFlags = "-f-opencl"; meta = { - homepage = "http://www.cse.unsw.edu.au/~chak/project/accelerate/"; + homepage = "https://github.com/AccelerateHS/accelerate-examples"; description = "Examples using the Accelerate library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.stdenv.lib.platforms.none; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/accelerate-fft/default.nix b/pkgs/development/libraries/haskell/accelerate-fft/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..523e5ae1504c81940c002aafc0628bf55bd05a2b --- /dev/null +++ b/pkgs/development/libraries/haskell/accelerate-fft/default.nix @@ -0,0 +1,14 @@ +{ cabal, accelerate, accelerateCuda, cuda, cufft }: + +cabal.mkDerivation (self: { + pname = "accelerate-fft"; + version = "0.13.0.0"; + sha256 = "0gqdb7m0qf8wvccqnz9pafbvas3viwhr9i422cmfvjpxsmnzlcp7"; + buildDepends = [ accelerate accelerateCuda cuda cufft ]; + meta = { + homepage = "https://github.com/AccelerateHS/accelerate-fft"; + description = "FFT using the Accelerate library"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/accelerate-io/default.nix b/pkgs/development/libraries/haskell/accelerate-io/default.nix index d327d710e3b60804ef6f01b28fadc64fe796ddb7..3daa16d87c93707c29d7dc7d3f7e394848480989 100644 --- a/pkgs/development/libraries/haskell/accelerate-io/default.nix +++ b/pkgs/development/libraries/haskell/accelerate-io/default.nix @@ -1,18 +1,15 @@ -{ cabal, accelerate, repa, vector }: +{ cabal, accelerate, bmp, repa, vector }: cabal.mkDerivation (self: { pname = "accelerate-io"; - version = "0.12.1.0"; - sha256 = "1hcyshzfh7ldswv7sjklxlw5h1hx7spx6dy23bvdryrkq929gb8a"; - buildDepends = [ accelerate repa vector ]; + version = "0.13.0.1"; + sha256 = "0wjprbhcddnjqbhmpxiwq73hazdnhafhjj7mpvpxhs9pz1dbv89h"; + buildDepends = [ accelerate bmp repa vector ]; meta = { - homepage = "http://www.cse.unsw.edu.au/~chak/project/accelerate/"; + homepage = "https://github.com/AccelerateHS/accelerate-io"; description = "Read and write Accelerate arrays in various formats"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/accelerate/default.nix b/pkgs/development/libraries/haskell/accelerate/default.nix index f4c70657caa94c5812adce8ecdfe193c4216edb5..b91de6de44eb0b765ce68acf400672988c2d0c9d 100644 --- a/pkgs/development/libraries/haskell/accelerate/default.nix +++ b/pkgs/development/libraries/haskell/accelerate/default.nix @@ -1,17 +1,16 @@ -{ cabal }: +{ cabal, fclabels, hashable, hashtables }: cabal.mkDerivation (self: { pname = "accelerate"; - version = "0.12.2.0"; - sha256 = "1fv7d2prpkwy2gy0llafksayka76jv8c0sd66x6632gb586pfwgs"; + version = "0.13.0.1"; + sha256 = "01vkvvvzlj023cwxz90clrcgz4xyz0nb8idm1zad21gzrij14915"; + buildDepends = [ fclabels hashable hashtables ]; + noHaddock = true; meta = { homepage = "https://github.com/AccelerateHS/accelerate/"; description = "An embedded language for accelerated array processing"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/active/default.nix b/pkgs/development/libraries/haskell/active/default.nix index cadcb223366d3e8c0178784c8918918c2d2a2b96..209341e22e76aef345ba8c9504e5ce98ae6476b5 100644 --- a/pkgs/development/libraries/haskell/active/default.nix +++ b/pkgs/development/libraries/haskell/active/default.nix @@ -14,6 +14,5 @@ cabal.mkDerivation (self: { description = "Abstractions for animation"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/aeson/default.nix b/pkgs/development/libraries/haskell/aeson/default.nix index 4f0b55a5079233d00a3189d3c45f19fe3af60888..3c4135feb724e7ccc9d056c6c9b3564a3e9396df 100644 --- a/pkgs/development/libraries/haskell/aeson/default.nix +++ b/pkgs/development/libraries/haskell/aeson/default.nix @@ -15,14 +15,12 @@ cabal.mkDerivation (self: { attoparsec QuickCheck testFramework testFrameworkQuickcheck2 text time ]; + doCheck = false; meta = { homepage = "https://github.com/bos/aeson"; description = "Fast JSON parsing and encoding"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/alsa-core/default.nix b/pkgs/development/libraries/haskell/alsa-core/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..140d554e88c690fed7804ab9d297fbb940c7a553 --- /dev/null +++ b/pkgs/development/libraries/haskell/alsa-core/default.nix @@ -0,0 +1,15 @@ +{ cabal, alsaLib, extensibleExceptions }: + +cabal.mkDerivation (self: { + pname = "alsa-core"; + version = "0.5.0.1"; + sha256 = "1avh4a419h9d2zsslg6j8hm87ppgsgqafz8ll037rk2yy1g4jl7b"; + buildDepends = [ extensibleExceptions ]; + pkgconfigDepends = [ alsaLib ]; + meta = { + homepage = "http://www.haskell.org/haskellwiki/ALSA"; + description = "Binding to the ALSA Library API (Exceptions)"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/alsa-pcm/default.nix b/pkgs/development/libraries/haskell/alsa-pcm/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..3d1091f270274732c6051b160c1c031ec68121ef --- /dev/null +++ b/pkgs/development/libraries/haskell/alsa-pcm/default.nix @@ -0,0 +1,21 @@ +{ cabal, alsaCore, alsaLib, extensibleExceptions, sampleFrame +, storableRecord +}: + +cabal.mkDerivation (self: { + pname = "alsa-pcm"; + version = "0.6"; + sha256 = "10cmlf1s9y65cs81wn7xwgcd4218n3h3p34avibv3fa7n3q9b4x1"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + alsaCore extensibleExceptions sampleFrame storableRecord + ]; + pkgconfigDepends = [ alsaLib ]; + meta = { + homepage = "http://www.haskell.org/haskellwiki/ALSA"; + description = "Binding to the ALSA Library API (PCM audio)"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/alternative-io/default.nix b/pkgs/development/libraries/haskell/alternative-io/default.nix index 4d9c9d44dd61d7927bbf15cf0374197b73fa3e5b..9daf9406742c3e1732e954ae476298d03ee3bd65 100644 --- a/pkgs/development/libraries/haskell/alternative-io/default.nix +++ b/pkgs/development/libraries/haskell/alternative-io/default.nix @@ -12,9 +12,6 @@ cabal.mkDerivation (self: { description = "IO as Alternative instance (deprecated)"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/ansi-terminal/default.nix b/pkgs/development/libraries/haskell/ansi-terminal/default.nix index 1f13d67d3e8da8dd25368b6d1aadde2c64f53fc0..6d598f29ec9546b71a6ae604c66d5bea684507ff 100644 --- a/pkgs/development/libraries/haskell/ansi-terminal/default.nix +++ b/pkgs/development/libraries/haskell/ansi-terminal/default.nix @@ -11,9 +11,6 @@ cabal.mkDerivation (self: { description = "Simple ANSI terminal support, with Windows compatibility"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/ansi-wl-pprint/default.nix b/pkgs/development/libraries/haskell/ansi-wl-pprint/default.nix index 79492bc2eebbeabf8ff21fbeab2d8368ad06273c..bfccdcffd7461b1c3b2300a570b9b1955b852a88 100644 --- a/pkgs/development/libraries/haskell/ansi-wl-pprint/default.nix +++ b/pkgs/development/libraries/haskell/ansi-wl-pprint/default.nix @@ -12,9 +12,6 @@ cabal.mkDerivation (self: { description = "The Wadler/Leijen Pretty Printer for colored ANSI terminal output"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/appar/default.nix b/pkgs/development/libraries/haskell/appar/default.nix index 012e771d18167195523e2ce6ba31c7a091834e68..4c2f5a9ce4644e5c718b0a7d9b958f8c60e85e7b 100644 --- a/pkgs/development/libraries/haskell/appar/default.nix +++ b/pkgs/development/libraries/haskell/appar/default.nix @@ -8,6 +8,5 @@ cabal.mkDerivation (self: { description = "A simple applicative parser"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/arithmoi/default.nix b/pkgs/development/libraries/haskell/arithmoi/default.nix index 1f54347986be07effe1bba9d7e38822193463e22..181937fdd8070c41dcdf456c529d86241361c9b8 100644 --- a/pkgs/development/libraries/haskell/arithmoi/default.nix +++ b/pkgs/development/libraries/haskell/arithmoi/default.nix @@ -10,6 +10,5 @@ cabal.mkDerivation (self: { description = "Efficient basic number-theoretic functions. Primes, powers, integer logarithms."; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/arrows/default.nix b/pkgs/development/libraries/haskell/arrows/default.nix index f9ba4b422a25840eb7ec8a9c0f673fcbf1918e88..149f5f951e5dee4256193cc606b7bd287c2d8d81 100644 --- a/pkgs/development/libraries/haskell/arrows/default.nix +++ b/pkgs/development/libraries/haskell/arrows/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Arrow classes and transformers"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/asn1-data/default.nix b/pkgs/development/libraries/haskell/asn1-data/default.nix index f35f5769a0c5a2eeacab7890e9824f7fd0204fb1..a90e8e769e234d60a45e746b80aeb472fa272d03 100644 --- a/pkgs/development/libraries/haskell/asn1-data/default.nix +++ b/pkgs/development/libraries/haskell/asn1-data/default.nix @@ -12,9 +12,6 @@ cabal.mkDerivation (self: { description = "ASN1 data reader and writer in RAW, BER and DER forms"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/async/2.0.1.3.nix b/pkgs/development/libraries/haskell/async/2.0.1.3.nix index fc32f366ce426123f064651aa3745cafcce6866a..1b943208dea45d23ff5cef1e7d9192489351e00c 100644 --- a/pkgs/development/libraries/haskell/async/2.0.1.3.nix +++ b/pkgs/development/libraries/haskell/async/2.0.1.3.nix @@ -11,9 +11,6 @@ cabal.mkDerivation (self: { description = "Run IO operations asynchronously and wait for their results"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/async/2.0.1.4.nix b/pkgs/development/libraries/haskell/async/2.0.1.4.nix index ef6ee614053a6df7c322e9dbf189e70a088f3241..5dd76b4d6e006601f271dd52d66903a2e9721cfe 100644 --- a/pkgs/development/libraries/haskell/async/2.0.1.4.nix +++ b/pkgs/development/libraries/haskell/async/2.0.1.4.nix @@ -11,9 +11,6 @@ cabal.mkDerivation (self: { description = "Run IO operations asynchronously and wait for their results"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/atomic-primops/default.nix b/pkgs/development/libraries/haskell/atomic-primops/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..4b37ea84d588b5ad5be91dce12185920a04a6b1f --- /dev/null +++ b/pkgs/development/libraries/haskell/atomic-primops/default.nix @@ -0,0 +1,14 @@ +{ cabal, Cabal, primitive }: + +cabal.mkDerivation (self: { + pname = "atomic-primops"; + version = "0.1.0.2"; + sha256 = "1qjm97hi2wr658yk7f5cfppizaawmrkvs2q7qzq00h14fr71xxca"; + buildDepends = [ Cabal primitive ]; + meta = { + homepage = "https://github.com/rrnewton/haskell-lockfree-queue/wiki"; + description = "A safe approach to CAS and other atomic ops in Haskell"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/attempt/default.nix b/pkgs/development/libraries/haskell/attempt/default.nix index 2c5fc47ea3148c01ce8bc3822e91c8fa3a3dec70..c000002d4998b8a7f570524d1a4c8a175e812e2a 100644 --- a/pkgs/development/libraries/haskell/attempt/default.nix +++ b/pkgs/development/libraries/haskell/attempt/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Concrete data type for handling extensible exceptions as failures"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/attoparsec-binary/default.nix b/pkgs/development/libraries/haskell/attoparsec-binary/default.nix index bdba04cf14d852cbd60f977699286d55f9abab1a..623ae1040901b0c7d868301d6f1276bb59e6741f 100644 --- a/pkgs/development/libraries/haskell/attoparsec-binary/default.nix +++ b/pkgs/development/libraries/haskell/attoparsec-binary/default.nix @@ -9,6 +9,5 @@ cabal.mkDerivation (self: { description = "Binary processing extensions to Attoparsec"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix index 690196c80ffdd8954f8105e61110cab508844b2f..663a91b0c30f1d6bcf5f7412effe440677743672 100644 --- a/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix +++ b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix @@ -12,9 +12,6 @@ cabal.mkDerivation (self: { description = "Consume attoparsec parsers via conduit"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/attoparsec/enumerator.nix b/pkgs/development/libraries/haskell/attoparsec-enumerator/default.nix similarity index 82% rename from pkgs/development/libraries/haskell/attoparsec/enumerator.nix rename to pkgs/development/libraries/haskell/attoparsec-enumerator/default.nix index 880181fa4a1dac75ce98ae055b1c49e72ef14acc..d52687d8080140d2c3ab5099020c26001335b729 100644 --- a/pkgs/development/libraries/haskell/attoparsec/enumerator.nix +++ b/pkgs/development/libraries/haskell/attoparsec-enumerator/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Pass input from an enumerator to an Attoparsec parser"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/attoparsec/default.nix b/pkgs/development/libraries/haskell/attoparsec/0.10.4.0.nix similarity index 83% rename from pkgs/development/libraries/haskell/attoparsec/default.nix rename to pkgs/development/libraries/haskell/attoparsec/0.10.4.0.nix index d7fa58de5d7bec345b2ede145d89a4f76dedf2ee..c352ce7ca8ec5be7e6b0e2bd731166c385e25868 100644 --- a/pkgs/development/libraries/haskell/attoparsec/default.nix +++ b/pkgs/development/libraries/haskell/attoparsec/0.10.4.0.nix @@ -15,9 +15,6 @@ cabal.mkDerivation (self: { description = "Fast combinator parsing for bytestrings and text"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/authenticate-oauth/default.nix b/pkgs/development/libraries/haskell/authenticate-oauth/default.nix index 60cd5ffb73a43f7e31fa995835a948359a6cde37..c21d6eddbee27064401b4cf0d9eabdebb98fbca6 100644 --- a/pkgs/development/libraries/haskell/authenticate-oauth/default.nix +++ b/pkgs/development/libraries/haskell/authenticate-oauth/default.nix @@ -5,19 +5,17 @@ cabal.mkDerivation (self: { pname = "authenticate-oauth"; - version = "1.4.0.5"; - sha256 = "0yic95glkc0j35sdq04z5n2607ch0k64vyi3y0kfji31qzd3d44x"; + version = "1.4.0.6"; + sha256 = "1ylfvc744wqyn5xbv6fivfys5kk9k9r2b9xf63zfzj5l5yqmv91a"; buildDepends = [ base64Bytestring blazeBuilder blazeBuilderConduit conduit cryptoPubkeyTypes dataDefault httpConduit httpTypes monadControl random resourcet RSA SHA time transformers ]; - jailbreak = true; meta = { homepage = "http://github.com/yesodweb/authenticate"; description = "Library to authenticate with OAuth for Haskell web applications"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/authenticate/default.nix b/pkgs/development/libraries/haskell/authenticate/default.nix index a94b6b9ef3ee879b186d12c25c9050c94b65bd77..f0a1969ffbabde224a95321ddf50d98323fdb425 100644 --- a/pkgs/development/libraries/haskell/authenticate/default.nix +++ b/pkgs/development/libraries/haskell/authenticate/default.nix @@ -17,9 +17,6 @@ cabal.mkDerivation (self: { description = "Authentication methods for Haskell web applications"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/base-compat/default.nix b/pkgs/development/libraries/haskell/base-compat/default.nix index 8e76bfa698daef31473b5da0fd13d9224f8c3492..ca208b7c1a34ef82d192beb16ebccde4fe682e8f 100644 --- a/pkgs/development/libraries/haskell/base-compat/default.nix +++ b/pkgs/development/libraries/haskell/base-compat/default.nix @@ -9,6 +9,5 @@ cabal.mkDerivation (self: { description = "A compatibility layer for base"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/base-unicode-symbols/default.nix b/pkgs/development/libraries/haskell/base-unicode-symbols/default.nix index d624213111b5e535eba10fa8b2a7a19a26fd706f..3eccd0a4ffacb6d2e13651396928cba2ce7ace8a 100644 --- a/pkgs/development/libraries/haskell/base-unicode-symbols/default.nix +++ b/pkgs/development/libraries/haskell/base-unicode-symbols/default.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Unicode alternatives for common functions and operators"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/base16-bytestring/default.nix b/pkgs/development/libraries/haskell/base16-bytestring/default.nix index 5004032997c7ae77ff6109297bf9f21b0dcd5b04..3f81258f4263fbf40ab12ab40a48d207d5efee24 100644 --- a/pkgs/development/libraries/haskell/base16-bytestring/default.nix +++ b/pkgs/development/libraries/haskell/base16-bytestring/default.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Fast base16 (hex) encoding and decoding for ByteStrings"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/base64-bytestring/default.nix b/pkgs/development/libraries/haskell/base64-bytestring/default.nix index e043d35ffb1d5c8e87526e527c68f1111d2e3855..67450dc88874b9d321250593d731cdc50fb7d133 100644 --- a/pkgs/development/libraries/haskell/base64-bytestring/default.nix +++ b/pkgs/development/libraries/haskell/base64-bytestring/default.nix @@ -15,9 +15,6 @@ cabal.mkDerivation (self: { description = "Fast base64 encoding and decoding for ByteStrings"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/base64-conduit/default.nix b/pkgs/development/libraries/haskell/base64-conduit/default.nix index 08af81a606d7ac33fde814960f992eaa4b80ef41..3a2d044de64d79b678c345ae2df354241203f62e 100644 --- a/pkgs/development/libraries/haskell/base64-conduit/default.nix +++ b/pkgs/development/libraries/haskell/base64-conduit/default.nix @@ -14,6 +14,5 @@ cabal.mkDerivation (self: { description = "Base64-encode and decode streams of bytes"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/base64-string/default.nix b/pkgs/development/libraries/haskell/base64-string/default.nix index e77d5b96ea7925d3cc5c9cc445c52a37653f9df8..9e0a781039b14fdb60fc8bfe1003c2157b306915 100644 --- a/pkgs/development/libraries/haskell/base64-string/default.nix +++ b/pkgs/development/libraries/haskell/base64-string/default.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Base64 implementation for String's"; license = "unknown"; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/basic-prelude/default.nix b/pkgs/development/libraries/haskell/basic-prelude/default.nix index 95ce58e4b92674ff3738fa5005e42a3c8dd1f3fc..cdf929d80274a5686311b445f2c083ae5fc06beb 100644 --- a/pkgs/development/libraries/haskell/basic-prelude/default.nix +++ b/pkgs/development/libraries/haskell/basic-prelude/default.nix @@ -15,6 +15,5 @@ cabal.mkDerivation (self: { description = "An enhanced core prelude; a common foundation for alternate preludes"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/benchpress/default.nix b/pkgs/development/libraries/haskell/benchpress/default.nix index 2cdd3581fba883a10f7896aabf566ac973086931..c80f04f966db18323d75adc0b0f7e6b309e351ac 100644 --- a/pkgs/development/libraries/haskell/benchpress/default.nix +++ b/pkgs/development/libraries/haskell/benchpress/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Micro-benchmarking with detailed statistics"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/bifunctors/default.nix b/pkgs/development/libraries/haskell/bifunctors/default.nix index ea46422ecae7ea02443fb55ce7e91a63bfe1a71e..c659c3bc3beaca6349618f71dcea517f16307ab6 100644 --- a/pkgs/development/libraries/haskell/bifunctors/default.nix +++ b/pkgs/development/libraries/haskell/bifunctors/default.nix @@ -10,6 +10,5 @@ cabal.mkDerivation (self: { description = "Haskell 98 bifunctors"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/bimap/default.nix b/pkgs/development/libraries/haskell/bimap/default.nix index 2b132f9cad0bb4c5c8d7c90449f40814eb07fcb1..98814e75a9d5563c67fe4589792a3106c0cdf1dd 100644 --- a/pkgs/development/libraries/haskell/bimap/default.nix +++ b/pkgs/development/libraries/haskell/bimap/default.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Bidirectional mapping between two key types"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/binary-shared/default.nix b/pkgs/development/libraries/haskell/binary-shared/default.nix index 34a6f0db9715123e266317382acee3d0f09b8841..4033565684d09d47020b20ad5e3724a91a70224b 100644 --- a/pkgs/development/libraries/haskell/binary-shared/default.nix +++ b/pkgs/development/libraries/haskell/binary-shared/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Sharing for the binary package"; license = "GPL"; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/binary/default.nix b/pkgs/development/libraries/haskell/binary/default.nix index adfcc16a18069fd963a8b58b119be60f4ea2fd31..245c80ef1ccc92cfe43377a38d8ae5cf85bbe0fb 100644 --- a/pkgs/development/libraries/haskell/binary/default.nix +++ b/pkgs/development/libraries/haskell/binary/default.nix @@ -15,9 +15,6 @@ cabal.mkDerivation (self: { description = "Binary serialisation for Haskell values using lazy ByteStrings"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/bitarray/default.nix b/pkgs/development/libraries/haskell/bitarray/default.nix index faf51870ae9b8f8b2eedaf558b68153825e10e84..edda97480d8c51a4605e06b74faa32ac406577e9 100644 --- a/pkgs/development/libraries/haskell/bitarray/default.nix +++ b/pkgs/development/libraries/haskell/bitarray/default.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Mutable and immutable bit arrays"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/bitmap/default.nix b/pkgs/development/libraries/haskell/bitmap/default.nix index 53f857102816d13d952052cf2ca0ec9cf60c0c84..b120c8cf9537ab40188133654397d7f36ca7f5f4 100644 --- a/pkgs/development/libraries/haskell/bitmap/default.nix +++ b/pkgs/development/libraries/haskell/bitmap/default.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "A library for handling and manipulating bitmaps (rectangular pixel arrays)"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/bits-atomic/default.nix b/pkgs/development/libraries/haskell/bits-atomic/default.nix index b8dd09f43b841d9f1d0eec96c8ec9f701f12299c..e6add5883aaa7442dad93447087ed8bb0f1b5534 100644 --- a/pkgs/development/libraries/haskell/bits-atomic/default.nix +++ b/pkgs/development/libraries/haskell/bits-atomic/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Atomic bit operations on memory locations for low-level synchronization"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/bktrees/default.nix b/pkgs/development/libraries/haskell/bktrees/default.nix index 23493e50c19cefbb3cb787c41c4becf04b6d918c..70369034eaada2bb84897766e9c89b43878c12f4 100644 --- a/pkgs/development/libraries/haskell/bktrees/default.nix +++ b/pkgs/development/libraries/haskell/bktrees/default.nix @@ -8,9 +8,6 @@ cabal.mkDerivation (self: { description = "A set data structure with approximate searching"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix b/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix index bef4668cbc28d1e11006c0d2ca00b291d8dbdd86..16c352b7a3327553cbfb1cd0f5d10e560e1f685f 100644 --- a/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix +++ b/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix @@ -15,9 +15,6 @@ cabal.mkDerivation (self: { description = "Convert streams of builders to streams of bytestrings"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix b/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix index 5e533a415a293684596099285d1b18aec95fe5cb..00176d215baef3104df6374bf315fffe2be9d6f1 100644 --- a/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix +++ b/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Enumeratees for the incremental conversion of builders to bytestrings"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/blaze-builder/default.nix b/pkgs/development/libraries/haskell/blaze-builder/default.nix index ffd307bf13e6398e12e0e14c6fee7ce16007b0f3..816537b1ab65726f69f466e507c72e4ce509dbf1 100644 --- a/pkgs/development/libraries/haskell/blaze-builder/default.nix +++ b/pkgs/development/libraries/haskell/blaze-builder/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Efficient buffered output"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/blaze-html/default.nix b/pkgs/development/libraries/haskell/blaze-html/default.nix index 2370021da6007118699d30ea90337cc6bcc3f8ae..ec21e3fcd84bd1890a52524d1b7b4f73ea60392c 100644 --- a/pkgs/development/libraries/haskell/blaze-html/default.nix +++ b/pkgs/development/libraries/haskell/blaze-html/default.nix @@ -16,9 +16,6 @@ cabal.mkDerivation (self: { description = "A blazingly fast HTML combinator library for Haskell"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/blaze-markup/default.nix b/pkgs/development/libraries/haskell/blaze-markup/default.nix index e8272c2c5ad520b403c90521f1822bcf46267db0..0c544119d5ffc1905698b11b93c7df25a06d3891 100644 --- a/pkgs/development/libraries/haskell/blaze-markup/default.nix +++ b/pkgs/development/libraries/haskell/blaze-markup/default.nix @@ -16,9 +16,6 @@ cabal.mkDerivation (self: { description = "A blazingly fast markup combinator library for Haskell"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/blaze-svg/default.nix b/pkgs/development/libraries/haskell/blaze-svg/default.nix index caa06482b6723899e944999a2b61a064fcb362b8..7b3ec55dc577592d8b53e56703212eb05a722241 100644 --- a/pkgs/development/libraries/haskell/blaze-svg/default.nix +++ b/pkgs/development/libraries/haskell/blaze-svg/default.nix @@ -10,6 +10,5 @@ cabal.mkDerivation (self: { description = "SVG combinator library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/blaze-textual/default.nix b/pkgs/development/libraries/haskell/blaze-textual/default.nix index b3ab183c57fdfbf4c274a272cda4b8a75f4dcca6..ede82e5c2ed331e33f8a6d4869861665c7078510 100644 --- a/pkgs/development/libraries/haskell/blaze-textual/default.nix +++ b/pkgs/development/libraries/haskell/blaze-textual/default.nix @@ -16,9 +16,6 @@ cabal.mkDerivation (self: { description = "Fast rendering of common datatypes"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/bloomfilter/default.nix b/pkgs/development/libraries/haskell/bloomfilter/default.nix index 9d7f550c4fd4909a7d2e720388515a22cddc681e..7c8c2d348498bf4a6f3a03ac33c0a05e9793b7df 100644 --- a/pkgs/development/libraries/haskell/bloomfilter/default.nix +++ b/pkgs/development/libraries/haskell/bloomfilter/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Pure and impure Bloom Filter implementations"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/bmp/1.2.2.1.nix b/pkgs/development/libraries/haskell/bmp/1.2.2.1.nix index 213afd59c5ae3c0ad052648ff5b8c574bfda6b75..e018ac7a8d288c6f5b235bc8c6c227cdb0193b77 100644 --- a/pkgs/development/libraries/haskell/bmp/1.2.2.1.nix +++ b/pkgs/development/libraries/haskell/bmp/1.2.2.1.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { 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 - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/bmp/1.2.4.1.nix b/pkgs/development/libraries/haskell/bmp/1.2.4.1.nix index 8e1685296cac0d940f3bf19ede1dff82a059be85..a3de1d11830cc718f4fc01742d46a097ca4ab411 100644 --- a/pkgs/development/libraries/haskell/bmp/1.2.4.1.nix +++ b/pkgs/development/libraries/haskell/bmp/1.2.4.1.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { 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 - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/boomerang/default.nix b/pkgs/development/libraries/haskell/boomerang/default.nix index a5a1145295b1761033606611104abb46e6646df8..963448a56e73952f58a4530f0b3d5f6cabf15ac9 100644 --- a/pkgs/development/libraries/haskell/boomerang/default.nix +++ b/pkgs/development/libraries/haskell/boomerang/default.nix @@ -9,6 +9,5 @@ cabal.mkDerivation (self: { description = "Library for invertible parsing and printing"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/brainfuck/default.nix b/pkgs/development/libraries/haskell/brainfuck/default.nix index 1dd75661ce6863ef7e071e8790b6fc170d21b014..a406d1fa5000229f5c5cd39ae6824aa8ee5ff5d3 100644 --- a/pkgs/development/libraries/haskell/brainfuck/default.nix +++ b/pkgs/development/libraries/haskell/brainfuck/default.nix @@ -11,9 +11,6 @@ cabal.mkDerivation (self: { description = "Brainfuck interpreter"; license = "GPL"; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/bson/default.nix b/pkgs/development/libraries/haskell/bson/default.nix index 042c212e801eb677ce6a0cec1206d64a0178cf08..e572e366bdd0998b4795459fd69624e03ff18860 100644 --- a/pkgs/development/libraries/haskell/bson/default.nix +++ b/pkgs/development/libraries/haskell/bson/default.nix @@ -19,9 +19,6 @@ cabal.mkDerivation (self: { description = "BSON documents are JSON-like objects with a standard binary encoding"; license = "unknown"; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/byteorder/default.nix b/pkgs/development/libraries/haskell/byteorder/default.nix index 8addc3cc628ae7373b3ac3fdb86b9ff575344e87..86de1da9328c2b10f4b6172eca78d76249cab6ef 100644 --- a/pkgs/development/libraries/haskell/byteorder/default.nix +++ b/pkgs/development/libraries/haskell/byteorder/default.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Exposes the native endianness or byte ordering of the system"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/bytestring-lexing/default.nix b/pkgs/development/libraries/haskell/bytestring-lexing/default.nix index 9d67a1cb3ee0c65efbbf46c4efe64f07856292cc..93c8b2aa229006950e92878966efd0b2bc438b5b 100644 --- a/pkgs/development/libraries/haskell/bytestring-lexing/default.nix +++ b/pkgs/development/libraries/haskell/bytestring-lexing/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Parse and produce literals efficiently from strict or lazy bytestrings"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/bytestring-mmap/default.nix b/pkgs/development/libraries/haskell/bytestring-mmap/default.nix index cf68d1e7fa50a7f272190afced7091c77ff0e3f9..5f9e322fbf0bd51ddf9bccb364926db956255743 100644 --- a/pkgs/development/libraries/haskell/bytestring-mmap/default.nix +++ b/pkgs/development/libraries/haskell/bytestring-mmap/default.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "mmap support for strict ByteStrings"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/bytestring-nums/default.nix b/pkgs/development/libraries/haskell/bytestring-nums/default.nix index 36ef166baaf6f1fbfc962d2f57d94ef94d0ffb7b..e78a64781518215ca2f45519c1553aa3e7e0701b 100644 --- a/pkgs/development/libraries/haskell/bytestring-nums/default.nix +++ b/pkgs/development/libraries/haskell/bytestring-nums/default.nix @@ -11,9 +11,6 @@ cabal.mkDerivation (self: { description = "Parse numeric literals from ByteStrings"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/bytestring-progress/default.nix b/pkgs/development/libraries/haskell/bytestring-progress/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..e9bb268b9fce89e478ab738b7d0be7bd305f2fdd --- /dev/null +++ b/pkgs/development/libraries/haskell/bytestring-progress/default.nix @@ -0,0 +1,15 @@ +{ cabal, terminalProgressBar, time }: + +cabal.mkDerivation (self: { + pname = "bytestring-progress"; + version = "1.0.3"; + sha256 = "1v9cl7d4fcchbdrpbgjj4ilg79cj241vzijiifdsgkq30ikv2yxs"; + buildDepends = [ terminalProgressBar time ]; + noHaddock = true; + meta = { + homepage = "http://github.com/acw/bytestring-progress"; + description = "A library for tracking the consumption of a lazy ByteString"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/bytestring-trie/default.nix b/pkgs/development/libraries/haskell/bytestring-trie/default.nix index 1dc56c420b671b72f06155e4a133add9a7eabad3..41c31b1fed5c9ec10af7386c1106d76d6911681a 100644 --- a/pkgs/development/libraries/haskell/bytestring-trie/default.nix +++ b/pkgs/development/libraries/haskell/bytestring-trie/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "An efficient finite map from (byte)strings to values"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/c2hs/default.nix b/pkgs/development/libraries/haskell/c2hs/default.nix index c0befa37d2a80ed5eaa9b9df6d1368244fcf8974..6ad4db61cfdcf4e5b70b36b968ef265fe9c3fefb 100644 --- a/pkgs/development/libraries/haskell/c2hs/default.nix +++ b/pkgs/development/libraries/haskell/c2hs/default.nix @@ -12,9 +12,6 @@ cabal.mkDerivation (self: { description = "C->Haskell FFI tool that gives some cross-language type safety"; license = self.stdenv.lib.licenses.gpl2; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/cabal-file-th/default.nix b/pkgs/development/libraries/haskell/cabal-file-th/default.nix index 0bdb33ceede72819b5e1271084d010535a7b4599..55b4fea36fec65cc99cf76c076268f6f18bfba85 100644 --- a/pkgs/development/libraries/haskell/cabal-file-th/default.nix +++ b/pkgs/development/libraries/haskell/cabal-file-th/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Template Haskell expressions for reading fields from a project's cabal file"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/cabal-macosx/default.nix b/pkgs/development/libraries/haskell/cabal-macosx/default.nix index ab59d7c50893c3fe96b1dbd4e0fc93d5235415d2..0f651e1eaae3f1e44848c1d087f3fdf38a5aafd6 100644 --- a/pkgs/development/libraries/haskell/cabal-macosx/default.nix +++ b/pkgs/development/libraries/haskell/cabal-macosx/default.nix @@ -12,9 +12,6 @@ cabal.mkDerivation (self: { description = "Cabal support for creating Mac OSX application bundles"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/cairo/default.nix b/pkgs/development/libraries/haskell/cairo/default.nix index 35b11decc43cc4d00e60f4ab895b1099ffe6385b..59126959bfb58f6e0e1865fc447dcaeed87132ec 100644 --- a/pkgs/development/libraries/haskell/cairo/default.nix +++ b/pkgs/development/libraries/haskell/cairo/default.nix @@ -13,9 +13,6 @@ cabal.mkDerivation (self: { description = "Binding to the Cairo library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/carray/default.nix b/pkgs/development/libraries/haskell/carray/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..7fa22dfa2eb1762c362d9a9c8c5785d841503b87 --- /dev/null +++ b/pkgs/development/libraries/haskell/carray/default.nix @@ -0,0 +1,13 @@ +{ cabal, binary, ixShapable, syb }: + +cabal.mkDerivation (self: { + pname = "carray"; + version = "0.1.5.2"; + sha256 = "0kjqxjnamhnpjjf2bgm1gnsy6jx1fjbn5mx394pyx1vq3lkfgfb0"; + buildDepends = [ binary ixShapable syb ]; + meta = { + description = "A C-compatible array library"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/case-insensitive/1.0.0.1.nix b/pkgs/development/libraries/haskell/case-insensitive/1.0.0.1.nix new file mode 100644 index 0000000000000000000000000000000000000000..b5fe61c13cb6dbd888da7bcdf6e486cf3e80d0ec --- /dev/null +++ b/pkgs/development/libraries/haskell/case-insensitive/1.0.0.1.nix @@ -0,0 +1,17 @@ +{ cabal, deepseq, hashable, HUnit, testFramework +, testFrameworkHunit, text +}: + +cabal.mkDerivation (self: { + pname = "case-insensitive"; + version = "1.0.0.1"; + sha256 = "1yp8895qvxcmai0hvxdq77qss9cia2f9fyn6rm0hln3rcx8n53xm"; + buildDepends = [ deepseq hashable text ]; + testDepends = [ HUnit testFramework testFrameworkHunit text ]; + meta = { + homepage = "https://github.com/basvandijk/case-insensitive"; + description = "Case insensitive string comparison"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/case-insensitive/default.nix b/pkgs/development/libraries/haskell/case-insensitive/1.0.0.2.nix similarity index 83% rename from pkgs/development/libraries/haskell/case-insensitive/default.nix rename to pkgs/development/libraries/haskell/case-insensitive/1.0.0.2.nix index 44aaef29cea5144a25adad88d20139e410503f33..083fa7df37033d30e270563c079a1407b6cd0ca2 100644 --- a/pkgs/development/libraries/haskell/case-insensitive/default.nix +++ b/pkgs/development/libraries/haskell/case-insensitive/1.0.0.2.nix @@ -13,9 +13,5 @@ cabal.mkDerivation (self: { description = "Case insensitive string comparison"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; }; }) diff --git a/pkgs/development/libraries/haskell/cautious-file/default.nix b/pkgs/development/libraries/haskell/cautious-file/default.nix index 711e6a152596038de4508e9cac4dfc96d500b939..44ed255bb634f36383aa82c89713bc2591cc9f61 100644 --- a/pkgs/development/libraries/haskell/cautious-file/default.nix +++ b/pkgs/development/libraries/haskell/cautious-file/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Ways to write a file cautiously, to reduce the chances of problems such as data loss due to crashes or power failures"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/cereal-conduit/default.nix b/pkgs/development/libraries/haskell/cereal-conduit/default.nix index c322ef8b54f41ad5cbee4daa29efc73d6fddd41d..464e8dbb5e7670696ecbedbdda11823fe717addb 100644 --- a/pkgs/development/libraries/haskell/cereal-conduit/default.nix +++ b/pkgs/development/libraries/haskell/cereal-conduit/default.nix @@ -11,6 +11,5 @@ cabal.mkDerivation (self: { description = "Turn Data.Serialize Gets and Puts into Sources, Sinks, and Conduits"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/cereal/default.nix b/pkgs/development/libraries/haskell/cereal/default.nix index 8e8202d9c5e600186194add8c979dd2fe99bee84..a28ea11c511e40cf530c5d3d37a65a51a08a6ca1 100644 --- a/pkgs/development/libraries/haskell/cereal/default.nix +++ b/pkgs/development/libraries/haskell/cereal/default.nix @@ -8,9 +8,6 @@ cabal.mkDerivation (self: { description = "A binary serialization library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/certificate/default.nix b/pkgs/development/libraries/haskell/certificate/default.nix index 168ccb113b632d50c1952941e76e7867aaa6a09f..1de453b27efef6313e1f94fa04320841675807dc 100644 --- a/pkgs/development/libraries/haskell/certificate/default.nix +++ b/pkgs/development/libraries/haskell/certificate/default.nix @@ -16,9 +16,6 @@ cabal.mkDerivation (self: { description = "Certificates and Key Reader/Writer"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.7.1.nix b/pkgs/development/libraries/haskell/cgi/3001.1.7.1.nix index 9cb92640ee45159f30708ef1724457723e7c261b..60669590c2f9b21cd1c4c05ac74cbccc7dfdf97c 100644 --- a/pkgs/development/libraries/haskell/cgi/3001.1.7.1.nix +++ b/pkgs/development/libraries/haskell/cgi/3001.1.7.1.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "A library for writing CGI programs"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.7.2.nix b/pkgs/development/libraries/haskell/cgi/3001.1.7.2.nix index 7e91e25209eeb3d86ee37678fe8166117907e87c..bf1920d434dfd7dd63a232fe4f486fe18db4b605 100644 --- a/pkgs/development/libraries/haskell/cgi/3001.1.7.2.nix +++ b/pkgs/development/libraries/haskell/cgi/3001.1.7.2.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "A library for writing CGI programs"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.7.3.nix b/pkgs/development/libraries/haskell/cgi/3001.1.7.3.nix index 0c1f8d709c3b9fb31e391916cee5da80f04011be..c1dc7076c77dd514ba4819e5e8f42a44c1c7b43d 100644 --- a/pkgs/development/libraries/haskell/cgi/3001.1.7.3.nix +++ b/pkgs/development/libraries/haskell/cgi/3001.1.7.3.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "A library for writing CGI programs"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.7.4.nix b/pkgs/development/libraries/haskell/cgi/3001.1.7.4.nix index 3621b1fac1b83e62e79e430163ee05dd59e3eaca..97e5556bacd5fab36657f5e9542aef6b097a2bea 100644 --- a/pkgs/development/libraries/haskell/cgi/3001.1.7.4.nix +++ b/pkgs/development/libraries/haskell/cgi/3001.1.7.4.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "A library for writing CGI programs"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.8.4.nix b/pkgs/development/libraries/haskell/cgi/3001.1.8.4.nix index 4f5fed76b416bd5e4ca622eeb0d6f3463e10d0f4..d2d899180860df3fe76a8a0f768ca34d822088b8 100644 --- a/pkgs/development/libraries/haskell/cgi/3001.1.8.4.nix +++ b/pkgs/development/libraries/haskell/cgi/3001.1.8.4.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "A library for writing CGI programs"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/cipher-aes/default.nix b/pkgs/development/libraries/haskell/cipher-aes/default.nix index 53aa634aa72e0d45ccd812553af4f10c2e2bfe5b..e27f203306e28e8fb3fa27944af8ad2af22a72e0 100644 --- a/pkgs/development/libraries/haskell/cipher-aes/default.nix +++ b/pkgs/development/libraries/haskell/cipher-aes/default.nix @@ -12,6 +12,5 @@ cabal.mkDerivation (self: { description = "Fast AES cipher implementation with advanced mode of operations"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/cipher-rc4/default.nix b/pkgs/development/libraries/haskell/cipher-rc4/default.nix index 1563efa125b8c5b0613804f91f3b23fca31dd3ab..7d3cacdd67a9deea69444e3bae17a37628d3fd65 100644 --- a/pkgs/development/libraries/haskell/cipher-rc4/default.nix +++ b/pkgs/development/libraries/haskell/cipher-rc4/default.nix @@ -12,6 +12,5 @@ cabal.mkDerivation (self: { description = "Fast RC4 cipher implementation"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/circle-packing/default.nix b/pkgs/development/libraries/haskell/circle-packing/default.nix index a8ca3c699cc407cd86956589d4fe50689d472e5e..bffc72cf73e0b962725cb2698a5c1a94a2ed689c 100644 --- a/pkgs/development/libraries/haskell/circle-packing/default.nix +++ b/pkgs/development/libraries/haskell/circle-packing/default.nix @@ -8,6 +8,5 @@ cabal.mkDerivation (self: { description = "Simple heuristic for packing discs of varying radii in a circle"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/citeproc-hs/default.nix b/pkgs/development/libraries/haskell/citeproc-hs/default.nix index b55e20d91c54509381e6e7066704ffe10f9b6587..2c68fd24d1fab0881b09f050d442ab1f740135c4 100644 --- a/pkgs/development/libraries/haskell/citeproc-hs/default.nix +++ b/pkgs/development/libraries/haskell/citeproc-hs/default.nix @@ -15,9 +15,6 @@ cabal.mkDerivation (self: { description = "A Citation Style Language implementation in Haskell"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix b/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix index c3e4619c72fa2e8b3f2fcb33ebf98a395eb9cfb2..c04b4dfc25e1134369f3bbe5992f1d932ca5326c 100644 --- a/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix +++ b/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix @@ -16,6 +16,5 @@ cabal.mkDerivation (self: { description = "conduit instances for classy-prelude"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/classy-prelude/default.nix b/pkgs/development/libraries/haskell/classy-prelude/default.nix index 9c830545f763fa38be40f2129a2755c1a9c189b0..51a2d6c55bad6edb682c5abfd0fce7c70f6140e8 100644 --- a/pkgs/development/libraries/haskell/classy-prelude/default.nix +++ b/pkgs/development/libraries/haskell/classy-prelude/default.nix @@ -1,14 +1,15 @@ -{ cabal, basicPrelude, hashable, hspec, liftedBase, QuickCheck -, systemFilepath, text, transformers, unorderedContainers, vector +{ cabal, basicPrelude, hashable, hspec, liftedBase, monadControl +, QuickCheck, systemFilepath, text, transformers +, unorderedContainers, vector }: cabal.mkDerivation (self: { pname = "classy-prelude"; - version = "0.5.4"; - sha256 = "1p30f1inp0kj2dsvqnxaplxl83kd8bv41jmszvbdbf3vijjpk6kr"; + version = "0.5.7"; + sha256 = "1wq8la7nq3dh21yqwcjhwgy5s5mpqlvmrfma48v8ch6w4wwb0sqz"; buildDepends = [ - basicPrelude hashable liftedBase systemFilepath text transformers - unorderedContainers vector + basicPrelude hashable liftedBase monadControl systemFilepath text + transformers unorderedContainers vector ]; testDepends = [ hspec QuickCheck transformers ]; meta = { @@ -16,6 +17,5 @@ cabal.mkDerivation (self: { description = "A typeclass-based Prelude"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/clientsession/default.nix b/pkgs/development/libraries/haskell/clientsession/default.nix index 83cf8e57a682722411ca1c22d2f5325fd7853172..e670ff1a3d14e490e38ed0f88de40c24ee736d2b 100644 --- a/pkgs/development/libraries/haskell/clientsession/default.nix +++ b/pkgs/development/libraries/haskell/clientsession/default.nix @@ -16,9 +16,6 @@ cabal.mkDerivation (self: { description = "Securely store session data in a client-side cookie"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/cmdargs/default.nix b/pkgs/development/libraries/haskell/cmdargs/default.nix index df9f7f5865f020c73aba31f5fa639a7ccf725377..dfaed86b9af0e106751df30b9534b3027c6d43c4 100644 --- a/pkgs/development/libraries/haskell/cmdargs/default.nix +++ b/pkgs/development/libraries/haskell/cmdargs/default.nix @@ -12,9 +12,6 @@ cabal.mkDerivation (self: { description = "Command line argument processing"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/cmdlib/default.nix b/pkgs/development/libraries/haskell/cmdlib/default.nix index 7b29ba5800463ce639237d4ac66606bd669b9200..0a71649f0e91197e59f74e31e9b4ff3d906d008e 100644 --- a/pkgs/development/libraries/haskell/cmdlib/default.nix +++ b/pkgs/development/libraries/haskell/cmdlib/default.nix @@ -11,9 +11,6 @@ cabal.mkDerivation (self: { description = "a library for command line parsing & online help"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/colorize-haskell/default.nix b/pkgs/development/libraries/haskell/colorize-haskell/default.nix index 702ddd0b9ec68979b15d56cc9835bbe8082b79c3..fa2b98801233d1a99a479b8554091e7b819abf19 100644 --- a/pkgs/development/libraries/haskell/colorize-haskell/default.nix +++ b/pkgs/development/libraries/haskell/colorize-haskell/default.nix @@ -12,9 +12,6 @@ cabal.mkDerivation (self: { description = "Highligt Haskell source"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/colour/default.nix b/pkgs/development/libraries/haskell/colour/default.nix index 7f4fde5ef9707093170d30af140e552d163a1d18..06bcc8ed98190c56888044ee571f04d184fd3623 100644 --- a/pkgs/development/libraries/haskell/colour/default.nix +++ b/pkgs/development/libraries/haskell/colour/default.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "A model for human colour/color perception"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/comonad-transformers/default.nix b/pkgs/development/libraries/haskell/comonad-transformers/default.nix index 0d754ec4308ce4d8371335c2e5ed062b42d6474c..99c4016947dbafdd5f5bde6c67e4650d5db95caa 100644 --- a/pkgs/development/libraries/haskell/comonad-transformers/default.nix +++ b/pkgs/development/libraries/haskell/comonad-transformers/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "comonad-transformers"; - version = "3.0.1"; - sha256 = "1lmcz01zsgy0lfzsznqbdq83vlk6h10zs7i41nav8qhzzhjn095j"; + version = "3.0.2"; + sha256 = "1910hqp7f03p44alxm4dm8i4wikf0b60hmm85yrhbq02kcr3379d"; buildDepends = [ comonad contravariant distributive semigroupoids semigroups transformers @@ -15,6 +15,5 @@ cabal.mkDerivation (self: { description = "Comonad transformers"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/comonad/default.nix b/pkgs/development/libraries/haskell/comonad/default.nix index 61d0823141d275b7b81feaa2ddd7e6313b51fcc9..7e11886fc5824feaf3dc6f82063a74d2ff69f6c6 100644 --- a/pkgs/development/libraries/haskell/comonad/default.nix +++ b/pkgs/development/libraries/haskell/comonad/default.nix @@ -11,6 +11,5 @@ cabal.mkDerivation (self: { description = "Haskell 98 compatible comonads"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/comonads-fd/default.nix b/pkgs/development/libraries/haskell/comonads-fd/default.nix index f09d488fa6c202ec1c8be4cb4b96a5b979862774..5921d8b07d39a90611ca26cf1ea2ec74768bfaa9 100644 --- a/pkgs/development/libraries/haskell/comonads-fd/default.nix +++ b/pkgs/development/libraries/haskell/comonads-fd/default.nix @@ -14,6 +14,5 @@ cabal.mkDerivation (self: { description = "Comonad transformers using functional dependencies"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/compact-string-fix/default.nix b/pkgs/development/libraries/haskell/compact-string-fix/default.nix index 416826298bb481d0fde7574ea6084ea5ea6dc751..fb0b6a1f1cbaa6a5fff1f43880d4dd3775911cde 100644 --- a/pkgs/development/libraries/haskell/compact-string-fix/default.nix +++ b/pkgs/development/libraries/haskell/compact-string-fix/default.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Same as compact-string except with a small fix so it builds on ghc-6.12"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/concurrent-extra/default.nix b/pkgs/development/libraries/haskell/concurrent-extra/default.nix index 0a36b3e9b736c3def723fc997a7e397126411a84..db380f03b5bdfd57bb8d8992d884c9854b8970d4 100644 --- a/pkgs/development/libraries/haskell/concurrent-extra/default.nix +++ b/pkgs/development/libraries/haskell/concurrent-extra/default.nix @@ -16,6 +16,5 @@ cabal.mkDerivation (self: { description = "Extra concurrency primitives"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix index cf4c17ceb459239818e47f4070dbb0d0b91d96c6..983c41f57c9d2c9b1a708c4b73fdd009cc8483b2 100644 --- a/pkgs/development/libraries/haskell/conduit/default.nix +++ b/pkgs/development/libraries/haskell/conduit/default.nix @@ -18,9 +18,6 @@ cabal.mkDerivation (self: { description = "Streaming data processing library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/configurator/default.nix b/pkgs/development/libraries/haskell/configurator/default.nix index 558a8935c04fb3b77d42f9b48448cbc27140be28..775c2e5027f81fe74a50ee8d95128c82a344d0c7 100644 --- a/pkgs/development/libraries/haskell/configurator/default.nix +++ b/pkgs/development/libraries/haskell/configurator/default.nix @@ -14,6 +14,5 @@ cabal.mkDerivation (self: { description = "Configuration management"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/constraints/default.nix b/pkgs/development/libraries/haskell/constraints/default.nix index 86690db7162c5abf3bf50412f464c54aeb187c4a..0fe2cb8864a6db4272caf17b772380d1caa8bb99 100644 --- a/pkgs/development/libraries/haskell/constraints/default.nix +++ b/pkgs/development/libraries/haskell/constraints/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Constraint manipulation"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/continued-fractions/default.nix b/pkgs/development/libraries/haskell/continued-fractions/default.nix index 26b683c19696d8b7b920cd82c74f35008a16519d..095d0a179846041ea83fbe03d7782a15eee7da40 100644 --- a/pkgs/development/libraries/haskell/continued-fractions/default.nix +++ b/pkgs/development/libraries/haskell/continued-fractions/default.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Continued fractions"; license = self.stdenv.lib.licenses.publicDomain; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/contravariant/default.nix b/pkgs/development/libraries/haskell/contravariant/default.nix index e09043519a8680fb940a0d697b70565b0464add8..2c967d26085ad09a61a0d149e2ebbfa35b58708b 100644 --- a/pkgs/development/libraries/haskell/contravariant/default.nix +++ b/pkgs/development/libraries/haskell/contravariant/default.nix @@ -10,6 +10,5 @@ cabal.mkDerivation (self: { description = "Haskell 98 contravariant functors"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/converge/default.nix b/pkgs/development/libraries/haskell/converge/default.nix index 6c128285285167a8bc4c0d1e857dc0ea87388bd1..50d95cb88511d62f95ea2fe72e2f36287d93668f 100644 --- a/pkgs/development/libraries/haskell/converge/default.nix +++ b/pkgs/development/libraries/haskell/converge/default.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Limit operations for converging sequences"; license = self.stdenv.lib.licenses.publicDomain; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/convertible/default.nix b/pkgs/development/libraries/haskell/convertible/default.nix index a3fa0208e2d07512791911cb3438c5b24a696885..8a79e50527d8f10e998c35d41bb53c4482d0a0df 100644 --- a/pkgs/development/libraries/haskell/convertible/default.nix +++ b/pkgs/development/libraries/haskell/convertible/default.nix @@ -12,9 +12,6 @@ cabal.mkDerivation (self: { description = "Typeclasses and instances for converting between types"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/cookie/default.nix b/pkgs/development/libraries/haskell/cookie/default.nix index 06cdf62e53cc36d677d85c46f71793e4bd6ac5e3..b7dae5d4a9b11e25c2db64177b750a0585a83c3a 100644 --- a/pkgs/development/libraries/haskell/cookie/default.nix +++ b/pkgs/development/libraries/haskell/cookie/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "HTTP cookie parsing and rendering"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/cprng-aes/default.nix b/pkgs/development/libraries/haskell/cprng-aes/default.nix index 2d8989437fb8ab0267fddace815c571aae6a81fb..4f2aa58b7d29c504720ad018a346b575cfde2a88 100644 --- a/pkgs/development/libraries/haskell/cprng-aes/default.nix +++ b/pkgs/development/libraries/haskell/cprng-aes/default.nix @@ -12,9 +12,6 @@ cabal.mkDerivation (self: { description = "Crypto Pseudo Random Number Generator using AES in counter mode"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/cpu/default.nix b/pkgs/development/libraries/haskell/cpu/default.nix index 3187036539e06236ce925d42da696805023d544d..dc27553c2a3b7a28e01a3ac8977d4a954ae775ea 100644 --- a/pkgs/development/libraries/haskell/cpu/default.nix +++ b/pkgs/development/libraries/haskell/cpu/default.nix @@ -11,9 +11,6 @@ cabal.mkDerivation (self: { description = "Cpu information and properties helpers"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/criterion/default.nix b/pkgs/development/libraries/haskell/criterion/default.nix index 5a722ea4fabe5d8658ad27321b4b56548a4bf352..004f74cd7e7f1b0226f2d978b03f551d137bc0c2 100644 --- a/pkgs/development/libraries/haskell/criterion/default.nix +++ b/pkgs/development/libraries/haskell/criterion/default.nix @@ -15,9 +15,6 @@ cabal.mkDerivation (self: { description = "Robust, reliable performance measurement and analysis"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/crypto-api/default.nix b/pkgs/development/libraries/haskell/crypto-api/default.nix index a888b0e6242dc74eaf3edde1b4690aadd1a013b8..23fdd553f9e73ed0c09aef5837790fcbebf1a475 100644 --- a/pkgs/development/libraries/haskell/crypto-api/default.nix +++ b/pkgs/development/libraries/haskell/crypto-api/default.nix @@ -2,18 +2,14 @@ cabal.mkDerivation (self: { pname = "crypto-api"; - version = "0.12"; - sha256 = "09ra5bz2s5n2zq57n6ylsj7a482bsxpxhybmp04g796h87xgy7xs"; + version = "0.12.2.1"; + sha256 = "03hbjjrwnpa4ji2ig458s0c4g13r566sl6fs3hciwyf6cfq597wk"; buildDepends = [ cereal entropy tagged transformers ]; - jailbreak = true; meta = { homepage = "https://github.com/TomMD/crypto-api"; description = "A generic interface for cryptographic operations"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/crypto-conduit/default.nix b/pkgs/development/libraries/haskell/crypto-conduit/default.nix index b7624499dd36e972c7fef04bcb41fe54f397edc1..61d6bcbeabeadfcdd4ba143eef6fa56fbe613743 100644 --- a/pkgs/development/libraries/haskell/crypto-conduit/default.nix +++ b/pkgs/development/libraries/haskell/crypto-conduit/default.nix @@ -17,9 +17,6 @@ cabal.mkDerivation (self: { description = "Conduit interface for cryptographic operations (from crypto-api)"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/crypto-numbers/default.nix b/pkgs/development/libraries/haskell/crypto-numbers/default.nix index 99665c22df2e7b4de833e649918f2672804b2ec8..af6985cd9ede3ab7966840b43ac59ac686400217 100644 --- a/pkgs/development/libraries/haskell/crypto-numbers/default.nix +++ b/pkgs/development/libraries/haskell/crypto-numbers/default.nix @@ -16,6 +16,5 @@ cabal.mkDerivation (self: { description = "Cryptographic numbers: functions and algorithms"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix b/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix index 5ccb1e7e0ce7c4fc4f95680afc774d0aa589dfaa..38024a24c5468356124bfa2a109ce699b8cad51c 100644 --- a/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix +++ b/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Generic cryptography Public keys algorithm types"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/crypto-pubkey/default.nix b/pkgs/development/libraries/haskell/crypto-pubkey/default.nix index 3db4dc2b9c18efe206144cbdb50fc5de62b04622..48af6182c6446430a3c75f01c241d8b827240f48 100644 --- a/pkgs/development/libraries/haskell/crypto-pubkey/default.nix +++ b/pkgs/development/libraries/haskell/crypto-pubkey/default.nix @@ -19,6 +19,5 @@ cabal.mkDerivation (self: { description = "Public Key cryptography"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/crypto-random-api/default.nix b/pkgs/development/libraries/haskell/crypto-random-api/default.nix index c3b10cbe329e83d1ff50eac7d9e39d7eed758869..7c3b10a383866dae57a0c8dcd72b78b7b8c46470 100644 --- a/pkgs/development/libraries/haskell/crypto-random-api/default.nix +++ b/pkgs/development/libraries/haskell/crypto-random-api/default.nix @@ -10,6 +10,5 @@ cabal.mkDerivation (self: { description = "Simple random generators API for cryptography related code"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/cryptocipher/default.nix b/pkgs/development/libraries/haskell/cryptocipher/default.nix index 0aff493ac874ca64e1b6c35cef7703896cbfc453..50935a77a64e2166381c659687e2d89592e458ca 100644 --- a/pkgs/development/libraries/haskell/cryptocipher/default.nix +++ b/pkgs/development/libraries/haskell/cryptocipher/default.nix @@ -21,9 +21,6 @@ cabal.mkDerivation (self: { description = "Symmetrical block and stream ciphers"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/cryptohash/default.nix b/pkgs/development/libraries/haskell/cryptohash/default.nix index 1ce1a46fc40bd5c4bbd65b29c406eeb936c5918f..97f74e8053001eb2905de3c87bbc6ac3aec89ae2 100644 --- a/pkgs/development/libraries/haskell/cryptohash/default.nix +++ b/pkgs/development/libraries/haskell/cryptohash/default.nix @@ -16,9 +16,6 @@ cabal.mkDerivation (self: { description = "collection of crypto hashes, fast, pure and practical"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/css-text/default.nix b/pkgs/development/libraries/haskell/css-text/default.nix index 64dadbb4e4cab0d4d5e01d28051bb0bbf954d28c..f59a80b2b65a80b830cde08a303aa00b87ee2057 100644 --- a/pkgs/development/libraries/haskell/css-text/default.nix +++ b/pkgs/development/libraries/haskell/css-text/default.nix @@ -11,9 +11,6 @@ cabal.mkDerivation (self: { description = "CSS parser and renderer"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/csv/default.nix b/pkgs/development/libraries/haskell/csv/default.nix index ae149be79dac911e2ff78af2b67579bcf8251cfb..f56a9b89423c05668a31203f9942c62e7c5fcc28 100644 --- a/pkgs/development/libraries/haskell/csv/default.nix +++ b/pkgs/development/libraries/haskell/csv/default.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "CSV loader and dumper"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/cuda/0.4.1.1.nix b/pkgs/development/libraries/haskell/cuda/0.4.1.1.nix deleted file mode 100644 index 00b6ae2a406ce5018dec0062dfbb87e1c7854e57..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/haskell/cuda/0.4.1.1.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ cabal, c2hs, cudatoolkit, extensibleExceptions, nvidia_x11 }: - -cabal.mkDerivation (self: { - pname = "cuda"; - version = "0.4.1.1"; - sha256 = "05hhlnfyr30r1frsc15px38ijd1qvs125yjxvsi6q1kmmkq1w6y9"; - buildDepends = [ extensibleExceptions ]; - buildTools = [ c2hs ]; - extraLibraries = [ cudatoolkit nvidia_x11 self.stdenv.gcc ]; - doCheck = false; - # Perhaps this should be the default in cabal.nix ... - # - # The cudatoolkit provides both 64 and 32-bit versions of the - # library. GHC's linker fails if the wrong version is found first. - # We solve this by eliminating lib64 from the path on 32-bit - # platforms and putting lib64 first on 64-bit platforms. - libPaths = if self.stdenv.is64bit then "lib64 lib" else "lib"; - configurePhase = '' - for i in Setup.hs Setup.lhs; do - test -f $i && ghc --make $i - done - for p in $extraBuildInputs $propagatedNativeBuildInputs; do - if [ -d "$p/include" ]; then - extraLibDirs="$extraLibDirs --extra-include-dir=$p/include" - fi - for d in $libPaths; do - if [ -d "$p/$d" ]; then - extraLibDirs="$extraLibDirs --extra-lib-dir=$p/$d" - fi - done - done - ./Setup configure --verbose --prefix="$out" $libraryProfiling $extraLibDirs $configureFlags - ''; - meta = { - description = "FFI binding to the CUDA interface for programming NVIDIA GPUs"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.stdenv.lib.platforms.none; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/cuda/0.5.0.2.nix b/pkgs/development/libraries/haskell/cuda/default.nix similarity index 92% rename from pkgs/development/libraries/haskell/cuda/0.5.0.2.nix rename to pkgs/development/libraries/haskell/cuda/default.nix index 38ac1db8194c79c724e161347892df7f6f81a130..ac9e41fd628fcdeb050ae00ddef91bf2225ad2fc 100644 --- a/pkgs/development/libraries/haskell/cuda/0.5.0.2.nix +++ b/pkgs/development/libraries/haskell/cuda/default.nix @@ -34,9 +34,6 @@ cabal.mkDerivation (self: { description = "FFI binding to the CUDA interface for programming NVIDIA GPUs"; license = self.stdenv.lib.licenses.bsd3; platforms = self.stdenv.lib.platforms.none; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/cufft/default.nix b/pkgs/development/libraries/haskell/cufft/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..76039f065488e7c8ce224ee66612d2647dc10f68 --- /dev/null +++ b/pkgs/development/libraries/haskell/cufft/default.nix @@ -0,0 +1,15 @@ +{ cabal, c2hs, cuda }: + +cabal.mkDerivation (self: { + pname = "cufft"; + version = "0.1.0.1"; + sha256 = "0j1rsixl48z8xszym9s3rw4pwq4s5bz6inqkfsq726gni0nlm8vx"; + buildDepends = [ cuda ]; + buildTools = [ c2hs ]; + meta = { + homepage = "http://github.com/robeverest/cufft"; + description = "Haskell bindings for the CUFFT library"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/curl/default.nix b/pkgs/development/libraries/haskell/curl/default.nix index 3842707c613b95b364fb4850dc6cf16aa212665d..a530044ca6ede169bed64d7d68ce57ffe25a9c0c 100644 --- a/pkgs/development/libraries/haskell/curl/default.nix +++ b/pkgs/development/libraries/haskell/curl/default.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Haskell binding to libcurl"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/data-accessor/data-accessor-template.nix b/pkgs/development/libraries/haskell/data-accessor/data-accessor-template.nix index 9f0e1c11c8517c9f5776a0547217d90ad84dc385..41bd2347012490173193c4068883434b090b2fcf 100644 --- a/pkgs/development/libraries/haskell/data-accessor/data-accessor-template.nix +++ b/pkgs/development/libraries/haskell/data-accessor/data-accessor-template.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Utilities for accessing and manipulating fields of records"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/data-accessor/data-accessor-transformers.nix b/pkgs/development/libraries/haskell/data-accessor/data-accessor-transformers.nix index 078234c19c423226f95d11393ac18cc9aa2d4f50..83712b858c25aa7a71f20ca78a15d215f799a6d4 100644 --- a/pkgs/development/libraries/haskell/data-accessor/data-accessor-transformers.nix +++ b/pkgs/development/libraries/haskell/data-accessor/data-accessor-transformers.nix @@ -10,6 +10,5 @@ cabal.mkDerivation (self: { description = "Use Accessor to access state in transformers State monad"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix b/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix index 29038616a8bffb64765d430e5727baf804d2c52c..7c1de10b20b0e8275a03ff8ea881d871cea54d4f 100644 --- a/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix +++ b/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Utilities for accessing and manipulating fields of records"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/data-binary-ieee754/default.nix b/pkgs/development/libraries/haskell/data-binary-ieee754/default.nix index b91dc6d052335be59660802055933425570b7474..5066a83c5f6059b8ea708c54c632e190c951837a 100644 --- a/pkgs/development/libraries/haskell/data-binary-ieee754/default.nix +++ b/pkgs/development/libraries/haskell/data-binary-ieee754/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Parser/Serialiser for IEEE-754 floating-point values"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/data-default-class/default.nix b/pkgs/development/libraries/haskell/data-default-class/default.nix index 8f99c0143cd59f7be2daea657fe97533de1a3cc8..1db4468a6ded0f9432085cd59b34d9dec8c7afc6 100644 --- a/pkgs/development/libraries/haskell/data-default-class/default.nix +++ b/pkgs/development/libraries/haskell/data-default-class/default.nix @@ -8,6 +8,5 @@ cabal.mkDerivation (self: { description = "A class for types with a default value"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/data-default-instances-base/default.nix b/pkgs/development/libraries/haskell/data-default-instances-base/default.nix index b8b8494550c8064a7be4f88949a2da60be163df9..5fc59b232a4d266791c7c31ca5ae4fea20de9f5b 100644 --- a/pkgs/development/libraries/haskell/data-default-instances-base/default.nix +++ b/pkgs/development/libraries/haskell/data-default-instances-base/default.nix @@ -9,6 +9,5 @@ cabal.mkDerivation (self: { description = "Default instances for types in base"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/data-default-instances-containers/default.nix b/pkgs/development/libraries/haskell/data-default-instances-containers/default.nix index 98590fa795b0a8fa5851b2ccc2fd5b5dc89e4a24..6ac626b7079261cdecac243dd5d3869685893354 100644 --- a/pkgs/development/libraries/haskell/data-default-instances-containers/default.nix +++ b/pkgs/development/libraries/haskell/data-default-instances-containers/default.nix @@ -9,6 +9,5 @@ cabal.mkDerivation (self: { description = "Default instances for types in containers"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/data-default-instances-dlist/default.nix b/pkgs/development/libraries/haskell/data-default-instances-dlist/default.nix index 1fa64003f95484677d403c8119876018f6b3b9eb..a89da0c84f5b38ea31a3d5b692beaf676c04d4cf 100644 --- a/pkgs/development/libraries/haskell/data-default-instances-dlist/default.nix +++ b/pkgs/development/libraries/haskell/data-default-instances-dlist/default.nix @@ -9,6 +9,5 @@ cabal.mkDerivation (self: { description = "Default instances for types in dlist"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/data-default-instances-old-locale/default.nix b/pkgs/development/libraries/haskell/data-default-instances-old-locale/default.nix index e8647898d9dd36f23dfb19177d587a1e9b52bdbd..b1b7742692a75838860a3e2a69eb11bd973844c5 100644 --- a/pkgs/development/libraries/haskell/data-default-instances-old-locale/default.nix +++ b/pkgs/development/libraries/haskell/data-default-instances-old-locale/default.nix @@ -9,6 +9,5 @@ cabal.mkDerivation (self: { description = "Default instances for types in old-locale"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/data-default/default.nix b/pkgs/development/libraries/haskell/data-default/default.nix index 31e3f74231037ced023f1ffc6d3231e87e3c59e8..e4340c7ec3228a189d2e84e1f5a512cbed77d80f 100644 --- a/pkgs/development/libraries/haskell/data-default/default.nix +++ b/pkgs/development/libraries/haskell/data-default/default.nix @@ -16,9 +16,6 @@ cabal.mkDerivation (self: { description = "A class for types with a default value"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/data-inttrie/default.nix b/pkgs/development/libraries/haskell/data-inttrie/default.nix index b23fdeca69d831b4c3a545d1c5d4b2ba8b286276..ec3cf7ca64951064b8d645af3b99199d4961c418 100644 --- a/pkgs/development/libraries/haskell/data-inttrie/default.nix +++ b/pkgs/development/libraries/haskell/data-inttrie/default.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "A lazy, infinite trie of integers"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/data-lens-template/default.nix b/pkgs/development/libraries/haskell/data-lens-template/default.nix index 208f021e8af4ac85a6111d8c777a07e5b29a863b..7ba9e3f9da74f25c79990c308353ce56f917357b 100644 --- a/pkgs/development/libraries/haskell/data-lens-template/default.nix +++ b/pkgs/development/libraries/haskell/data-lens-template/default.nix @@ -10,6 +10,5 @@ cabal.mkDerivation (self: { description = "Utilities for Data.Lens"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/data-lens/default.nix b/pkgs/development/libraries/haskell/data-lens/default.nix index 8e3a8b40751da55114fdc3bfee775ed9b4bb595d..e4cff67f3761c29627761215d259b20735ed65f1 100644 --- a/pkgs/development/libraries/haskell/data-lens/default.nix +++ b/pkgs/development/libraries/haskell/data-lens/default.nix @@ -13,6 +13,5 @@ cabal.mkDerivation (self: { description = "Haskell 98 Lenses"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/data-memocombinators/default.nix b/pkgs/development/libraries/haskell/data-memocombinators/default.nix index 5c4c3cbeaf009b318dd6c6f09b2ab0db6cc98686..2b3adde1d728b3dd17645a6262aa9bf2e7b34571 100644 --- a/pkgs/development/libraries/haskell/data-memocombinators/default.nix +++ b/pkgs/development/libraries/haskell/data-memocombinators/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Combinators for building memo tables"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/data-reify/default.nix b/pkgs/development/libraries/haskell/data-reify/default.nix index 2618ef6a6906995c9051eb28a8eeac12822399d5..6599d25f68eb238624bca147a8eeabe410b33e0e 100644 --- a/pkgs/development/libraries/haskell/data-reify/default.nix +++ b/pkgs/development/libraries/haskell/data-reify/default.nix @@ -11,9 +11,6 @@ cabal.mkDerivation (self: { description = "Reify a recursive data structure into an explicit graph"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/dataenc/default.nix b/pkgs/development/libraries/haskell/dataenc/default.nix index fa9287e6f075d6b578b2eb9f5ecac4b637cef345..9c4de4a1b84d30e12b5c063acb1f412f136e658f 100644 --- a/pkgs/development/libraries/haskell/dataenc/default.nix +++ b/pkgs/development/libraries/haskell/dataenc/default.nix @@ -11,9 +11,6 @@ cabal.mkDerivation (self: { description = "Data encoding library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/date-cache/default.nix b/pkgs/development/libraries/haskell/date-cache/default.nix index b672e797fa06e49ee47e4e942fb5fdae78436b5b..a460dcbdafc509e5fc22b11c74521adecceff021 100644 --- a/pkgs/development/libraries/haskell/date-cache/default.nix +++ b/pkgs/development/libraries/haskell/date-cache/default.nix @@ -8,6 +8,5 @@ cabal.mkDerivation (self: { description = "Date cacher"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/datetime/default.nix b/pkgs/development/libraries/haskell/datetime/default.nix index 72f3d1c937f3a72d1b8c53363182da5bd89c29ed..faf0b40b94d195a64331eb42a28e25db8d1f1476 100644 --- a/pkgs/development/libraries/haskell/datetime/default.nix +++ b/pkgs/development/libraries/haskell/datetime/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Utilities to make Data.Time.* easier to use."; license = "GPL"; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/dbus/default.nix b/pkgs/development/libraries/haskell/dbus/default.nix index 26306eccfcb6efa4da1c9e83d24de0e64b3783af..16cb2c7ca03315332c7d55ca25c16ff377a5c8d1 100644 --- a/pkgs/development/libraries/haskell/dbus/default.nix +++ b/pkgs/development/libraries/haskell/dbus/default.nix @@ -15,6 +15,5 @@ cabal.mkDerivation (self: { description = "A client library for the D-Bus IPC system"; license = self.stdenv.lib.licenses.gpl3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/deepseq-th/default.nix b/pkgs/development/libraries/haskell/deepseq-th/default.nix index b65ddb5e786e5df5a29c4db0d6727729cd3b1957..228fcd28c7857ef5124c8e603edcd1680e2c47bb 100644 --- a/pkgs/development/libraries/haskell/deepseq-th/default.nix +++ b/pkgs/development/libraries/haskell/deepseq-th/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Template Haskell based deriver for optimised NFData instances"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/deepseq/1.1.0.0.nix b/pkgs/development/libraries/haskell/deepseq/1.1.0.0.nix index 2c61618cd08128ae52c59bea6976d6cc6d44535a..c13abe9e31c96eb407018c79143605a53ea76a88 100644 --- a/pkgs/development/libraries/haskell/deepseq/1.1.0.0.nix +++ b/pkgs/development/libraries/haskell/deepseq/1.1.0.0.nix @@ -8,9 +8,6 @@ cabal.mkDerivation (self: { description = "Fully evaluate data structures"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/deepseq/1.1.0.2.nix b/pkgs/development/libraries/haskell/deepseq/1.1.0.2.nix index 4af1d5bff9c74d1768abb82f4d2e11c3f7a01cd9..99db69e612aa68ae1b916d405a7df34fecaed16c 100644 --- a/pkgs/development/libraries/haskell/deepseq/1.1.0.2.nix +++ b/pkgs/development/libraries/haskell/deepseq/1.1.0.2.nix @@ -8,9 +8,6 @@ cabal.mkDerivation (self: { description = "Deep evaluation of data structures"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/deepseq/1.2.0.1.nix b/pkgs/development/libraries/haskell/deepseq/1.2.0.1.nix index 35fca66fa869a63e999f8e459867212c8f840910..f4ef61cbbffca22c369d90906644f11f114e7777 100644 --- a/pkgs/development/libraries/haskell/deepseq/1.2.0.1.nix +++ b/pkgs/development/libraries/haskell/deepseq/1.2.0.1.nix @@ -8,9 +8,6 @@ cabal.mkDerivation (self: { description = "Deep evaluation of data structures"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/deepseq/1.3.0.1.nix b/pkgs/development/libraries/haskell/deepseq/1.3.0.1.nix index bf6d93de2835092510df8baf3adbcafdf6ee2d3e..78f9273e46a212030f44057b2acb36311143d29c 100644 --- a/pkgs/development/libraries/haskell/deepseq/1.3.0.1.nix +++ b/pkgs/development/libraries/haskell/deepseq/1.3.0.1.nix @@ -8,9 +8,6 @@ cabal.mkDerivation (self: { description = "Deep evaluation of data structures"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/dependent-map/default.nix b/pkgs/development/libraries/haskell/dependent-map/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..32a10efc785e579728c19d302efb4a98420b9b9a --- /dev/null +++ b/pkgs/development/libraries/haskell/dependent-map/default.nix @@ -0,0 +1,14 @@ +{ cabal, dependentSum }: + +cabal.mkDerivation (self: { + pname = "dependent-map"; + version = "0.1.1.1"; + sha256 = "1p5a5qahw7i6cvb0g0g1bv9gzy6jlxr5vb3hp8gahm210zw8g990"; + buildDepends = [ dependentSum ]; + meta = { + homepage = "https://github.com/mokus0/dependent-map"; + description = "Dependent finite maps (partial dependent products)"; + license = "unknown"; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/dependent-sum-template/default.nix b/pkgs/development/libraries/haskell/dependent-sum-template/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..2ea45097d3fbd76ff387317d844a588daa4a0446 --- /dev/null +++ b/pkgs/development/libraries/haskell/dependent-sum-template/default.nix @@ -0,0 +1,14 @@ +{ cabal, dependentSum, thExtras }: + +cabal.mkDerivation (self: { + pname = "dependent-sum-template"; + version = "0.0.0.1"; + sha256 = "16p6ckl6ml8lgy42mvivnqphfd73cg8chms3fxid66gv4fif68zl"; + buildDepends = [ dependentSum thExtras ]; + meta = { + homepage = "/dev/null"; + description = "Template Haskell code to generate instances of classes in dependent-sum package"; + license = self.stdenv.lib.licenses.publicDomain; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/dependent-sum/default.nix b/pkgs/development/libraries/haskell/dependent-sum/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..3d33956edcf892dbd5ed85f6b62b7bc4025a3077 --- /dev/null +++ b/pkgs/development/libraries/haskell/dependent-sum/default.nix @@ -0,0 +1,13 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "dependent-sum"; + version = "0.2.0.1"; + sha256 = "07zv8rj574vf7wl3pms4q8d9m7zsfppac5vla9d9b7q11s81lldf"; + meta = { + homepage = "https://github.com/mokus0/dependent-sum"; + description = "Dependent sum type"; + license = self.stdenv.lib.licenses.publicDomain; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/derive/default.nix b/pkgs/development/libraries/haskell/derive/default.nix index c3aa09d9550ec380d653a9c98defa80191dd5a74..906c51fc07221c6309457f0dbfea87a4ed4c10e6 100644 --- a/pkgs/development/libraries/haskell/derive/default.nix +++ b/pkgs/development/libraries/haskell/derive/default.nix @@ -14,9 +14,6 @@ cabal.mkDerivation (self: { description = "A program and library to derive instances for data types"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/derp/default.nix b/pkgs/development/libraries/haskell/derp/default.nix index 6b8de51e1d7ff2e623c272e543f312bd6ff51480..ca702b60356c117dba1cdba756b8492879175663 100644 --- a/pkgs/development/libraries/haskell/derp/default.nix +++ b/pkgs/development/libraries/haskell/derp/default.nix @@ -8,9 +8,6 @@ cabal.mkDerivation (self: { description = "Derivative Parsing"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/diagrams/cairo.nix b/pkgs/development/libraries/haskell/diagrams/cairo.nix index 4a55eeaac65a6c68cae2f860ffd7a6e59f7c2a0a..bc2abf5c16d51aa08dbc281d726bbf4529b0bea9 100644 --- a/pkgs/development/libraries/haskell/diagrams/cairo.nix +++ b/pkgs/development/libraries/haskell/diagrams/cairo.nix @@ -15,6 +15,5 @@ cabal.mkDerivation (self: { description = "Cairo backend for diagrams drawing EDSL"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/diagrams/contrib.nix b/pkgs/development/libraries/haskell/diagrams/contrib.nix index 12c72e12665b3f7ea68daadd80c62f525ec921c2..141a820b5d1a961d3d664a48861a4dec89836324 100644 --- a/pkgs/development/libraries/haskell/diagrams/contrib.nix +++ b/pkgs/development/libraries/haskell/diagrams/contrib.nix @@ -21,6 +21,5 @@ cabal.mkDerivation (self: { description = "Collection of user contributions to diagrams EDSL"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/diagrams/core.nix b/pkgs/development/libraries/haskell/diagrams/core.nix index 76cf77f1315fae2f570f9185740ba238bb511278..ed23b092b02ec97e6a3734528ad5a6986a19c882 100644 --- a/pkgs/development/libraries/haskell/diagrams/core.nix +++ b/pkgs/development/libraries/haskell/diagrams/core.nix @@ -16,6 +16,5 @@ cabal.mkDerivation (self: { description = "Core libraries for diagrams EDSL"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/diagrams/diagrams.nix b/pkgs/development/libraries/haskell/diagrams/diagrams.nix index 1e1174ad303ce65509213132a14a546d5f49e3cf..6f201e7cd850d95f5a8c40be51f1d21c07163638 100644 --- a/pkgs/development/libraries/haskell/diagrams/diagrams.nix +++ b/pkgs/development/libraries/haskell/diagrams/diagrams.nix @@ -14,6 +14,5 @@ cabal.mkDerivation (self: { description = "Embedded domain-specific language for declarative vector graphics"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/diagrams/lib.nix b/pkgs/development/libraries/haskell/diagrams/lib.nix index a737160ea605393bcc8677af599577e803f31657..73c7ff8f8c477293fabcafdf3722c747574220e4 100644 --- a/pkgs/development/libraries/haskell/diagrams/lib.nix +++ b/pkgs/development/libraries/haskell/diagrams/lib.nix @@ -15,6 +15,5 @@ cabal.mkDerivation (self: { description = "Embedded domain-specific language for declarative graphics"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/diagrams/svg.nix b/pkgs/development/libraries/haskell/diagrams/svg.nix index f6fd22ecd99c8633c8851733f46c2cb4f7709128..561f32118c2290e6f30c8da9d3a37ea81fb6577e 100644 --- a/pkgs/development/libraries/haskell/diagrams/svg.nix +++ b/pkgs/development/libraries/haskell/diagrams/svg.nix @@ -15,6 +15,5 @@ cabal.mkDerivation (self: { description = "SVG backend for diagrams drawing EDSL"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/dice/default.nix b/pkgs/development/libraries/haskell/dice/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..23d3339d348cebd4956efde7daaf63e26161e67e --- /dev/null +++ b/pkgs/development/libraries/haskell/dice/default.nix @@ -0,0 +1,15 @@ +{ cabal, parsec, randomFu, transformers }: + +cabal.mkDerivation (self: { + pname = "dice"; + version = "0.1"; + sha256 = "1rfx3vh983f3gc6si661zimhjl47ip30l3pvf7dysjirr3gffgz1"; + isLibrary = true; + isExecutable = true; + buildDepends = [ parsec randomFu transformers ]; + meta = { + description = "Simplistic D&D style dice-rolling system"; + license = self.stdenv.lib.licenses.publicDomain; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/digest/default.nix b/pkgs/development/libraries/haskell/digest/default.nix index a341726bf53702915a88505c1c8d70de361bd27b..c315c0813eb99f57d6f37719b8ddb66caf95b79f 100644 --- a/pkgs/development/libraries/haskell/digest/default.nix +++ b/pkgs/development/libraries/haskell/digest/default.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Various cryptographic hashes for bytestrings; CRC32 and Adler32 for now"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix b/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix index 695ce79f0595aafc38514f8901c7d01ac8e2f6f8..845495f7e77a2c7e74b812ebba10a2998c138de5 100644 --- a/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix +++ b/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix @@ -8,11 +8,11 @@ cabal.mkDerivation (self: { buildDepends = [ blazeBuilder digestiveFunctors heist mtl text xmlhtml ]; + jailbreak = true; meta = { homepage = "http://github.com/jaspervdj/digestive-functors"; description = "Heist frontend for the digestive-functors library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix b/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix index 03f34b31b61823b966e84ef3fdad3e19766eba0e..f23ee6d0691026587c01ae08989b0bee1695a353 100644 --- a/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix +++ b/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix @@ -10,6 +10,5 @@ cabal.mkDerivation (self: { description = "Snap backend for the digestive-functors library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/digestive-functors/default.nix b/pkgs/development/libraries/haskell/digestive-functors/default.nix index bf11f9675bcd24dfbf038a2b168760d0d38cefc4..0b956680a84f1a7d41981210edab479ddc946020 100644 --- a/pkgs/development/libraries/haskell/digestive-functors/default.nix +++ b/pkgs/development/libraries/haskell/digestive-functors/default.nix @@ -11,6 +11,5 @@ cabal.mkDerivation (self: { description = "A practical formlet library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/dimensional-tf/default.nix b/pkgs/development/libraries/haskell/dimensional-tf/default.nix index 1ed368d24a1f218e50863ad231c946ea7934a835..70995ecb3ce7285560cf953cfbc618d45a0ac4df 100644 --- a/pkgs/development/libraries/haskell/dimensional-tf/default.nix +++ b/pkgs/development/libraries/haskell/dimensional-tf/default.nix @@ -10,6 +10,5 @@ cabal.mkDerivation (self: { description = "Statically checked physical dimensions, implemented using type families"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/dimensional/default.nix b/pkgs/development/libraries/haskell/dimensional/default.nix index d36f351fcf600cee6dcb05571c1b79d7ffb2373a..329722abe8e989ee856d7248092cb603fb66b744 100644 --- a/pkgs/development/libraries/haskell/dimensional/default.nix +++ b/pkgs/development/libraries/haskell/dimensional/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Statically checked physical dimensions"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/directory-tree/default.nix b/pkgs/development/libraries/haskell/directory-tree/default.nix index 848ad563125258988a14ab8f85948378ae86b266..5c8b357593e46e3e72aea8bd45804898ab8f92bd 100644 --- a/pkgs/development/libraries/haskell/directory-tree/default.nix +++ b/pkgs/development/libraries/haskell/directory-tree/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "A simple directory-like tree datatype, with useful IO functions"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/distributed-process-simplelocalnet/default.nix b/pkgs/development/libraries/haskell/distributed-process-simplelocalnet/default.nix index b2b58825469dc67efae6ad4689ff25f75c2a2343..aaca850c0d7a2c8ce85ec1098e9a19f0476aac24 100644 --- a/pkgs/development/libraries/haskell/distributed-process-simplelocalnet/default.nix +++ b/pkgs/development/libraries/haskell/distributed-process-simplelocalnet/default.nix @@ -18,9 +18,6 @@ cabal.mkDerivation (self: { description = "Simple zero-configuration backend for Cloud Haskell"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/distributed-process/default.nix b/pkgs/development/libraries/haskell/distributed-process/default.nix index be5d9fbfe6d4ef5559466efef84169cf1f98546f..d23a5ef0228dce0275221995f0cde9de24da0926 100644 --- a/pkgs/development/libraries/haskell/distributed-process/default.nix +++ b/pkgs/development/libraries/haskell/distributed-process/default.nix @@ -26,9 +26,6 @@ cabal.mkDerivation (self: { description = "Cloud Haskell: Erlang-style concurrency in Haskell"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/distributed-static/default.nix b/pkgs/development/libraries/haskell/distributed-static/default.nix index e682ec474aae8837d47ae10cb57d24bd9d74cb87..9147b724ba22ded53bd3e8df4d805de78abca4b0 100644 --- a/pkgs/development/libraries/haskell/distributed-static/default.nix +++ b/pkgs/development/libraries/haskell/distributed-static/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Compositional, type-safe, polymorphic static values and closures"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/distributive/default.nix b/pkgs/development/libraries/haskell/distributive/default.nix index 55a9fc41ed0bba754993488e7158344af76f4781..d40952024ef2ac7829f02a51195a0cb5712b820c 100644 --- a/pkgs/development/libraries/haskell/distributive/default.nix +++ b/pkgs/development/libraries/haskell/distributive/default.nix @@ -11,6 +11,5 @@ cabal.mkDerivation (self: { description = "Haskell 98 Distributive functors -- Dual to Traversable"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/dlist/default.nix b/pkgs/development/libraries/haskell/dlist/default.nix index a88b38650c7d1ee8d1b7dd6f31cc60bfc730dc19..1a7fc56efd5f8ffabe415d99d1059d0a685e6e42 100644 --- a/pkgs/development/libraries/haskell/dlist/default.nix +++ b/pkgs/development/libraries/haskell/dlist/default.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Differences lists"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/dns/default.nix b/pkgs/development/libraries/haskell/dns/default.nix index e8d0284487af4981c4e6bd49eb1094b645731df3..0854f39efcef7bd19fad4542983f43ce070fccb8 100644 --- a/pkgs/development/libraries/haskell/dns/default.nix +++ b/pkgs/development/libraries/haskell/dns/default.nix @@ -14,6 +14,5 @@ cabal.mkDerivation (self: { description = "DNS library in Haskell"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/doctest/default.nix b/pkgs/development/libraries/haskell/doctest/default.nix index ecbac90aa4189210f54841584c8c37755a240c96..3b8c03e2da2729e63805921a4f747cf93a96c524 100644 --- a/pkgs/development/libraries/haskell/doctest/default.nix +++ b/pkgs/development/libraries/haskell/doctest/default.nix @@ -19,6 +19,5 @@ cabal.mkDerivation (self: { description = "Test interactive Haskell examples"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/dotgen/default.nix b/pkgs/development/libraries/haskell/dotgen/default.nix index 06a3e6a09fe542f05891bdcbedb12fe388ec9779..a7fe5b791f0dfdab036410f8b152e1bcac983380 100644 --- a/pkgs/development/libraries/haskell/dotgen/default.nix +++ b/pkgs/development/libraries/haskell/dotgen/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "A simple interface for building .dot graph files."; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/double-conversion/default.nix b/pkgs/development/libraries/haskell/double-conversion/default.nix index 5bd90719ac44f7cd33114cd3353ca0a9bf06d1b4..cad61e52ee0c1f572cde134d0cad9a4ab837d3fa 100644 --- a/pkgs/development/libraries/haskell/double-conversion/default.nix +++ b/pkgs/development/libraries/haskell/double-conversion/default.nix @@ -11,9 +11,6 @@ cabal.mkDerivation (self: { description = "Fast conversion between double precision floating point and text"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/download-curl/default.nix b/pkgs/development/libraries/haskell/download-curl/default.nix index dd7fb892fdea26016df21dfb23cd1c0cd0093d36..935004a6bb0f70284a2a93646c0c6d1709c48a78 100644 --- a/pkgs/development/libraries/haskell/download-curl/default.nix +++ b/pkgs/development/libraries/haskell/download-curl/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "High-level file download based on URLs"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/download/default.nix b/pkgs/development/libraries/haskell/download/default.nix index c0895ac2938e89e27babd148189d370049ed732c..06c34bf9acb0f3d0e38d0e077607c57fb9efe2fd 100644 --- a/pkgs/development/libraries/haskell/download/default.nix +++ b/pkgs/development/libraries/haskell/download/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "High-level file download based on URLs"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/dstring/default.nix b/pkgs/development/libraries/haskell/dstring/default.nix index 6b37b0a30998ecf779a21ebcd2cf0becfbefcf06..4b5dd2b38883a4a138986681e83f7d0222e8ae25 100644 --- a/pkgs/development/libraries/haskell/dstring/default.nix +++ b/pkgs/development/libraries/haskell/dstring/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Difference strings"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/dual-tree/default.nix b/pkgs/development/libraries/haskell/dual-tree/default.nix index a41924dbcfcbe5b353696d6941141652252f1726..841fae96791c6a4f85c944374a9d6d3c6f2d4f53 100644 --- a/pkgs/development/libraries/haskell/dual-tree/default.nix +++ b/pkgs/development/libraries/haskell/dual-tree/default.nix @@ -10,6 +10,5 @@ cabal.mkDerivation (self: { description = "Rose trees with cached and accumulating monoidal annotations"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/dyre/default.nix b/pkgs/development/libraries/haskell/dyre/default.nix index 0c9623b11a5c4249f2ef4dfd9f940105ced971fd..8b3d2cab677ad6b7a849a19bbecc45845bbe7371 100644 --- a/pkgs/development/libraries/haskell/dyre/default.nix +++ b/pkgs/development/libraries/haskell/dyre/default.nix @@ -14,6 +14,5 @@ cabal.mkDerivation (self: { description = "Dynamic reconfiguration in Haskell"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/edit-distance/default.nix b/pkgs/development/libraries/haskell/edit-distance/default.nix index cc3183b8bda7708619eefe375144a222a67d1647..22f5953b7e0407aad07206face1c3dd33c8d7b27 100644 --- a/pkgs/development/libraries/haskell/edit-distance/default.nix +++ b/pkgs/development/libraries/haskell/edit-distance/default.nix @@ -12,9 +12,6 @@ cabal.mkDerivation (self: { description = "Levenshtein and restricted Damerau-Levenshtein edit distances"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/editline/0.2.1.0.nix b/pkgs/development/libraries/haskell/editline/0.2.1.0.nix index 7d92bcb027ae0401e265dc215fa60a71d0027447..7e6262423c6d43021bbfe8e9f6a03fd9917f6b62 100644 --- a/pkgs/development/libraries/haskell/editline/0.2.1.0.nix +++ b/pkgs/development/libraries/haskell/editline/0.2.1.0.nix @@ -10,6 +10,5 @@ cabal.mkDerivation (self: { description = "Bindings to the editline library (libedit)"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/editline/0.2.1.1.nix b/pkgs/development/libraries/haskell/editline/0.2.1.1.nix index af6ca841c7a3436c23b98d54d562fe604762e879..cf9f1e099a2ad19adfcfb0c6cc64fbf5bcca39d7 100644 --- a/pkgs/development/libraries/haskell/editline/0.2.1.1.nix +++ b/pkgs/development/libraries/haskell/editline/0.2.1.1.nix @@ -10,6 +10,5 @@ cabal.mkDerivation (self: { description = "Bindings to the editline library (libedit)"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/either/default.nix b/pkgs/development/libraries/haskell/either/default.nix index b75793435b365cdb25d11757dda62f544df86f53..4730af585697919abf06f3b54d88adb439f9818c 100644 --- a/pkgs/development/libraries/haskell/either/default.nix +++ b/pkgs/development/libraries/haskell/either/default.nix @@ -13,6 +13,5 @@ cabal.mkDerivation (self: { description = "An either monad transformer"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/elerea/default.nix b/pkgs/development/libraries/haskell/elerea/default.nix index 7849770002990c5505a711e119f57b2020288857..8ba4687d3e3bfa3d8e7c36f93ea030a30cf5cffe 100644 --- a/pkgs/development/libraries/haskell/elerea/default.nix +++ b/pkgs/development/libraries/haskell/elerea/default.nix @@ -8,6 +8,5 @@ cabal.mkDerivation (self: { description = "A minimalistic FRP library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/email-validate/default.nix b/pkgs/development/libraries/haskell/email-validate/default.nix index a3bfd8cbafc7d030d58cf49508fcf84552811d2d..3ba059261794caad39ef20d9b0d7108f361c0896 100644 --- a/pkgs/development/libraries/haskell/email-validate/default.nix +++ b/pkgs/development/libraries/haskell/email-validate/default.nix @@ -16,9 +16,6 @@ cabal.mkDerivation (self: { description = "Validating an email address string against RFC 5322"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/encoding/default.nix b/pkgs/development/libraries/haskell/encoding/default.nix index 73ba94bcad9dd60ab11e1f0378b5ec9809e12061..1b7ef1bcd1dce35731a75fb54a638bd2920bc90e 100644 --- a/pkgs/development/libraries/haskell/encoding/default.nix +++ b/pkgs/development/libraries/haskell/encoding/default.nix @@ -12,6 +12,5 @@ cabal.mkDerivation (self: { description = "A library for various character encodings"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/entropy/default.nix b/pkgs/development/libraries/haskell/entropy/default.nix index e877124b9635d0eecc7182d395a5fa6cd26423fe..004d7492c51fd488e21bf810da899a5330f7f18f 100644 --- a/pkgs/development/libraries/haskell/entropy/default.nix +++ b/pkgs/development/libraries/haskell/entropy/default.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "A platform independent entropy source"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/enumerator/default.nix b/pkgs/development/libraries/haskell/enumerator/default.nix index 27a85b1df97f0a15f3ac06eb7826f3a61bb2cd71..5b44c9efc62a94b9350629921e131a69cb280e51 100644 --- a/pkgs/development/libraries/haskell/enumerator/default.nix +++ b/pkgs/development/libraries/haskell/enumerator/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Reliable, high-performance processing with left-fold enumerators"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/erf/default.nix b/pkgs/development/libraries/haskell/erf/default.nix index 25d64b3faafc65ed22230645d59ebea4bb3d3c67..1a6331bcd6f1ca45203e06c7c5020185bb5444fe 100644 --- a/pkgs/development/libraries/haskell/erf/default.nix +++ b/pkgs/development/libraries/haskell/erf/default.nix @@ -8,9 +8,6 @@ cabal.mkDerivation (self: { description = "The error function, erf, and related functions"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/errors/default.nix b/pkgs/development/libraries/haskell/errors/default.nix index 7fdae9135013efedc9dc885ea5627767ee6f7398..7ed890c513c5e55102c021c44a05c7293264ca20 100644 --- a/pkgs/development/libraries/haskell/errors/default.nix +++ b/pkgs/development/libraries/haskell/errors/default.nix @@ -9,6 +9,5 @@ cabal.mkDerivation (self: { description = "Simplified error-handling"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/exception-mtl/default.nix b/pkgs/development/libraries/haskell/exception-mtl/default.nix index b340591c33ac36de48fa0d8a7f018b8a8d69ba62..2c64598d1d01ea5d50b7d7ac961ee15daa8aafc3 100644 --- a/pkgs/development/libraries/haskell/exception-mtl/default.nix +++ b/pkgs/development/libraries/haskell/exception-mtl/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Exception monad transformer instances for mtl2 classes"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/exception-transformers/default.nix b/pkgs/development/libraries/haskell/exception-transformers/default.nix index c8a9849cad1a5077577cfdb15525a06237772b17..a4d0cfd247a19b3f1d12a7d9e2d674410545f0dd 100644 --- a/pkgs/development/libraries/haskell/exception-transformers/default.nix +++ b/pkgs/development/libraries/haskell/exception-transformers/default.nix @@ -11,9 +11,6 @@ cabal.mkDerivation (self: { description = "Type classes and monads for unchecked extensible exceptions"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/executable-path/default.nix b/pkgs/development/libraries/haskell/executable-path/default.nix index 5faf06230f6292d2959c2a6afbfdbfb9f8606f75..5c69969c20d23061e317504a4545fa1eb29095cb 100644 --- a/pkgs/development/libraries/haskell/executable-path/default.nix +++ b/pkgs/development/libraries/haskell/executable-path/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Finding out the full path of the executable"; license = self.stdenv.lib.licenses.publicDomain; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/explicit-exception/default.nix b/pkgs/development/libraries/haskell/explicit-exception/default.nix index 151ce5b785c87bc51375fea563ce3eabb1159c8c..0f2385a004ffaf504e0b5a99f98af80f007e6648 100644 --- a/pkgs/development/libraries/haskell/explicit-exception/default.nix +++ b/pkgs/development/libraries/haskell/explicit-exception/default.nix @@ -12,9 +12,6 @@ cabal.mkDerivation (self: { description = "Exceptions which are explicit in the type signature"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.0.nix b/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.0.nix index 8a928931e3e7f83e1c9df0e8c97e1175be761f37..0eca0eb78eeca545e73a0b7879688b3c071ddfa1 100644 --- a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.0.nix +++ b/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.0.nix @@ -8,9 +8,6 @@ cabal.mkDerivation (self: { description = "Extensible exceptions"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.2.nix b/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.2.nix index 329bb2a42c48dd062a7875b6c4dadd2d00b493cb..946a808ddc52859d765b899e3dfd14992335afdf 100644 --- a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.2.nix +++ b/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.2.nix @@ -8,9 +8,6 @@ cabal.mkDerivation (self: { description = "Extensible exceptions"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.3.nix b/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.3.nix index d349a1f17e366d42dd7f58b68a72e154a4cea530..577f7d4657a5fb691c91a21b3eb8cebee9d17f34 100644 --- a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.3.nix +++ b/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.3.nix @@ -8,9 +8,6 @@ cabal.mkDerivation (self: { description = "Extensible exceptions"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.4.nix b/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.4.nix index f217db39bc61d4966e3d6382517299d5146f25bd..2ca255d299973a371c485025451c770d5cc829b9 100644 --- a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.4.nix +++ b/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.4.nix @@ -8,9 +8,6 @@ cabal.mkDerivation (self: { description = "Extensible exceptions"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/failure/default.nix b/pkgs/development/libraries/haskell/failure/default.nix index 3e60885352ea9a91af6621fb09832a5d8bc399c8..bc2821e3e8c581cc36324a6170a1d0249d9a65cc 100644 --- a/pkgs/development/libraries/haskell/failure/default.nix +++ b/pkgs/development/libraries/haskell/failure/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "A simple type class for success/failure computations"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/fast-logger/default.nix b/pkgs/development/libraries/haskell/fast-logger/default.nix index 8843062fc2584f2a8da2fade51314d1ae133a74d..c9544b2c1f69caf4c3df99db4fd06f01c3c12e48 100644 --- a/pkgs/development/libraries/haskell/fast-logger/default.nix +++ b/pkgs/development/libraries/haskell/fast-logger/default.nix @@ -11,9 +11,6 @@ cabal.mkDerivation (self: { description = "A fast logging system"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/fclabels/default.nix b/pkgs/development/libraries/haskell/fclabels/default.nix index 5f960cbb1f00df1134678623a73d71ec8fd62850..0064a7f425a8d0165a4fca77b42ad5faed1948de 100644 --- a/pkgs/development/libraries/haskell/fclabels/default.nix +++ b/pkgs/development/libraries/haskell/fclabels/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "First class accessor labels"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/feed/default.nix b/pkgs/development/libraries/haskell/feed/default.nix index 8ad5c4318f7ddce13a9677fc417d39bc1d495d12..d15906e0be51505aa2ffa47342324425382590d8 100644 --- a/pkgs/development/libraries/haskell/feed/default.nix +++ b/pkgs/development/libraries/haskell/feed/default.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds."; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/fgl-visualize/default.nix b/pkgs/development/libraries/haskell/fgl-visualize/default.nix index 9938d181d88f6f535bb7072981a9459b895c981f..c446ae8545dd2bb5d247977975d19ba46c0dee5a 100644 --- a/pkgs/development/libraries/haskell/fgl-visualize/default.nix +++ b/pkgs/development/libraries/haskell/fgl-visualize/default.nix @@ -2,16 +2,13 @@ cabal.mkDerivation (self: { pname = "fgl-visualize"; - version = "0.1"; - sha256 = "0ri6ywg7rj8qfyngjxvihw43s2h2l3w03fwq1ipn59cdcnah08bc"; + version = "0.1.0.1"; + sha256 = "0vwafx0rggksg5i7cx4r2bs5wa6csb5p39vpix425zr3l6vggrxq"; buildDepends = [ dotgen fgl ]; meta = { description = "Convert FGL graphs to dot (graphviz) files"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/fgl/5.4.2.2.nix b/pkgs/development/libraries/haskell/fgl/5.4.2.2.nix index 7299daddb14ccdee223d42155d3b93797626685d..c367b74f6a3fc4263c8da9586bf84aa6f0657588 100644 --- a/pkgs/development/libraries/haskell/fgl/5.4.2.2.nix +++ b/pkgs/development/libraries/haskell/fgl/5.4.2.2.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Martin Erwig's Functional Graph Library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/fgl/5.4.2.3.nix b/pkgs/development/libraries/haskell/fgl/5.4.2.3.nix index 7417a32745c50daaf45d0e993245cc17a875d9d4..8691d10c684e018160781ab101cb7e72ee0e33c5 100644 --- a/pkgs/development/libraries/haskell/fgl/5.4.2.3.nix +++ b/pkgs/development/libraries/haskell/fgl/5.4.2.3.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Martin Erwig's Functional Graph Library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/fgl/5.4.2.4.nix b/pkgs/development/libraries/haskell/fgl/5.4.2.4.nix index 7b6aa799944b4072fe73669b1fd7f430a2c44c9e..6a7aa22cef10f997b296c17e62c8fedfc210aa22 100644 --- a/pkgs/development/libraries/haskell/fgl/5.4.2.4.nix +++ b/pkgs/development/libraries/haskell/fgl/5.4.2.4.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Martin Erwig's Functional Graph Library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/file-embed/default.nix b/pkgs/development/libraries/haskell/file-embed/default.nix index efb8e9d7894f572c365e8f332663558bbc71470b..145d3c1c203d87c23b6e5fd5c34cdfcbfd310bb7 100644 --- a/pkgs/development/libraries/haskell/file-embed/default.nix +++ b/pkgs/development/libraries/haskell/file-embed/default.nix @@ -11,9 +11,6 @@ cabal.mkDerivation (self: { description = "Use Template Haskell to embed file contents directly"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/file-location/default.nix b/pkgs/development/libraries/haskell/file-location/default.nix index e9806cfb1fbab400079a7467fbd52c5fe9a9c27c..8a28d0b27fb1b5a2c0899d3bfb0d6931302ddd8d 100644 --- a/pkgs/development/libraries/haskell/file-location/default.nix +++ b/pkgs/development/libraries/haskell/file-location/default.nix @@ -11,6 +11,5 @@ cabal.mkDerivation (self: { description = "common functions that show file location information"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/filepath/default.nix b/pkgs/development/libraries/haskell/filepath/default.nix index 3409079210ba0381c33243a6b1534c4e1bb0cfee..0cd65bb1905e27322dd2188cac9be7b9237d12ba 100644 --- a/pkgs/development/libraries/haskell/filepath/default.nix +++ b/pkgs/development/libraries/haskell/filepath/default.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Library for manipulating FilePaths in a cross platform way"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/filestore/default.nix b/pkgs/development/libraries/haskell/filestore/default.nix index 137846f85f6f792e9448b00d67c6e3587f3de166..04321d34ffa10b3391c5a74bc9abc58fdad9f919 100644 --- a/pkgs/development/libraries/haskell/filestore/default.nix +++ b/pkgs/development/libraries/haskell/filestore/default.nix @@ -13,9 +13,6 @@ cabal.mkDerivation (self: { description = "Interface for versioning file stores"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/filesystem-conduit/default.nix b/pkgs/development/libraries/haskell/filesystem-conduit/default.nix index a441343448084670df24a850032689ffd79284e4..46ae27fc090124c41d129719214921e934aa7c01 100644 --- a/pkgs/development/libraries/haskell/filesystem-conduit/default.nix +++ b/pkgs/development/libraries/haskell/filesystem-conduit/default.nix @@ -17,6 +17,5 @@ cabal.mkDerivation (self: { description = "Use system-filepath data types with conduits"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/fingertree/default.nix b/pkgs/development/libraries/haskell/fingertree/default.nix index ea3d9b6fbdf7b28e37f5b0bfe907d46ea8986f24..299b2e926dbd4aacea388c22cacc0aa4c54e0702 100644 --- a/pkgs/development/libraries/haskell/fingertree/default.nix +++ b/pkgs/development/libraries/haskell/fingertree/default.nix @@ -8,9 +8,6 @@ cabal.mkDerivation (self: { description = "Generic finger-tree structure, with example instances"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/flexible-defaults/default.nix b/pkgs/development/libraries/haskell/flexible-defaults/default.nix index 2a94174f5ed0dffe21efe9ad976bb3000ef791cd..7be21dbbf34733418eda2936e21f51cd666951a2 100644 --- a/pkgs/development/libraries/haskell/flexible-defaults/default.nix +++ b/pkgs/development/libraries/haskell/flexible-defaults/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Generate default function implementations for complex type classes"; license = self.stdenv.lib.licenses.publicDomain; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/force-layout/default.nix b/pkgs/development/libraries/haskell/force-layout/default.nix index e46f582c024bae7164260571e20b76ebb9333b9a..025ed14869f834c50cc01380c154209f29c5786b 100644 --- a/pkgs/development/libraries/haskell/force-layout/default.nix +++ b/pkgs/development/libraries/haskell/force-layout/default.nix @@ -9,6 +9,5 @@ cabal.mkDerivation (self: { description = "Simple force-directed layout"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/fsnotify/default.nix b/pkgs/development/libraries/haskell/fsnotify/default.nix index ac489da34d91d9e565dfc1018e6f27426166b104..1ef55d105f794d9989a0a9a8c51e75ff28a21ed5 100644 --- a/pkgs/development/libraries/haskell/fsnotify/default.nix +++ b/pkgs/development/libraries/haskell/fsnotify/default.nix @@ -16,6 +16,5 @@ cabal.mkDerivation (self: { description = "Cross platform library for file change notification"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/gamma/default.nix b/pkgs/development/libraries/haskell/gamma/default.nix index 2853fbca7685c9e0f6633ffd8592c4d6f697b90f..8fbdb57d48bfdc52623f8d7dca1a068e18a1de3e 100644 --- a/pkgs/development/libraries/haskell/gamma/default.nix +++ b/pkgs/development/libraries/haskell/gamma/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Gamma function and related functions"; license = self.stdenv.lib.licenses.publicDomain; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/gd/default.nix b/pkgs/development/libraries/haskell/gd/default.nix index 44c15b23d4ba0cdcf31c8683fde0d54368ac5bd6..27423ce4ecd4694665996b874f131643ed670bfc 100644 --- a/pkgs/development/libraries/haskell/gd/default.nix +++ b/pkgs/development/libraries/haskell/gd/default.nix @@ -11,9 +11,6 @@ cabal.mkDerivation (self: { description = "A Haskell binding to a subset of the GD graphics library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/gdiff/default.nix b/pkgs/development/libraries/haskell/gdiff/default.nix index 929b717f552bd5f226f281bde681904f89702a44..e14857aaa5b71c45c73bbf9a572280f40ab26d09 100644 --- a/pkgs/development/libraries/haskell/gdiff/default.nix +++ b/pkgs/development/libraries/haskell/gdiff/default.nix @@ -8,9 +8,6 @@ cabal.mkDerivation (self: { description = "Generic diff and patch"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/generic-deriving/default.nix b/pkgs/development/libraries/haskell/generic-deriving/default.nix index c5a62b967aa0c0895bf4b231aa85183dee3f55fa..043156ab5e1fe139e9afb89eeecdfca8fb70aa05 100644 --- a/pkgs/development/libraries/haskell/generic-deriving/default.nix +++ b/pkgs/development/libraries/haskell/generic-deriving/default.nix @@ -8,9 +8,6 @@ cabal.mkDerivation (self: { description = "Generic programming library for generalised deriving"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/geniplate/default.nix b/pkgs/development/libraries/haskell/geniplate/default.nix index 508075044eca3b54540c8f6faf8d8533fabeca48..eff79afa416cfcfc89e9d59fc97f6a33ee6d2c8c 100644 --- a/pkgs/development/libraries/haskell/geniplate/default.nix +++ b/pkgs/development/libraries/haskell/geniplate/default.nix @@ -9,6 +9,5 @@ cabal.mkDerivation (self: { description = "Use template Haskell to generate Uniplate-like functions"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/ghc-core/default.nix b/pkgs/development/libraries/haskell/ghc-core/default.nix index 18110f3c0f76061f85324ece4414a02602aa31ee..8c2f481122bc4b0e9d9428e4f7085781a458a6c1 100644 --- a/pkgs/development/libraries/haskell/ghc-core/default.nix +++ b/pkgs/development/libraries/haskell/ghc-core/default.nix @@ -12,9 +12,6 @@ cabal.mkDerivation (self: { description = "Display GHC's core and assembly output in a pager"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/ghc-events/default.nix b/pkgs/development/libraries/haskell/ghc-events/default.nix index f4c7bfbb264d9c506e4f4717bddb21ea31b4a2b5..5b7decf9416bbe8f80f247c8c2037620fc4b17a4 100644 --- a/pkgs/development/libraries/haskell/ghc-events/default.nix +++ b/pkgs/development/libraries/haskell/ghc-events/default.nix @@ -13,9 +13,6 @@ cabal.mkDerivation (self: { description = "Library and tool for parsing .eventlog files from GHC"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/ghc-heap-view/default.nix b/pkgs/development/libraries/haskell/ghc-heap-view/default.nix index 6e7450d099aba4bceaa63d8dabdb6b7b02dd7bbd..342e2a7cd31164bb837d0c2bb1f6ae66e64bdf92 100644 --- a/pkgs/development/libraries/haskell/ghc-heap-view/default.nix +++ b/pkgs/development/libraries/haskell/ghc-heap-view/default.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Extract the heap representation of Haskell values and thunks"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix index a8224a85745e741dafef8247833f0eb678b1c455..4eaf0dcb78238db184794d5e6bde4371ab96b1ef 100644 --- a/pkgs/development/libraries/haskell/ghc-mod/default.nix +++ b/pkgs/development/libraries/haskell/ghc-mod/default.nix @@ -4,9 +4,9 @@ cabal.mkDerivation (self: { pname = "ghc-mod"; - version = "1.12.4"; - sha256 = "1f4pdwimzc2i7bb7ccpbl8pn18ygnqd65xw1z5cmhlswasbdab14"; - isLibrary = false; + version = "2.0.2"; + sha256 = "1j2av7lcsnpizy6lyykk47rmm07rkfjyg9glfi7ma5cg082v15ni"; + isLibrary = true; isExecutable = true; buildDepends = [ Cabal convertible filepath ghcPaths ghcSybUtils hlint ioChoice syb @@ -17,6 +17,7 @@ cabal.mkDerivation (self: { ioChoice syb time transformers ]; buildTools = [ emacs ]; + doCheck = false; postInstall = '' cd $out/share/$pname-$version make @@ -25,10 +26,9 @@ cabal.mkDerivation (self: { ensureDir "$out/share/emacs" mv $pname-$version emacs/site-lisp ''; - doCheck = false; meta = { homepage = "http://www.mew.org/~kazu/proj/ghc-mod/"; - description = "Happy Haskell programming on Emacs/Vim"; + description = "Happy Haskell Programming"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ diff --git a/pkgs/development/libraries/haskell/ghc-mtl/default.nix b/pkgs/development/libraries/haskell/ghc-mtl/default.nix index 2db4ea5817cdc13c75b71a4b85c740ba77b0eccf..ea2495f6586aff073a2b8ca889f63583b6a0833c 100644 --- a/pkgs/development/libraries/haskell/ghc-mtl/default.nix +++ b/pkgs/development/libraries/haskell/ghc-mtl/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "An mtl compatible version of the Ghc-Api monads and monad-transformers"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/ghc-syb-utils/default.nix b/pkgs/development/libraries/haskell/ghc-syb-utils/default.nix index aef62af9e1639b7799525cf7937af3320e5d475b..6f5f14585074053bc58c848ef1d354de5acfc73f 100644 --- a/pkgs/development/libraries/haskell/ghc-syb-utils/default.nix +++ b/pkgs/development/libraries/haskell/ghc-syb-utils/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Scrap Your Boilerplate utilities for the GHC API"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/ghc-syb/default.nix b/pkgs/development/libraries/haskell/ghc-syb/default.nix index d0a766940fe896e98013f80820931b3c990fc716..21a2f0f00eb9145bae77d9b5b7ffdabf577b2d40 100644 --- a/pkgs/development/libraries/haskell/ghc-syb/default.nix +++ b/pkgs/development/libraries/haskell/ghc-syb/default.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Data and Typeable instances for the GHC API"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/ghc-vis/default.nix b/pkgs/development/libraries/haskell/ghc-vis/default.nix index 8b6dc19653fe74e2ec221a65e60ea0c46200506b..12508a09c63d93e4f48fe1899939d1e367605886 100644 --- a/pkgs/development/libraries/haskell/ghc-vis/default.nix +++ b/pkgs/development/libraries/haskell/ghc-vis/default.nix @@ -15,9 +15,6 @@ cabal.mkDerivation (self: { description = "Live visualization of data structures in GHCi"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/gio/default.nix b/pkgs/development/libraries/haskell/gio/default.nix index 082032f75a3a8425ef31f8b4d0979efd79f3207d..e9d295798b635259907f75192fa1d291dd8b6cfa 100644 --- a/pkgs/development/libraries/haskell/gio/default.nix +++ b/pkgs/development/libraries/haskell/gio/default.nix @@ -12,9 +12,6 @@ cabal.mkDerivation (self: { description = "Binding to the GIO"; license = self.stdenv.lib.licenses.lgpl21; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/gitit/default.nix b/pkgs/development/libraries/haskell/gitit/default.nix index d241442e616a3dee9043a8ffa3ff502c641324c6..9213c534fa3d693f98f1c88743d7a518dc9c6fe0 100644 --- a/pkgs/development/libraries/haskell/gitit/default.nix +++ b/pkgs/development/libraries/haskell/gitit/default.nix @@ -23,9 +23,6 @@ cabal.mkDerivation (self: { description = "Wiki using happstack, git or darcs, and pandoc"; license = "GPL"; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/glade/default.nix b/pkgs/development/libraries/haskell/glade/default.nix index f1bae4ad9fe0a7eeb125a660cfda486f36c29a22..7c49b956aa980d5c3f5520f2f18c314ce9130f56 100644 --- a/pkgs/development/libraries/haskell/glade/default.nix +++ b/pkgs/development/libraries/haskell/glade/default.nix @@ -15,9 +15,6 @@ cabal.mkDerivation (self: { description = "Binding to the glade library"; license = self.stdenv.lib.licenses.lgpl21; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/glib/default.nix b/pkgs/development/libraries/haskell/glib/default.nix index a9c3023c41b5aaa74907674f33b5698e15f1b96a..29d2f92d7bac51943849ceae5bd08c2b2e7e6597 100644 --- a/pkgs/development/libraries/haskell/glib/default.nix +++ b/pkgs/development/libraries/haskell/glib/default.nix @@ -12,9 +12,6 @@ cabal.mkDerivation (self: { description = "Binding to the GLIB library for Gtk2Hs"; license = self.stdenv.lib.licenses.lgpl21; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/gloss/default.nix b/pkgs/development/libraries/haskell/gloss/default.nix index a4af25459a06b4db73ac2f3ff170b470c8e9f14f..ededea21fcc15b235fd0d9abfd5021872e05d6d9 100644 --- a/pkgs/development/libraries/haskell/gloss/default.nix +++ b/pkgs/development/libraries/haskell/gloss/default.nix @@ -11,9 +11,6 @@ cabal.mkDerivation (self: { description = "Painless 2D vector graphics, animations and simulations"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/glpk-hs/default.nix b/pkgs/development/libraries/haskell/glpk-hs/default.nix index 2ac665472596fb65b95fe9cb2eacb7c2c4569d7e..fbbe7d31c2a58558798fdffca0ed33a9a850543d 100644 --- a/pkgs/development/libraries/haskell/glpk-hs/default.nix +++ b/pkgs/development/libraries/haskell/glpk-hs/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Comprehensive GLPK linear programming bindings"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/gnuidn/default.nix b/pkgs/development/libraries/haskell/gnuidn/default.nix index 27d7860be66cb2cc5a954047656920e3db979037..6ae78cf49b6a41418cc83b70ccf3c39c01fd0ea5 100644 --- a/pkgs/development/libraries/haskell/gnuidn/default.nix +++ b/pkgs/development/libraries/haskell/gnuidn/default.nix @@ -13,6 +13,5 @@ cabal.mkDerivation (self: { description = "Bindings for GNU IDN"; license = self.stdenv.lib.licenses.gpl3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/gnutls/default.nix b/pkgs/development/libraries/haskell/gnutls/default.nix index 6aa16600707a5cca56d9e34687d7559b5a2e271a..72f98677ce6674a2b4b545212e2dda9558636de7 100644 --- a/pkgs/development/libraries/haskell/gnutls/default.nix +++ b/pkgs/development/libraries/haskell/gnutls/default.nix @@ -12,6 +12,5 @@ cabal.mkDerivation (self: { description = "Bindings for GNU libgnutls"; license = self.stdenv.lib.licenses.gpl3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/graphviz/default.nix b/pkgs/development/libraries/haskell/graphviz/default.nix index 134f05afb49aa41fed7a92dc4dc5321952de0f0a..6f7aea3289e3b3f2538169303c0276bb67d1d0c3 100644 --- a/pkgs/development/libraries/haskell/graphviz/default.nix +++ b/pkgs/development/libraries/haskell/graphviz/default.nix @@ -14,15 +14,15 @@ cabal.mkDerivation (self: { colour dlist fgl filepath polyparse QuickCheck temporary text transformers wlPprintText ]; + patchPhase = '' + sed -i -e 's|polyparse.*,|polyparse,|' graphviz.cabal + ''; doCheck = false; meta = { homepage = "http://projects.haskell.org/graphviz/"; description = "Bindings to Graphviz for graph visualisation"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/groupoids/default.nix b/pkgs/development/libraries/haskell/groupoids/default.nix index 471c5586fe93aa3b98da428dbb185ab1875677dd..4c085c0ae23bf9ba128ece9a303d1a7ecea11d93 100644 --- a/pkgs/development/libraries/haskell/groupoids/default.nix +++ b/pkgs/development/libraries/haskell/groupoids/default.nix @@ -10,6 +10,5 @@ cabal.mkDerivation (self: { description = "Haskell 98 Groupoids"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/gsasl/default.nix b/pkgs/development/libraries/haskell/gsasl/default.nix index aa727cb9412eae26daf858b0cef87acd1218b7dd..5a654cdd11deb0a3147fec6cf396acd23271c9cb 100644 --- a/pkgs/development/libraries/haskell/gsasl/default.nix +++ b/pkgs/development/libraries/haskell/gsasl/default.nix @@ -11,6 +11,5 @@ cabal.mkDerivation (self: { description = "Bindings for GNU libgsasl"; license = self.stdenv.lib.licenses.gpl3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/gtk/default.nix b/pkgs/development/libraries/haskell/gtk/default.nix index e817312f9f619d278da103e035652e4a8c08e4cd..ed5244d72629c3df0363e7f0b315232e0583c6eb 100644 --- a/pkgs/development/libraries/haskell/gtk/default.nix +++ b/pkgs/development/libraries/haskell/gtk/default.nix @@ -15,9 +15,6 @@ cabal.mkDerivation (self: { description = "Binding to the Gtk+ graphical user interface library"; license = self.stdenv.lib.licenses.lgpl21; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix b/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix index be1f53937e1b08a1a3010b197841b9b411546608..677c6c15214b973ab36293556219a7028ec370ae 100644 --- a/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix +++ b/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix @@ -13,9 +13,6 @@ cabal.mkDerivation (self: { description = "Tools to build the Gtk2Hs suite of User Interface libraries"; license = self.stdenv.lib.licenses.gpl2; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/gtksourceview2/default.nix b/pkgs/development/libraries/haskell/gtksourceview2/default.nix index bb7680b340778933065e04dfe40b20f9d2b05965..756e1a1df9786da1404a2bf6802c1d4923b18da9 100644 --- a/pkgs/development/libraries/haskell/gtksourceview2/default.nix +++ b/pkgs/development/libraries/haskell/gtksourceview2/default.nix @@ -15,9 +15,6 @@ cabal.mkDerivation (self: { description = "Binding to the GtkSourceView library"; license = self.stdenv.lib.licenses.lgpl21; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/hS3/default.nix b/pkgs/development/libraries/haskell/hS3/default.nix index da16347a8ddfae8c187ae064e5824d05d0f183a6..83ee2c810ebda5b4f38a1418654b55bd43197553 100644 --- a/pkgs/development/libraries/haskell/hS3/default.nix +++ b/pkgs/development/libraries/haskell/hS3/default.nix @@ -17,9 +17,6 @@ cabal.mkDerivation (self: { description = "Interface to Amazon's Simple Storage Service (S3)"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/hamlet/default.nix b/pkgs/development/libraries/haskell/hamlet/default.nix index fc141f4780d5994202aac9303264c010929ea096..c5d0b335531effc0dad8c0ca47d6dec56bd12015 100644 --- a/pkgs/development/libraries/haskell/hamlet/default.nix +++ b/pkgs/development/libraries/haskell/hamlet/default.nix @@ -15,9 +15,6 @@ cabal.mkDerivation (self: { description = "Haml-like template files that are compile-time checked"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix b/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix index 64bf08ef5336ebc40d87fe10f304e6d9c4ec5608..fad611798e9dbd4a471bf29541de7c496cacab68 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Support for Hamlet HTML templates in Happstack"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/happstack/happstack-server.nix b/pkgs/development/libraries/haskell/happstack/happstack-server.nix index 28520ceae0fb8f56c36051647a520f2d684718e3..b679ba453fd2c3642a6c73a42b1aef54a93d67b6 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-server.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-server.nix @@ -22,9 +22,6 @@ cabal.mkDerivation (self: { description = "Web related tools and services"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/happstack/happstack-util.nix b/pkgs/development/libraries/haskell/happstack/happstack-util.nix index 63e6c47b5b32af4b954c06e23ecaae66ff4e19cb..8dfac311a9a50f016c9a9c854c301ea6c8308187 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-util.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-util.nix @@ -18,9 +18,6 @@ cabal.mkDerivation (self: { description = "Web framework"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/hashable/1.1.2.5.nix b/pkgs/development/libraries/haskell/hashable/1.1.2.5.nix index cc261a55235592e154e09b86d05f6f73e26142e0..ffb3f98e8b334c74f2f6f2371a32deefbed63c85 100644 --- a/pkgs/development/libraries/haskell/hashable/1.1.2.5.nix +++ b/pkgs/development/libraries/haskell/hashable/1.1.2.5.nix @@ -15,9 +15,6 @@ cabal.mkDerivation (self: { description = "A class for types that can be converted to a hash value"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/hashable/1.2.0.7.nix b/pkgs/development/libraries/haskell/hashable/1.2.0.7.nix index b97d168d4121958f5c89509e3491654643e2a6aa..e92f0c2c9d1389907cb13bffc5e44766fdf39af9 100644 --- a/pkgs/development/libraries/haskell/hashable/1.2.0.7.nix +++ b/pkgs/development/libraries/haskell/hashable/1.2.0.7.nix @@ -17,9 +17,6 @@ cabal.mkDerivation (self: { description = "A class for types that can be converted to a hash value"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/hashed-storage/default.nix b/pkgs/development/libraries/haskell/hashed-storage/default.nix index 88e5839363e7ae2f4bb10db3ecb1ef1cd5d2233e..77a4251259d3e38d35b79965697c5965b1aef959 100644 --- a/pkgs/development/libraries/haskell/hashed-storage/default.nix +++ b/pkgs/development/libraries/haskell/hashed-storage/default.nix @@ -16,9 +16,6 @@ cabal.mkDerivation (self: { description = "Hashed file storage support code"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/hashtables/default.nix b/pkgs/development/libraries/haskell/hashtables/default.nix index 14407a038b82fbf9633e718f1cd11a60be71f73e..ae62c051ec5e95678519ef4e2627094b5626467b 100644 --- a/pkgs/development/libraries/haskell/hashtables/default.nix +++ b/pkgs/development/libraries/haskell/hashtables/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Mutable hash tables in the ST monad"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/haskeline-class/default.nix b/pkgs/development/libraries/haskell/haskeline-class/default.nix index acf6a6c0d4fa24684cec96563acd58b9e5cd012a..76080574fcc80e1f3690f1101b998b7b728142b1 100644 --- a/pkgs/development/libraries/haskell/haskeline-class/default.nix +++ b/pkgs/development/libraries/haskell/haskeline-class/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Class interface for working with Haskeline"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/haskeline/default.nix b/pkgs/development/libraries/haskell/haskeline/default.nix index 1e8c406c21b33243df34a3c22dfa9e7a8c82f3f9..a283f229b762e0319adf0485052ab21adb70f784 100644 --- a/pkgs/development/libraries/haskell/haskeline/default.nix +++ b/pkgs/development/libraries/haskell/haskeline/default.nix @@ -11,9 +11,6 @@ cabal.mkDerivation (self: { description = "A command-line interface for user input, written in Haskell"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/haskell-lexer/default.nix b/pkgs/development/libraries/haskell/haskell-lexer/default.nix index 90c4a599bc4ce08ac175519c91b3d7613f86ebee..9aa1bdea951450d2effcf2ba6d7e64c11bb68b1b 100644 --- a/pkgs/development/libraries/haskell/haskell-lexer/default.nix +++ b/pkgs/development/libraries/haskell/haskell-lexer/default.nix @@ -8,9 +8,6 @@ cabal.mkDerivation (self: { description = "A fully compliant Haskell 98 lexer"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/haskell-mpi/default.nix b/pkgs/development/libraries/haskell/haskell-mpi/default.nix index bcd1e22037c005b9ccca2af9158cc85027925f7c..add910b619362edf6b73ba4b7cf618b672fa2734 100644 --- a/pkgs/development/libraries/haskell/haskell-mpi/default.nix +++ b/pkgs/development/libraries/haskell/haskell-mpi/default.nix @@ -14,9 +14,6 @@ cabal.mkDerivation (self: { description = "Distributed parallel programming in Haskell using MPI"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/haskell-platform/2013.2.0.0.nix b/pkgs/development/libraries/haskell/haskell-platform/2013.2.0.0.nix new file mode 100644 index 0000000000000000000000000000000000000000..2e0181bd1a7b9622f68e6d1249b8a2384aee5618 --- /dev/null +++ b/pkgs/development/libraries/haskell/haskell-platform/2013.2.0.0.nix @@ -0,0 +1,45 @@ +{ cabal, fetchurl +, async, attoparsec, caseInsensitive, cgi, fgl, GLUT, GLURaw, haskellSrc +, hashable, html, HTTP, HUnit, mtl, network, OpenGL, OpenGLRaw, parallel +, parsec, QuickCheck, random, regexBase, regexCompat, regexPosix, split, stm +, syb, text, transformers, unorderedContainers, vector, xhtml, zlib +, cabalInstall, alex, haddock, happy, primitive, ghc +}: + +# This is just a meta-package. Because upstream fails to provide proper versioned +# release tarballs that can be used for the purpose of verifying this package, we +# just create it on the fly from a simple Setup.hs file and a .cabal file that we +# store directly in the nixpkgs repository. + +cabal.mkDerivation (self : { + pname = "haskell-platform"; + version = "2013.2.0.0"; + cabalFile = ./haskell-platform-2013.2.0.0.cabal; + setupFile = ./Setup.hs; + src = null; + propagatedBuildInputs = [ + async attoparsec caseInsensitive cgi fgl GLUT GLURaw haskellSrc + hashable html HTTP HUnit mtl network OpenGL OpenGLRaw parallel + parsec QuickCheck random regexBase regexCompat regexPosix split stm + syb text transformers unorderedContainers vector xhtml zlib + cabalInstall alex haddock happy primitive ghc + ]; + unpackPhase = '' + sourceRoot=haskell-platform + mkdir $sourceRoot + cp ${self.cabalFile} $sourceRoot/${self.pname}.cabal + cp ${self.setupFile} $sourceRoot/Setup.hs + touch $sourceRoot/LICENSE + ''; + noHaddock = true; + meta = { + homepage = "http://haskell.org/platform"; + description = "Haskell Platform meta package"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2013.2.0.0.cabal b/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2013.2.0.0.cabal new file mode 100644 index 0000000000000000000000000000000000000000..cf676ab1d6e0301c65637c980d6c629044b8d1b5 --- /dev/null +++ b/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2013.2.0.0.cabal @@ -0,0 +1,118 @@ +name: haskell-platform +version: 2013.2.0.0 +homepage: http://haskell.org/platform +license: BSD3 +license-file: LICENSE +author: libraries@haskell.org +maintainer: haskell-platform@projects.haskell.org +category: System +synopsis: The Haskell Platform +description: + The Haskell Platform (HP) is the blessed set of libraries and tools on + which to build further Haskell libraries and applications. It is + intended to provide a comprehensive, stable, and quality tested base for + Haskell projects to work from. + . + This version specifies the following additional developer tools be + installed, for a system to be in full compliance: + . + * cabal-install + * alex + * happy + * haddock + +cabal-version: >= 1.8 +build-type: Custom +tested-with: GHC ==7.6.3 + +flag include-ghc-depends + description: Include all the GHC provided packages in the dependencies + default: False + +library + if flag(include-ghc-depends) + build-depends: + ghc ==7.6.3, + + -- Core libraries: provided by every ghc installation + -- We don't include "non-API" packages here. + -- begin core packages + array ==0.4.0.1, + base ==4.6.0.1, + bytestring ==0.10.0.2, + Cabal ==1.16.0, + containers ==0.5.0.0, + deepseq ==1.3.0.1, + directory ==1.2.0.1, + filepath ==1.3.0.1, + haskell2010 ==1.1.1.0, + haskell98 ==2.0.0.2, + hpc ==0.6.0.0, + old-locale ==1.0.0.5, + old-time ==1.1.0.1, + pretty ==1.1.1.0, + process ==1.1.0.2, + template-haskell ==2.8.0.0, + time ==1.4.0.1 + if !os(windows) + build-depends: + unix ==2.6.0.1 + -- end core packages + else + build-depends: + Win32 ==2.3.0.0 + + build-depends: + -- Libraries in addition to what GHC provides: + -- Note: newer versions of cgi need monad-catchio. + -- begin platform packages + async ==2.0.1.4, + attoparsec ==0.10.4.0, + case-insensitive ==1.0.0.1, + cgi ==3001.1.7.5, + fgl ==5.4.2.4, + GLUT ==2.4.0.0, + GLURaw ==1.3.0.0, + haskell-src ==1.0.1.5, + hashable ==1.1.2.5, + html ==1.0.1.2, + HTTP ==4000.2.8, + HUnit ==1.2.5.2, + mtl ==2.1.2, + network ==2.4.1.2, + OpenGL ==2.8.0.0, + OpenGLRaw ==1.3.0.0, + parallel ==3.2.0.3, + parsec ==3.1.3, + QuickCheck ==2.6, + random ==1.0.1.1, + regex-base ==0.93.2, + regex-compat ==0.95.1, + regex-posix ==0.95.2, + split ==0.2.2, + stm ==2.4.2, + syb ==0.4.0, + text ==0.11.3.1, + transformers ==0.3.0.0, + unordered-containers ==0.2.3.0, + vector ==0.10.0.1, + xhtml ==3000.2.1, + zlib ==0.5.4.1, + + -- Libraries that are needed to support the above, + -- though are not officially part of the platform + primitive ==0.5.0.1 + + -- Depending on programs does not work, they are not registered + -- We list them to help distro packaging. + build-tools: + cabal-install ==1.16.0.2, + alex ==3.0.5, + happy ==1.18.10 + -- end platform packages + -- hscolour ==1.20.3 -- ??? + -- haddock ==2.13.2 -- need to use the one shipped with ghc + +-- N.B.: The begin/end comment annotations are used to build the source +-- installer: Packages that are part of the core are checked at build time. +-- Source of packages that are part of the platform are included in the tarball. diff --git a/pkgs/development/libraries/haskell/haskell-src-exts/1.11.1.nix b/pkgs/development/libraries/haskell/haskell-src-exts/1.11.1.nix index bad9ab911759b333c77032eaa9a64c5787b62108..1918260cc62f379258c68812eb476ea8032180b4 100644 --- a/pkgs/development/libraries/haskell/haskell-src-exts/1.11.1.nix +++ b/pkgs/development/libraries/haskell/haskell-src-exts/1.11.1.nix @@ -12,9 +12,6 @@ cabal.mkDerivation (self: { description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/haskell-src-exts/1.13.5.nix b/pkgs/development/libraries/haskell/haskell-src-exts/1.13.5.nix index 280fa347d8975fdd63afb54dd752726a6194e809..5521e037b4ebba72f6163780e840ff582a6996ac 100644 --- a/pkgs/development/libraries/haskell/haskell-src-exts/1.13.5.nix +++ b/pkgs/development/libraries/haskell/haskell-src-exts/1.13.5.nix @@ -12,9 +12,6 @@ cabal.mkDerivation (self: { description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/haskell-src-meta/default.nix b/pkgs/development/libraries/haskell/haskell-src-meta/default.nix index 84df55723959474067f143e202d9d0d7a9c074d4..7b6ccb69633823b59261817462aef5c2cccdadab 100644 --- a/pkgs/development/libraries/haskell/haskell-src-meta/default.nix +++ b/pkgs/development/libraries/haskell/haskell-src-meta/default.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Parse source to template-haskell abstract syntax"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/haskell-src/1.0.1.3.nix b/pkgs/development/libraries/haskell/haskell-src/1.0.1.3.nix index 0bec73765444cee3319cda46e1f3815df10e3031..6729cbef2aa61324bd836b1ef53c3822d8b7e79e 100644 --- a/pkgs/development/libraries/haskell/haskell-src/1.0.1.3.nix +++ b/pkgs/development/libraries/haskell/haskell-src/1.0.1.3.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Manipulating Haskell source code"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/haskell-src/1.0.1.4.nix b/pkgs/development/libraries/haskell/haskell-src/1.0.1.4.nix index 949efadea96af6487bb9e99511604490301c3181..1895a655d92f61f235f3b58b037e2a19162c8974 100644 --- a/pkgs/development/libraries/haskell/haskell-src/1.0.1.4.nix +++ b/pkgs/development/libraries/haskell/haskell-src/1.0.1.4.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Support for manipulating Haskell source code"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/haskell-src/1.0.1.5.nix b/pkgs/development/libraries/haskell/haskell-src/1.0.1.5.nix index dd62d57a02abff67d9699c615c5db32c81bb60bf..1dbbbec550a44ca850b4f3fa0d15e59ae1882b70 100644 --- a/pkgs/development/libraries/haskell/haskell-src/1.0.1.5.nix +++ b/pkgs/development/libraries/haskell/haskell-src/1.0.1.5.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Support for manipulating Haskell source code"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/hastache/default.nix b/pkgs/development/libraries/haskell/hastache/default.nix index a98c3b3ed372ea7cea3a6be472d09680c03e3076..15d32de346df0cbb68ce92c58487253fac9d8ade 100644 --- a/pkgs/development/libraries/haskell/hastache/default.nix +++ b/pkgs/development/libraries/haskell/hastache/default.nix @@ -15,9 +15,6 @@ cabal.mkDerivation (self: { description = "Haskell implementation of Mustache templates"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/haxr-th/default.nix b/pkgs/development/libraries/haskell/haxr-th/default.nix index 83917cf8891948fe4e3dc774e1e5c4b58552153d..b319857bac3dd2f32008e2b5a089c9023a081bed 100644 --- a/pkgs/development/libraries/haskell/haxr-th/default.nix +++ b/pkgs/development/libraries/haskell/haxr-th/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Automatic deriving of XML-RPC structs for Haskell records"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/haxr/default.nix b/pkgs/development/libraries/haskell/haxr/default.nix index c17680efc90a05ace9995c0f634f0d2ad77b10fc..a5aaf44c3928c4cb005c947507fb198ce56dcc03 100644 --- a/pkgs/development/libraries/haskell/haxr/default.nix +++ b/pkgs/development/libraries/haskell/haxr/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "haxr"; - version = "3000.9.1"; - sha256 = "0m716ncb81y245vviz04089nlrvkca9cvjvj2qphkdhhmxsqw8fc"; + version = "3000.9.3"; + sha256 = "1jg7abgbykxjjpmakmfm6zcwxn0hf9q53430ibr4m9n6alh7nglq"; buildDepends = [ base64Bytestring blazeBuilder HaXml HTTP mtl network time utf8String @@ -15,9 +15,6 @@ cabal.mkDerivation (self: { description = "XML-RPC client and server library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/heist/default.nix b/pkgs/development/libraries/haskell/heist/default.nix index ff1c893cd0e72d4e41673f5b6ecf36cc3c1543e5..22ad08afe3804edcd55883999351c779e90075b1 100644 --- a/pkgs/development/libraries/haskell/heist/default.nix +++ b/pkgs/development/libraries/haskell/heist/default.nix @@ -1,22 +1,22 @@ { cabal, aeson, attoparsec, blazeBuilder, blazeHtml, directoryTree , dlist, errors, filepath, hashable, MonadCatchIOTransformers, mtl -, random, text, time, unorderedContainers, vector, xmlhtml +, random, text, time, transformers, unorderedContainers, vector +, xmlhtml }: cabal.mkDerivation (self: { pname = "heist"; - version = "0.11.1"; - sha256 = "17d6jycgxx5fz8sd3wnln53im29vz8l9847qsqbpyx8adrcg7rjh"; + version = "0.12.0"; + sha256 = "0fdqvippsxljylchfcr32lw367i17cpv4yavjvmhfd923vgmmfj9"; buildDepends = [ aeson attoparsec blazeBuilder blazeHtml directoryTree dlist errors filepath hashable MonadCatchIOTransformers mtl random text time - unorderedContainers vector xmlhtml + transformers unorderedContainers vector xmlhtml ]; meta = { homepage = "http://snapframework.com/"; description = "An Haskell template system supporting both HTML5 and XML"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/hexpat/default.nix b/pkgs/development/libraries/haskell/hexpat/default.nix index f1c6f87852625f9aabd736db7e42ee5dffbeb6ca..5a656bc19c78b920f6b1d4ea2547bdea2b8ac8cd 100644 --- a/pkgs/development/libraries/haskell/hexpat/default.nix +++ b/pkgs/development/libraries/haskell/hexpat/default.nix @@ -14,6 +14,5 @@ cabal.mkDerivation (self: { description = "XML parser/formatter based on expat"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/highlighting-kate/default.nix b/pkgs/development/libraries/haskell/highlighting-kate/default.nix index e137f58c11c6762429165dc05d1ca354132d4287..fb7d0d4a00a6bbb45082aacfa1d0cf48a131c60d 100644 --- a/pkgs/development/libraries/haskell/highlighting-kate/default.nix +++ b/pkgs/development/libraries/haskell/highlighting-kate/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "highlighting-kate"; - version = "0.5.3.8"; - sha256 = "1fdgmwhiw05mgbgsrgyzvdqzklw9r10nswxfpnxkh5ivfxrhz82w"; + version = "0.5.3.9"; + sha256 = "158k38snqhgfjyzq82f8k1fkrpw0ld023wndzyzwwc6s933ap8hc"; isLibrary = true; isExecutable = true; buildDepends = [ blazeHtml filepath mtl parsec regexPcre ]; @@ -13,9 +13,6 @@ cabal.mkDerivation (self: { description = "Syntax highlighting"; license = "GPL"; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/hinotify/default.nix b/pkgs/development/libraries/haskell/hinotify/default.nix index 1c6a0bfc7d45758bf41ab9cc222a318d7c6f4272..de1c0e1275972803d57140edd2085b5076c5a4d1 100644 --- a/pkgs/development/libraries/haskell/hinotify/default.nix +++ b/pkgs/development/libraries/haskell/hinotify/default.nix @@ -9,6 +9,5 @@ cabal.mkDerivation (self: { description = "Haskell binding to inotify"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/hint/default.nix b/pkgs/development/libraries/haskell/hint/default.nix index 4a9c835e1fb760157fb48714d6b14def25241d93..8cf1accca9c7c260d173802f658b12cb7c773ae7 100644 --- a/pkgs/development/libraries/haskell/hint/default.nix +++ b/pkgs/development/libraries/haskell/hint/default.nix @@ -15,9 +15,6 @@ cabal.mkDerivation (self: { description = "Runtime Haskell interpreter (GHC API wrapper)"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/hjsmin/default.nix b/pkgs/development/libraries/haskell/hjsmin/default.nix index 7bfe5a8fa9575862166aa1095d3f389401103904..9551581dadf6216c3cec3b3fd38258cdafc9ecd0 100644 --- a/pkgs/development/libraries/haskell/hjsmin/default.nix +++ b/pkgs/development/libraries/haskell/hjsmin/default.nix @@ -16,9 +16,6 @@ cabal.mkDerivation (self: { description = "Haskell implementation of a javascript minifier"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/hmatrix/default.nix b/pkgs/development/libraries/haskell/hmatrix/default.nix index d22bd1b186c289e45bbae04e68a9ce77da1ee7a8..2542e2005865007832b2b209443cb5e99e1c74f6 100644 --- a/pkgs/development/libraries/haskell/hmatrix/default.nix +++ b/pkgs/development/libraries/haskell/hmatrix/default.nix @@ -16,7 +16,6 @@ cabal.mkDerivation (self: { maintainers = [ self.stdenv.lib.maintainers.andres self.stdenv.lib.maintainers.guibert - self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/hoauth/default.nix b/pkgs/development/libraries/haskell/hoauth/default.nix index d2ff9c480800a8d3a961904e775c9f0b49a9c4f3..c568b292c3c1d323de7923b095ff5877f2b11686 100644 --- a/pkgs/development/libraries/haskell/hoauth/default.nix +++ b/pkgs/development/libraries/haskell/hoauth/default.nix @@ -14,9 +14,6 @@ cabal.mkDerivation (self: { description = "A Haskell implementation of OAuth 1.0a protocol."; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/hoogle/default.nix b/pkgs/development/libraries/haskell/hoogle/default.nix index 306ee1437ba60a6aeb132f47973dc9e577b54c17..1e722a186dc481a6f40af7fd6fa503ced09e087c 100644 --- a/pkgs/development/libraries/haskell/hoogle/default.nix +++ b/pkgs/development/libraries/haskell/hoogle/default.nix @@ -19,9 +19,6 @@ cabal.mkDerivation (self: { description = "Haskell API Search"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/hostname/default.nix b/pkgs/development/libraries/haskell/hostname/default.nix index 69653ca2699ff2071963fb7a5a36dd587e386d64..75886f8daadf5f84a3268d6a933a563d1dcb2f38 100644 --- a/pkgs/development/libraries/haskell/hostname/default.nix +++ b/pkgs/development/libraries/haskell/hostname/default.nix @@ -8,9 +8,6 @@ cabal.mkDerivation (self: { description = "A very simple package providing a cross-platform means of determining the hostname"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/hp2any-core/default.nix b/pkgs/development/libraries/haskell/hp2any-core/default.nix index f77d0ea677fede7d6a003d69a1a25d52f1b27e9a..96ac397da79c51588360d6a2015832316e033c70 100644 --- a/pkgs/development/libraries/haskell/hp2any-core/default.nix +++ b/pkgs/development/libraries/haskell/hp2any-core/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Heap profiling helper library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/hp2any-graph/default.nix b/pkgs/development/libraries/haskell/hp2any-graph/default.nix index e1494f50693d8edbe8fbe8f0cfe5db24fa02de9f..83369ac008b761ccf8347ea7a35217b635cf23a0 100644 --- a/pkgs/development/libraries/haskell/hp2any-graph/default.nix +++ b/pkgs/development/libraries/haskell/hp2any-graph/default.nix @@ -17,9 +17,6 @@ cabal.mkDerivation (self: { description = "Real-time heap graphing utility and profile stream server with a reusable graphing module"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/hs-bibutils/default.nix b/pkgs/development/libraries/haskell/hs-bibutils/default.nix index 0674ed31659aecdc574734df92f0e4bb293c44cb..592862d49ef1c574fe915704813f6fc9bf1d8d20 100644 --- a/pkgs/development/libraries/haskell/hs-bibutils/default.nix +++ b/pkgs/development/libraries/haskell/hs-bibutils/default.nix @@ -2,17 +2,14 @@ cabal.mkDerivation (self: { pname = "hs-bibutils"; - version = "4.17"; - sha256 = "0vv1qsxbwwb1nfwpvxvqacfjs3sswldrx3wimaxixmw9ynkkkwdg"; + version = "4.17.1"; + sha256 = "0qn3kibwwiaandmk672n9lki431934qahj81r4yj2acmyv6fcycf"; buildDepends = [ syb ]; meta = { homepage = "http://gorgias.mine.nu/repos/hs-bibutils/"; description = "Haskell bindings to bibutils, the bibliography conversion utilities"; license = "GPL"; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/hscolour/default.nix b/pkgs/development/libraries/haskell/hscolour/default.nix index 63b615607230a165395dbb4d49e3e716456e37e2..d8bc08b4b33c456d6274e3671c6debff19b5e8e4 100644 --- a/pkgs/development/libraries/haskell/hscolour/default.nix +++ b/pkgs/development/libraries/haskell/hscolour/default.nix @@ -11,9 +11,6 @@ cabal.mkDerivation (self: { description = "Colourise Haskell code"; license = "GPL"; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/hslogger-template/default.nix b/pkgs/development/libraries/haskell/hslogger-template/default.nix index e7f75fb74d3ee677fb54e05b99cd6bae0d513492..be78bea938cf612b0329841fb5719db7c5cabdfb 100644 --- a/pkgs/development/libraries/haskell/hslogger-template/default.nix +++ b/pkgs/development/libraries/haskell/hslogger-template/default.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Automatic generation of hslogger functions"; license = self.stdenv.lib.licenses.publicDomain; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/hspec-expectations/default.nix b/pkgs/development/libraries/haskell/hspec-expectations/default.nix index 52defb43e4cbed20f16c1bad5063c0df421585b7..4aaa5fe5e953e9d55545fa1f40181e890199c62c 100644 --- a/pkgs/development/libraries/haskell/hspec-expectations/default.nix +++ b/pkgs/development/libraries/haskell/hspec-expectations/default.nix @@ -12,6 +12,5 @@ cabal.mkDerivation (self: { description = "Catchy combinators for HUnit"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/hspec-meta/default.nix b/pkgs/development/libraries/haskell/hspec-meta/default.nix index b17c5ecc0701fce4fbc38959d73ebca7d8a664f1..93162ff8cdfd56af7af0d33716c349e3ea09f731 100644 --- a/pkgs/development/libraries/haskell/hspec-meta/default.nix +++ b/pkgs/development/libraries/haskell/hspec-meta/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hspec-meta"; - version = "1.5.3"; - sha256 = "13yzk3qgqbb5jlrvy1mdq5782jzjllhnfi6ylrv8zix192y8v1mh"; + version = "1.5.4"; + sha256 = "07m7wxannk9rr8q2bdxhkjjlvwlzp7lq2c41y6cgjkjcm2x9qcc8"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -18,6 +18,5 @@ cabal.mkDerivation (self: { description = "A version of Hspec which is used to test Hspec itself"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/hspec/default.nix b/pkgs/development/libraries/haskell/hspec/default.nix index 9e2f6188761f85ec5352e1080c34b65f5e18cba7..354cd286de004332c2e3e2997c51b2e7612d2945 100644 --- a/pkgs/development/libraries/haskell/hspec/default.nix +++ b/pkgs/development/libraries/haskell/hspec/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "hspec"; - version = "1.5.3"; - sha256 = "138qjfw3kq87dvmb2ig1nsnrjpyqayvbqrjkmswn0sg8qh5cgbgb"; + version = "1.5.4"; + sha256 = "18c7mj2qh0q7ksb9sa7jhpfzsbbsfbv3gpkjpz1fx17bd3h8vkld"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -24,6 +24,5 @@ cabal.mkDerivation (self: { description = "Behavior-Driven Development for Haskell"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/hspread/default.nix b/pkgs/development/libraries/haskell/hspread/default.nix index c1ee264ea84a3afa64c152a9911d2ae1a1dc1a79..dbd1a4a0923b6839e6bb5838fbce5e4723b2870b 100644 --- a/pkgs/development/libraries/haskell/hspread/default.nix +++ b/pkgs/development/libraries/haskell/hspread/default.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "A client library for the spread toolkit"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/hstatsd/default.nix b/pkgs/development/libraries/haskell/hstatsd/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..91a6159784abc2379d1299c1315913306e0dbf8b --- /dev/null +++ b/pkgs/development/libraries/haskell/hstatsd/default.nix @@ -0,0 +1,14 @@ +{ cabal, mtl, network, text }: + +cabal.mkDerivation (self: { + pname = "hstatsd"; + version = "0.1"; + sha256 = "092q52yyb1xdji1y72bdcgvp8by2w1z9j717sl1gmh2p89cpjrs4"; + buildDepends = [ mtl network text ]; + meta = { + homepage = "https://github.com/mokus0/hstatsd"; + description = "Quick and dirty statsd interface"; + license = self.stdenv.lib.licenses.publicDomain; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/html-conduit/default.nix b/pkgs/development/libraries/haskell/html-conduit/default.nix index 7745c125e11bd622549727cfe683429743566eb0..eaf1754b6223b1368c265e41b9df5b6d84ac8935 100644 --- a/pkgs/development/libraries/haskell/html-conduit/default.nix +++ b/pkgs/development/libraries/haskell/html-conduit/default.nix @@ -17,6 +17,5 @@ cabal.mkDerivation (self: { description = "Parse HTML documents using xml-conduit datatypes"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/html/1.0.1.2.nix b/pkgs/development/libraries/haskell/html/1.0.1.2.nix index f420bad2959c235bea4c9a2727066f12a5869042..de8dc75a5faac4b2fe479183203c4a898a99c2cd 100644 --- a/pkgs/development/libraries/haskell/html/1.0.1.2.nix +++ b/pkgs/development/libraries/haskell/html/1.0.1.2.nix @@ -8,9 +8,6 @@ cabal.mkDerivation (self: { description = "HTML combinator library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index c4e610d254f19332d60f0853760ff19e18d57e37..3062c71dcf15a48a3b7160b1548bbb2017c3c761 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -32,9 +32,6 @@ cabal.mkDerivation (self: { description = "HTTP client package with conduit interface and HTTPS support"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/http-date/default.nix b/pkgs/development/libraries/haskell/http-date/default.nix index adbabc0734b33aec0228fbe37bdf7538c52e5d6a..3571c160f6b7e9af194e2a9344a1cf0eaff2d5ba 100644 --- a/pkgs/development/libraries/haskell/http-date/default.nix +++ b/pkgs/development/libraries/haskell/http-date/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "HTTP Date parser/formatter"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix index 3ed061ba1154b0b499ee599ebcd384c8f99cf5b1..6d1c34556f734a3786cb17bea0e6fa3fc735e8b7 100644 --- a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix +++ b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix @@ -22,6 +22,5 @@ cabal.mkDerivation (self: { description = "Reverse proxy HTTP requests, either over raw sockets or with WAI"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/http-types/default.nix b/pkgs/development/libraries/haskell/http-types/default.nix index 9cc9d3859d6348730fa7438bd2255a1c25b08c35..c4c064fbf81145a72d78f21c24ded4f1cfa3875c 100644 --- a/pkgs/development/libraries/haskell/http-types/default.nix +++ b/pkgs/development/libraries/haskell/http-types/default.nix @@ -11,9 +11,6 @@ cabal.mkDerivation (self: { description = "Generic HTTP types for Haskell (for both client and server code)"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/httpd-shed/default.nix b/pkgs/development/libraries/haskell/httpd-shed/default.nix index e56a95437dbe9892774e3e171efde38f8565c4e1..d1d3f28b049695cbb4377398992b0de6e48341cf 100644 --- a/pkgs/development/libraries/haskell/httpd-shed/default.nix +++ b/pkgs/development/libraries/haskell/httpd-shed/default.nix @@ -11,9 +11,6 @@ cabal.mkDerivation (self: { description = "A simple web-server with an interact style API"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/hxt-charproperties/default.nix b/pkgs/development/libraries/haskell/hxt-charproperties/default.nix index 9e2b9a21bb38225a87c0f00e7d946ac7ee9e0109..86605ae55a56c0da8114ed7d8af966c69d6e0128 100644 --- a/pkgs/development/libraries/haskell/hxt-charproperties/default.nix +++ b/pkgs/development/libraries/haskell/hxt-charproperties/default.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Character properties and classes for XML and Unicode"; license = "unknown"; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/hxt-regex-xmlschema/default.nix b/pkgs/development/libraries/haskell/hxt-regex-xmlschema/default.nix index 61465a78905825f7a6b69765b695d267128c53d4..879ff0affdc7309d4b6fe29a6b2cc1b5826f3f28 100644 --- a/pkgs/development/libraries/haskell/hxt-regex-xmlschema/default.nix +++ b/pkgs/development/libraries/haskell/hxt-regex-xmlschema/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "A regular expression library for W3C XML Schema regular expressions"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/hxt-unicode/default.nix b/pkgs/development/libraries/haskell/hxt-unicode/default.nix index 6584a69b4baed38d977012600d80cf93721fa66e..731c63b5378b90d920bb12b11eebf480ba8ebe03 100644 --- a/pkgs/development/libraries/haskell/hxt-unicode/default.nix +++ b/pkgs/development/libraries/haskell/hxt-unicode/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Unicode en-/decoding functions for utf8, iso-latin-* and other encodings"; license = "unknown"; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/hxt/default.nix b/pkgs/development/libraries/haskell/hxt/default.nix index 53f7af3e52ad3343f67ff3cdc2714580098a9635..35783c7762efb6a5f19fcbfc5b8f7a8d54754640 100644 --- a/pkgs/development/libraries/haskell/hxt/default.nix +++ b/pkgs/development/libraries/haskell/hxt/default.nix @@ -16,9 +16,6 @@ cabal.mkDerivation (self: { description = "A collection of tools for processing XML with Haskell"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/idna/default.nix b/pkgs/development/libraries/haskell/idna/default.nix index 2ca926ffae7f1bbfd2a24c00928a4fc1ac7f921e..1d5bc92bf6f1faac679bc993b706f5fd7d6b31bc 100644 --- a/pkgs/development/libraries/haskell/idna/default.nix +++ b/pkgs/development/libraries/haskell/idna/default.nix @@ -9,6 +9,5 @@ cabal.mkDerivation (self: { description = "Implements IDNA (RFC 3490)"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/ieee754/default.nix b/pkgs/development/libraries/haskell/ieee754/default.nix index 3a731c626231eacbdfd89298e1523e5e7383d29d..6eb5f262516fe6d595c24d9df60bc5eafc5693f1 100644 --- a/pkgs/development/libraries/haskell/ieee754/default.nix +++ b/pkgs/development/libraries/haskell/ieee754/default.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Utilities for dealing with IEEE floating point numbers"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/instant-generics/default.nix b/pkgs/development/libraries/haskell/instant-generics/default.nix index 4725ca37fca1edf90dd64e9932c5557bb4af0603..61e580b6293d7c59a58e62a6403b2639ce8ddc4e 100644 --- a/pkgs/development/libraries/haskell/instant-generics/default.nix +++ b/pkgs/development/libraries/haskell/instant-generics/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Generic programming library with a sum of products view"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/io-choice/default.nix b/pkgs/development/libraries/haskell/io-choice/default.nix index f48db1d12be31bdc2650a6b72b45f0d3a4f9e643..bec6431b42b3e9f994677707ccd4a01d4a5737fd 100644 --- a/pkgs/development/libraries/haskell/io-choice/default.nix +++ b/pkgs/development/libraries/haskell/io-choice/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "io-choice"; - version = "0.0.3"; - sha256 = "1dfl6n3r8hifl9rli2qvwgichz3h7nxq0v6m1k29vb8dv35ldsd8"; + version = "0.0.4"; + sha256 = "1b6jvk37jkpd4m3r6ip70xwzrz67a30yam831nqpljsbgk2f9arq"; buildDepends = [ liftedBase monadControl transformers transformersBase ]; @@ -14,9 +14,6 @@ cabal.mkDerivation (self: { description = "Choice for IO and lifted IO"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/io-storage/default.nix b/pkgs/development/libraries/haskell/io-storage/default.nix index 55b88ac1d36a2148428a71511fa775404f76eb3e..32e60325acc9d5ea93a653cad3cea7308f661719 100644 --- a/pkgs/development/libraries/haskell/io-storage/default.nix +++ b/pkgs/development/libraries/haskell/io-storage/default.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "A key-value store in the IO monad"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/iproute/default.nix b/pkgs/development/libraries/haskell/iproute/default.nix index e5092ccb1acef78ce10cdc7138e6622b571c9523..045bb64035c4f4a3971217bd676b6cab3739e347 100644 --- a/pkgs/development/libraries/haskell/iproute/default.nix +++ b/pkgs/development/libraries/haskell/iproute/default.nix @@ -15,6 +15,5 @@ cabal.mkDerivation (self: { description = "IP Routing Table"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/irc/default.nix b/pkgs/development/libraries/haskell/irc/default.nix index 8bfcde01282e1d5dccfd89dafcb49bcbdbeff5dd..89d277d1f40627c5d76bdee5de968951189b59ab 100644 --- a/pkgs/development/libraries/haskell/irc/default.nix +++ b/pkgs/development/libraries/haskell/irc/default.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "A small library for parsing IRC messages"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/iteratee/default.nix b/pkgs/development/libraries/haskell/iteratee/default.nix index fa906583afcfcf267321bcc407087c349044617c..ee9026bae4931fafdacd7c82d85cec15fc2d2963 100644 --- a/pkgs/development/libraries/haskell/iteratee/default.nix +++ b/pkgs/development/libraries/haskell/iteratee/default.nix @@ -15,9 +15,6 @@ cabal.mkDerivation (self: { description = "Iteratee-based I/O"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/ivor/default.nix b/pkgs/development/libraries/haskell/ivor/default.nix index a7fc6b7e6e11ec322f673cbad6aee4fa83619076..d062ec298690446b8a8d764764000bf4f1bd2f31 100644 --- a/pkgs/development/libraries/haskell/ivor/default.nix +++ b/pkgs/development/libraries/haskell/ivor/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Theorem proving library based on dependent type theory"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/ix-shapable/default.nix b/pkgs/development/libraries/haskell/ix-shapable/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..056e308b4ac35d4e0ae899bef68326a426de6f7e --- /dev/null +++ b/pkgs/development/libraries/haskell/ix-shapable/default.nix @@ -0,0 +1,12 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "ix-shapable"; + version = "0.1.0"; + sha256 = "08ljlzywnw0h8ijwb6yh4r8l6z7bbknwxv9cjq7lkfx7m2vgy1sh"; + meta = { + description = "Reshape multi-dimensional arrays"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/jpeg/default.nix b/pkgs/development/libraries/haskell/jpeg/default.nix index 872f2fb394f7fd5435a055eb498b3febee9dfb5c..c93aa0411d40a3fd30e69101ade87ec883b2e232 100644 --- a/pkgs/development/libraries/haskell/jpeg/default.nix +++ b/pkgs/development/libraries/haskell/jpeg/default.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "A library for decoding JPEG files written in pure Haskell"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/json/default.nix b/pkgs/development/libraries/haskell/json/default.nix index 3e2f2cca387fd8b7e421c1fe7b04d369af2a25a1..9a56f412fe2b11586aa56f8a7ef440fd4252ff2c 100644 --- a/pkgs/development/libraries/haskell/json/default.nix +++ b/pkgs/development/libraries/haskell/json/default.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Support for serialising Haskell to and from JSON"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/jsonTypes/default.nix b/pkgs/development/libraries/haskell/jsonTypes/default.nix index 44be8624a41aa80be775521ec84a0ea666b672d3..dd6c3eb058f27dba6e07f6c432cf8cb8839dda48 100644 --- a/pkgs/development/libraries/haskell/jsonTypes/default.nix +++ b/pkgs/development/libraries/haskell/jsonTypes/default.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Basic types for representing JSON"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/kansas-lava/default.nix b/pkgs/development/libraries/haskell/kansas-lava/default.nix index 489d4e9cdb3ffb693b1180e72c2a7e2c867cc1e8..6ae0447b1fe6ff6689c28d8d77b5fe168c437790 100644 --- a/pkgs/development/libraries/haskell/kansas-lava/default.nix +++ b/pkgs/development/libraries/haskell/kansas-lava/default.nix @@ -18,6 +18,5 @@ cabal.mkDerivation (self: { description = "Kansas Lava is a hardware simulator and VHDL generator"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/knob/default.nix b/pkgs/development/libraries/haskell/knob/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..acaf8def0046f0dbfd32122d2525a33dd4ecacdb --- /dev/null +++ b/pkgs/development/libraries/haskell/knob/default.nix @@ -0,0 +1,14 @@ +{ cabal, transformers }: + +cabal.mkDerivation (self: { + pname = "knob"; + version = "0.1.1"; + sha256 = "05qj7s04p5pbasivyxc06l0jbii250zjnvb3l1y2sfhglb7q8b4c"; + buildDepends = [ transformers ]; + meta = { + homepage = "https://john-millikin.com/software/knob/"; + description = "Memory-backed handles"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/lambdabot-utils/default.nix b/pkgs/development/libraries/haskell/lambdabot-utils/default.nix index 2a8813d72a5ff7e1a7702716aa50ecfcccc3c3a3..51db50a75b7610733a13e402b6ceb652fcb4265d 100644 --- a/pkgs/development/libraries/haskell/lambdabot-utils/default.nix +++ b/pkgs/development/libraries/haskell/lambdabot-utils/default.nix @@ -15,9 +15,6 @@ cabal.mkDerivation (self: { description = "Utility libraries for the advanced IRC bot, Lambdabot"; license = "GPL"; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/lambdabot/default.nix b/pkgs/development/libraries/haskell/lambdabot/default.nix index 68269106e5d4b501f022166e4d83fde3029a9377..922130f4f9b9d8e3216a94e9f6fe590ea7365a94 100644 --- a/pkgs/development/libraries/haskell/lambdabot/default.nix +++ b/pkgs/development/libraries/haskell/lambdabot/default.nix @@ -1,30 +1,33 @@ -{ cabal, arrows, binary, brainfuck, dataMemocombinators, filepath -, haskellSrc, haskellSrcExts, HTTP, IOSpec, lambdabotUtils, logict -, MonadRandom, mtl, network, numbers, oeis, parsec, random -, readline, regexCompat, show, syb, tagsoup, unlambda, utf8String -, vectorSpace +{ cabal, arrows, binary, brainfuck, dataMemocombinators +, dependentMap, dependentSum, dependentSumTemplate, dice +, editDistance, filepath, haskeline, haskellSrcExts, hoogle +, hslogger, hstatsd, HTTP, IOSpec, liftedBase, logict, misfortune +, monadControl, MonadRandom, mtl, mueval, network, numbers, oeis +, parsec, QuickCheck, random, randomFu, randomSource, regexTdfa +, SafeSemaphore, show, split, syb, tagsoup, time, transformers +, transformersBase, unlambda, utf8String, vectorSpace, zlib }: cabal.mkDerivation (self: { pname = "lambdabot"; - version = "4.2.3.3"; - sha256 = "1fxxmrm390pnqpf7v4kap2asaqh02sphl8r6inq4sdy1zs2rxrvk"; + version = "4.3"; + sha256 = "0pjwxlq4rbmg9wj44vrillly967y35b4i995mz5167hpji05clvy"; isLibrary = true; isExecutable = true; buildDepends = [ - arrows binary brainfuck dataMemocombinators filepath haskellSrc - haskellSrcExts HTTP IOSpec lambdabotUtils logict MonadRandom mtl - network numbers oeis parsec random readline regexCompat show syb - tagsoup unlambda utf8String vectorSpace + arrows binary brainfuck dataMemocombinators dependentMap + dependentSum dependentSumTemplate dice editDistance filepath + haskeline haskellSrcExts hoogle hslogger hstatsd HTTP IOSpec + liftedBase logict misfortune monadControl MonadRandom mtl mueval + network numbers oeis parsec QuickCheck random randomFu randomSource + regexTdfa SafeSemaphore show split syb tagsoup time transformers + transformersBase unlambda utf8String vectorSpace zlib ]; meta = { homepage = "http://haskell.org/haskellwiki/Lambdabot"; description = "Lambdabot is a development tool and advanced IRC bot"; license = "GPL"; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/lambdacube-engine/default.nix b/pkgs/development/libraries/haskell/lambdacube-engine/default.nix index 6d7f756c686677c3fe2942012794cf6846a8b36e..f3c9a8af4eab44fbeb3ab39d4352c87f6b5e079e 100644 --- a/pkgs/development/libraries/haskell/lambdacube-engine/default.nix +++ b/pkgs/development/libraries/haskell/lambdacube-engine/default.nix @@ -15,6 +15,5 @@ cabal.mkDerivation (self: { description = "3D rendering engine written entirely in Haskell"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/language-c-quote/0.4.4.nix b/pkgs/development/libraries/haskell/language-c-quote/0.4.4.nix deleted file mode 100644 index 7e96fd6c6a55e5fca58fb771d765d211778b3804..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/haskell/language-c-quote/0.4.4.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ cabal, alex, exceptionMtl, exceptionTransformers, filepath, happy -, haskellSrcMeta, HUnit, mainlandPretty, mtl, srcloc, syb, symbol -, testFramework, testFrameworkHunit -}: - -cabal.mkDerivation (self: { - pname = "language-c-quote"; - version = "0.4.4"; - sha256 = "1g233ja3qy64xcimy9irfb3n8zys00vg1d0s4g3hr48ilc95dl8l"; - buildDepends = [ - exceptionMtl exceptionTransformers filepath haskellSrcMeta - mainlandPretty mtl srcloc syb symbol - ]; - testDepends = [ - HUnit srcloc symbol testFramework testFrameworkHunit - ]; - buildTools = [ alex happy ]; - jailbreak = true; - meta = { - homepage = "http://www.eecs.harvard.edu/~mainland/"; - description = "C/CUDA/OpenCL quasiquoting library"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/language-c-quote/0.7.1.nix b/pkgs/development/libraries/haskell/language-c-quote/default.nix similarity index 87% rename from pkgs/development/libraries/haskell/language-c-quote/0.7.1.nix rename to pkgs/development/libraries/haskell/language-c-quote/default.nix index 1ce3ceaac8250c4d5d1c91968496c20e92fe53c6..1d3fee0f94fcec4c8c1532b1bcc0f78292e352ca 100644 --- a/pkgs/development/libraries/haskell/language-c-quote/0.7.1.nix +++ b/pkgs/development/libraries/haskell/language-c-quote/default.nix @@ -20,9 +20,6 @@ cabal.mkDerivation (self: { description = "C/CUDA/OpenCL/Objective-C quasiquoting library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/language-c/0.3.2.1.nix b/pkgs/development/libraries/haskell/language-c/0.3.2.1.nix index aa9cb12412f0356803e4d78a9e7d9497ec6ce065..154bc68c3c5ca00093d2020a501902c4ba3534a8 100644 --- a/pkgs/development/libraries/haskell/language-c/0.3.2.1.nix +++ b/pkgs/development/libraries/haskell/language-c/0.3.2.1.nix @@ -11,9 +11,6 @@ cabal.mkDerivation (self: { description = "Analysis and generation of C code"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/language-c/0.4.2.nix b/pkgs/development/libraries/haskell/language-c/0.4.2.nix index 71e514ddbc118a83115bae5ac51ee1f33b420276..5b638ea9dab49097223b2a4eb0e950dc8fadf70a 100644 --- a/pkgs/development/libraries/haskell/language-c/0.4.2.nix +++ b/pkgs/development/libraries/haskell/language-c/0.4.2.nix @@ -11,9 +11,6 @@ cabal.mkDerivation (self: { description = "Analysis and generation of C code"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/language-haskell-extract/default.nix b/pkgs/development/libraries/haskell/language-haskell-extract/default.nix index d81d4a818e20c593d86294228ad72b818b6bc16d..a77040a5578c5bd5969110c2797d552f4a88b3c8 100644 --- a/pkgs/development/libraries/haskell/language-haskell-extract/default.nix +++ b/pkgs/development/libraries/haskell/language-haskell-extract/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Module to automatically extract functions from the local code"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/language-javascript/default.nix b/pkgs/development/libraries/haskell/language-javascript/default.nix index 2ecf3490af66fb3606981cc6bcaad07e5193832f..4571b869e3bd5c78700bbd26110bd419e54b95e5 100644 --- a/pkgs/development/libraries/haskell/language-javascript/default.nix +++ b/pkgs/development/libraries/haskell/language-javascript/default.nix @@ -17,9 +17,6 @@ cabal.mkDerivation (self: { description = "Parser for JavaScript"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/largeword/default.nix b/pkgs/development/libraries/haskell/largeword/default.nix index a38099b761b98aebd84b3167bb8629e35b5d59c6..da0cafb9ba73e53a91ae6b8cb0d288b312678026 100644 --- a/pkgs/development/libraries/haskell/largeword/default.nix +++ b/pkgs/development/libraries/haskell/largeword/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "largeword"; - version = "1.0.4"; - sha256 = "19nrzbbbmsvxdhfhh6wc53lbk0xyjvbcwvjw0snym666j1w2b2l5"; + version = "1.0.5"; + sha256 = "0icwqwpn59xd0qfpaihvwz1waax617qqcl05jv9f26sjdr8688dl"; testDepends = [ HUnit QuickCheck testFramework testFrameworkHunit testFrameworkQuickcheck2 @@ -15,9 +15,6 @@ cabal.mkDerivation (self: { description = "Provides Word128, Word192 and Word256 and a way of producing other large words if required"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/lazysmallcheck/default.nix b/pkgs/development/libraries/haskell/lazysmallcheck/default.nix index 5881baf7430bfa2f9fb0bba210f25b586a48a3f8..f409d99987d9ee599af694ba7959cd2912f517d2 100644 --- a/pkgs/development/libraries/haskell/lazysmallcheck/default.nix +++ b/pkgs/development/libraries/haskell/lazysmallcheck/default.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "A library for demand-driven testing of Haskell programs"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/leksah/leksah-server.nix b/pkgs/development/libraries/haskell/leksah/leksah-server.nix index 07804ef1b7d1cb57a94030032ac0108e78a4bfd8..1a907a384f1f18c7407a58b411f0a76891e506dc 100644 --- a/pkgs/development/libraries/haskell/leksah/leksah-server.nix +++ b/pkgs/development/libraries/haskell/leksah/leksah-server.nix @@ -20,9 +20,6 @@ cabal.mkDerivation (self: { description = "Metadata collection for leksah"; license = "GPL"; platforms = self.stdenv.lib.platforms.linux; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/leksah/process-leksah.nix b/pkgs/development/libraries/haskell/leksah/process-leksah.nix index 75059e70512498471404ab70a4d7e4dbcaee102f..b8f0ed37d4cb7ab070f5b5c17f54acf63e558228 100644 --- a/pkgs/development/libraries/haskell/leksah/process-leksah.nix +++ b/pkgs/development/libraries/haskell/leksah/process-leksah.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Process libraries"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/lens/default.nix b/pkgs/development/libraries/haskell/lens/default.nix index ef0b46b236d9d2a5ed8a07da3bbdce73aadac73b..4531603214e0dd30e8306739e83b015ebf9f793c 100644 --- a/pkgs/development/libraries/haskell/lens/default.nix +++ b/pkgs/development/libraries/haskell/lens/default.nix @@ -31,6 +31,5 @@ cabal.mkDerivation (self: { description = "Lenses, Folds and Traversals"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/lenses/default.nix b/pkgs/development/libraries/haskell/lenses/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..aa560fbda06fe407e657bff6e64ee86fb1203e58 --- /dev/null +++ b/pkgs/development/libraries/haskell/lenses/default.nix @@ -0,0 +1,14 @@ +{ cabal, mtl }: + +cabal.mkDerivation (self: { + pname = "lenses"; + version = "0.1.6"; + sha256 = "0n2r7gjiq5vk6jjaxn7kr3g5gvn4y0gmdqpn9l0nfgqdnscmfbiv"; + buildDepends = [ mtl ]; + meta = { + homepage = "http://github.com/jvranish/Lenses/tree/master"; + description = "Simple Functional Lenses"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/liblastfm/default.nix b/pkgs/development/libraries/haskell/liblastfm/default.nix index 0ecf0e37ca2c96cc91edf0e9d6b3a5d0d04918d1..a07480551df744ded8cf8d9bcf053968a474d9f8 100644 --- a/pkgs/development/libraries/haskell/liblastfm/default.nix +++ b/pkgs/development/libraries/haskell/liblastfm/default.nix @@ -17,6 +17,5 @@ cabal.mkDerivation (self: { description = "Lastfm API interface"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/libmpd/default.nix b/pkgs/development/libraries/haskell/libmpd/default.nix index 64a4906fa597b0f22e78a138b23b438f10ba1d85..7402d6f31db37dbb6912c0998626beb089788255 100644 --- a/pkgs/development/libraries/haskell/libmpd/default.nix +++ b/pkgs/development/libraries/haskell/libmpd/default.nix @@ -15,9 +15,6 @@ cabal.mkDerivation (self: { description = "An MPD client library"; license = "LGPL"; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/libxml-sax/default.nix b/pkgs/development/libraries/haskell/libxml-sax/default.nix index de30698e2e7e619fc5c03fdc2637008c316e6a86..afdd782fe094dbd57d7dd01a2309f9a780ec676a 100644 --- a/pkgs/development/libraries/haskell/libxml-sax/default.nix +++ b/pkgs/development/libraries/haskell/libxml-sax/default.nix @@ -12,6 +12,5 @@ cabal.mkDerivation (self: { description = "Bindings for the libXML2 SAX interface"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/lifted-base/default.nix b/pkgs/development/libraries/haskell/lifted-base/default.nix index ea3d4278bcdc7ccf9fa2b519f59f350e8005245f..9b9dd8b679e602fd26f6d2cce72d1f048b9f69fe 100644 --- a/pkgs/development/libraries/haskell/lifted-base/default.nix +++ b/pkgs/development/libraries/haskell/lifted-base/default.nix @@ -18,9 +18,6 @@ cabal.mkDerivation (self: { description = "lifted IO operations from the base library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/lockfree-queue/default.nix b/pkgs/development/libraries/haskell/lockfree-queue/default.nix index b8aeeaa2b73a4499f266cd32b84f734e601b1604..ac2114b7f3735d442da975fd6cb90c7aac7afe89 100644 --- a/pkgs/development/libraries/haskell/lockfree-queue/default.nix +++ b/pkgs/development/libraries/haskell/lockfree-queue/default.nix @@ -1,20 +1,20 @@ -{ cabal, abstractDeque, HUnit, IORefCAS, testFramework -, testFrameworkHunit +{ cabal, abstractDeque, atomicPrimops, HUnit, IORefCAS +, testFramework, testFrameworkHunit }: cabal.mkDerivation (self: { pname = "lockfree-queue"; - version = "0.2"; - sha256 = "0m76wjw13nyj2mpz1dv2crg9sk66nlf62qgk2hbsa7ymydkq797c"; - buildDepends = [ abstractDeque IORefCAS ]; + version = "0.2.0.2"; + sha256 = "0mb07hx4cllnxv7mz19vvn9zcc5rx0ji5wv80fx0yirgk2qjpgml"; + buildDepends = [ abstractDeque atomicPrimops IORefCAS ]; testDepends = [ - abstractDeque HUnit IORefCAS testFramework testFrameworkHunit + abstractDeque atomicPrimops HUnit IORefCAS testFramework + testFrameworkHunit ]; meta = { homepage = "https://github.com/rrnewton/haskell-lockfree-queue/wiki"; description = "Michael and Scott lock-free queues"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/logfloat/default.nix b/pkgs/development/libraries/haskell/logfloat/default.nix index 5f438fb406013f93e76f2c463a13a8622cd7dd35..3088004d0a88574aba74a0110017aae0b88e33cf 100644 --- a/pkgs/development/libraries/haskell/logfloat/default.nix +++ b/pkgs/development/libraries/haskell/logfloat/default.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Log-domain floating point numbers"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/logict/default.nix b/pkgs/development/libraries/haskell/logict/default.nix index 129a7d7c90047483ed286520d616250f453043a8..0a03ed45fee66893fe3a825f45cd2fc848ac36a2 100644 --- a/pkgs/development/libraries/haskell/logict/default.nix +++ b/pkgs/development/libraries/haskell/logict/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "A backtracking logic-programming monad"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/lrucache/default.nix b/pkgs/development/libraries/haskell/lrucache/default.nix index a43b5f0fadec28392077b7bcd319c23062d7b5d0..2d494f4a8969f58fa371d46918d8b3fbaea21ae7 100644 --- a/pkgs/development/libraries/haskell/lrucache/default.nix +++ b/pkgs/development/libraries/haskell/lrucache/default.nix @@ -9,6 +9,5 @@ cabal.mkDerivation (self: { description = "a simple, pure LRU cache"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/ltk/default.nix b/pkgs/development/libraries/haskell/ltk/default.nix index 2983313e0ccee8e8aae26d17d5c07438fade4db9..7960395eb0983a6995bbbcaf88f590eebe2cf2ee 100644 --- a/pkgs/development/libraries/haskell/ltk/default.nix +++ b/pkgs/development/libraries/haskell/ltk/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Leksah tool kit"; license = "GPL"; platforms = self.stdenv.lib.platforms.linux; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/maccatcher/default.nix b/pkgs/development/libraries/haskell/maccatcher/default.nix index 03731a91d87a3b1e54192f0cbe67967699a214c3..6109f33f82fe6f200d9f43fd378eeb483bb3c6f8 100644 --- a/pkgs/development/libraries/haskell/maccatcher/default.nix +++ b/pkgs/development/libraries/haskell/maccatcher/default.nix @@ -11,6 +11,5 @@ cabal.mkDerivation (self: { description = "Obtain the host MAC address on *NIX and Windows"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/mainland-pretty/default.nix b/pkgs/development/libraries/haskell/mainland-pretty/default.nix index db03a6022dbb8c31f873cb7631f478f1f1515370..2bcf2037cbeb6746cbfc35bfe1fbafadd261308f 100644 --- a/pkgs/development/libraries/haskell/mainland-pretty/default.nix +++ b/pkgs/development/libraries/haskell/mainland-pretty/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Pretty printing designed for printing source code"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/markdown-unlit/default.nix b/pkgs/development/libraries/haskell/markdown-unlit/default.nix index 617d6caf2c9ac6e9b1e66b94b2579ef1e964d8c3..06c1b9e2fcaeb5a5a905f6d7698d17fde6a11e76 100644 --- a/pkgs/development/libraries/haskell/markdown-unlit/default.nix +++ b/pkgs/development/libraries/haskell/markdown-unlit/default.nix @@ -11,6 +11,5 @@ cabal.mkDerivation (self: { description = "Literate Haskell support for Markdown"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/math-functions/default.nix b/pkgs/development/libraries/haskell/math-functions/default.nix index f5046748a0b2cf064a1a79deaed5f3dff5dea852..2e29269a9fdfa40d7359528cdd089553d9851c78 100644 --- a/pkgs/development/libraries/haskell/math-functions/default.nix +++ b/pkgs/development/libraries/haskell/math-functions/default.nix @@ -16,9 +16,6 @@ cabal.mkDerivation (self: { description = "Special functions and Chebyshev polynomials"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/maude/default.nix b/pkgs/development/libraries/haskell/maude/default.nix index f03b771b8fda760623a6b75f0108e8b497581cdb..84f0d83a92420ce24004e001e57c87065b92e430 100644 --- a/pkgs/development/libraries/haskell/maude/default.nix +++ b/pkgs/development/libraries/haskell/maude/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "An interface to the Maude rewriting system"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/mersenne-random-pure64/default.nix b/pkgs/development/libraries/haskell/mersenne-random-pure64/default.nix index 3153bb6f608605e9f06d4b0f4f11f6319a7efca5..590290e76c3411613a4edaf23b7c429d29a7ef0c 100644 --- a/pkgs/development/libraries/haskell/mersenne-random-pure64/default.nix +++ b/pkgs/development/libraries/haskell/mersenne-random-pure64/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Generate high quality pseudorandom numbers purely using a Mersenne Twister"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/mime-mail/default.nix b/pkgs/development/libraries/haskell/mime-mail/default.nix index f9c1b69706a42ebeba86bd3deaffa79e6bcdc2a1..d24bf5719bde033e7fda19204afcf6c5376c0100 100644 --- a/pkgs/development/libraries/haskell/mime-mail/default.nix +++ b/pkgs/development/libraries/haskell/mime-mail/default.nix @@ -12,9 +12,6 @@ cabal.mkDerivation (self: { description = "Compose MIME email messages"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/mime-types/default.nix b/pkgs/development/libraries/haskell/mime-types/default.nix index 18056986cb0f272e681349b8eb2b20d25b6aad6c..5dd5f65c9e74c9ad4b3e2d8fdeb1384b93ea3e60 100644 --- a/pkgs/development/libraries/haskell/mime-types/default.nix +++ b/pkgs/development/libraries/haskell/mime-types/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Basic mime-type handling types and functions"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/minimorph/default.nix b/pkgs/development/libraries/haskell/minimorph/default.nix index b036d638caecb01c200b8bb0f55abdd2fca67323..06dcfaa11390e469bc7cb72f7a3f0856fa6df4ee 100644 --- a/pkgs/development/libraries/haskell/minimorph/default.nix +++ b/pkgs/development/libraries/haskell/minimorph/default.nix @@ -11,6 +11,5 @@ cabal.mkDerivation (self: { description = "English spelling functions with an emphasis on simplicity"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/miniutter/default.nix b/pkgs/development/libraries/haskell/miniutter/default.nix index 6cfbf687e5a6670c172357c96be37ffd5f43eedc..22018087226e9126538230fee5bfb2863f9ec240 100644 --- a/pkgs/development/libraries/haskell/miniutter/default.nix +++ b/pkgs/development/libraries/haskell/miniutter/default.nix @@ -12,6 +12,5 @@ cabal.mkDerivation (self: { description = "Simple English clause creation from arbitrary words"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/misfortune/default.nix b/pkgs/development/libraries/haskell/misfortune/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..5fe26fff744101f4a7f37d89829e1b7c73212721 --- /dev/null +++ b/pkgs/development/libraries/haskell/misfortune/default.nix @@ -0,0 +1,21 @@ +{ cabal, cereal, filepath, knob, monadLoops, randomFu, regexBase +, regexPcre, semigroups, text, utf8String, vector +}: + +cabal.mkDerivation (self: { + pname = "misfortune"; + version = "0.1.1.1"; + sha256 = "0knb31jxxn7zds13a90d4lir39386nwzd181mlzkrw5niw1zwmhb"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + cereal filepath knob monadLoops randomFu regexBase regexPcre + semigroups text utf8String vector + ]; + meta = { + homepage = "https://github.com/mokus0/misfortune"; + description = "fortune-mod clone"; + license = self.stdenv.lib.licenses.publicDomain; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/mmap/default.nix b/pkgs/development/libraries/haskell/mmap/default.nix index f810186a62bb742d6b1be9e4104e12e426086592..4d0b9fcabeb71ee5e62dc67d5636f6ea422e1202 100644 --- a/pkgs/development/libraries/haskell/mmap/default.nix +++ b/pkgs/development/libraries/haskell/mmap/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Memory mapped files for POSIX and Windows"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/mmorph/default.nix b/pkgs/development/libraries/haskell/mmorph/default.nix index 0d8e61530495baac39975861a9f3f7789b9d9912..c4379499fad9dccf3093fefa886a4f79195dcd6c 100644 --- a/pkgs/development/libraries/haskell/mmorph/default.nix +++ b/pkgs/development/libraries/haskell/mmorph/default.nix @@ -9,6 +9,5 @@ cabal.mkDerivation (self: { description = "Monad morphisms"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/monad-control/default.nix b/pkgs/development/libraries/haskell/monad-control/default.nix index 4b6431f678c358133961c7e59b9072a04d409056..ac59d470145bfa2e017f675789eee6799fe67c57 100644 --- a/pkgs/development/libraries/haskell/monad-control/default.nix +++ b/pkgs/development/libraries/haskell/monad-control/default.nix @@ -12,9 +12,6 @@ cabal.mkDerivation (self: { description = "Lift control operations, like exception catching, through monad transformers"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/monad-logger/default.nix b/pkgs/development/libraries/haskell/monad-logger/default.nix index d57d6e5ee1cfa7feea115c341688fe90e53d9acf..c06809c261dc1d805468f1c32de433dda6b2a5eb 100644 --- a/pkgs/development/libraries/haskell/monad-logger/default.nix +++ b/pkgs/development/libraries/haskell/monad-logger/default.nix @@ -15,6 +15,5 @@ cabal.mkDerivation (self: { description = "A class of monads which can log messages"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/monad-loops/default.nix b/pkgs/development/libraries/haskell/monad-loops/default.nix index fb6ead581c6276976495e68b97b380b17cae0189..a58d90fc98bfea47513af2a1d57f29abb11e447f 100644 --- a/pkgs/development/libraries/haskell/monad-loops/default.nix +++ b/pkgs/development/libraries/haskell/monad-loops/default.nix @@ -1,18 +1,14 @@ -{ cabal, stm }: +{ cabal }: cabal.mkDerivation (self: { pname = "monad-loops"; - version = "0.3.3.0"; - sha256 = "06v8wnkbjrpsy47shjy2bd8asbw6d5rgzy8z5q0jwdhira42h3v1"; - buildDepends = [ stm ]; + version = "0.4.2"; + sha256 = "08sz08p4z1p78dv7rmsqvin59h19i6i07sp7jg3zwxwjxa76fds8"; meta = { homepage = "https://github.com/mokus0/monad-loops"; description = "Monadic loops"; - license = self.stdenv.lib.licenses.bsd3; + license = self.stdenv.lib.licenses.publicDomain; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/monad-par-extras/default.nix b/pkgs/development/libraries/haskell/monad-par-extras/default.nix index b651575e0a6eae5b408184aae27b790715e12ad3..fb8773372212565bb4ce6f5d4bfb77002db2b0a4 100644 --- a/pkgs/development/libraries/haskell/monad-par-extras/default.nix +++ b/pkgs/development/libraries/haskell/monad-par-extras/default.nix @@ -12,9 +12,6 @@ cabal.mkDerivation (self: { description = "Combinators and extra features for Par monads"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/monad-par/0.1.0.3.nix b/pkgs/development/libraries/haskell/monad-par/0.1.0.3.nix index 6430ec3c7606b6a8aef124ff5c005f9a1ede5994..8692d6267cbeeb318c74de6fe56d347302b48a47 100644 --- a/pkgs/development/libraries/haskell/monad-par/0.1.0.3.nix +++ b/pkgs/development/libraries/haskell/monad-par/0.1.0.3.nix @@ -11,9 +11,6 @@ cabal.mkDerivation (self: { description = "A library for parallel programming based on a monad"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/monad-par/0.3.4.1.nix b/pkgs/development/libraries/haskell/monad-par/0.3.4.1.nix index 6ded217c4d7e0c52f0791f4465e6e74b058d65fc..3fc819542eb462049f53eab9df7fccae5c657db4 100644 --- a/pkgs/development/libraries/haskell/monad-par/0.3.4.1.nix +++ b/pkgs/development/libraries/haskell/monad-par/0.3.4.1.nix @@ -23,9 +23,6 @@ cabal.mkDerivation (self: { description = "A library for parallel programming based on a monad"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/monad-peel/default.nix b/pkgs/development/libraries/haskell/monad-peel/default.nix index afa31d1a0d5f0af4dc2870a6dd7f38b7bb9bb5e2..39f911dae938597c95c8de3fb31746554a0b6317 100644 --- a/pkgs/development/libraries/haskell/monad-peel/default.nix +++ b/pkgs/development/libraries/haskell/monad-peel/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Lift control operations like exception catching through monad transformers"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/monadcryptorandom/default.nix b/pkgs/development/libraries/haskell/monadcryptorandom/default.nix index 4daba276730adef9f8bd1b2ef25dd049949c68d0..df63e3ec659166c1210e9c9105dbc2b479598761 100644 --- a/pkgs/development/libraries/haskell/monadcryptorandom/default.nix +++ b/pkgs/development/libraries/haskell/monadcryptorandom/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "A monad for using CryptoRandomGen"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/monads-tf/default.nix b/pkgs/development/libraries/haskell/monads-tf/default.nix index 652b561de84e071048464b94d1a31c2088e3c22d..f51fd8c840ae3a21bee5ec6bc401d0fec2f4a69b 100644 --- a/pkgs/development/libraries/haskell/monads-tf/default.nix +++ b/pkgs/development/libraries/haskell/monads-tf/default.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Monad classes, using type families"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/mongoDB/default.nix b/pkgs/development/libraries/haskell/mongoDB/default.nix index caa30fe6fca049d4b71fd99757d96975897bdb7f..83b04869e68c06f0caa38f7087164d49f0048cb5 100644 --- a/pkgs/development/libraries/haskell/mongoDB/default.nix +++ b/pkgs/development/libraries/haskell/mongoDB/default.nix @@ -15,9 +15,6 @@ cabal.mkDerivation (self: { description = "Driver (client) for MongoDB, a free, scalable, fast, document DBMS"; license = "unknown"; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/monoid-extras/default.nix b/pkgs/development/libraries/haskell/monoid-extras/default.nix index 96f254d077e3ffa1ebc127ddb2b41ee8f23e8bb5..a0ba1fd9856ef578c737db270b21c8a30a344ba5 100644 --- a/pkgs/development/libraries/haskell/monoid-extras/default.nix +++ b/pkgs/development/libraries/haskell/monoid-extras/default.nix @@ -9,6 +9,5 @@ cabal.mkDerivation (self: { description = "Various extra monoid-related definitions and utilities"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/mpppc/default.nix b/pkgs/development/libraries/haskell/mpppc/default.nix index d5cb3e9769f4041b51e681b1f627f05bce4326aa..543578211718a69dcab6dd603e1a6a625e014c30 100644 --- a/pkgs/development/libraries/haskell/mpppc/default.nix +++ b/pkgs/development/libraries/haskell/mpppc/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Multi-dimensional parametric pretty-printer with color"; license = "GPL"; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/mtl/1.1.0.2.nix b/pkgs/development/libraries/haskell/mtl/1.1.0.2.nix index d609fc75cd780286086c6d1aac86d62c0c37b49f..fc8fdaef75254fd648443dd3b921ce278d0c0734 100644 --- a/pkgs/development/libraries/haskell/mtl/1.1.0.2.nix +++ b/pkgs/development/libraries/haskell/mtl/1.1.0.2.nix @@ -8,9 +8,6 @@ cabal.mkDerivation (self: { description = "Monad transformer library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/mtl/1.1.1.1.nix b/pkgs/development/libraries/haskell/mtl/1.1.1.1.nix index 05e84b90dd078077cc6d3de3aaca709a46260bb8..d7e6029a4edc78aeefa594debf85d60d88e5ac73 100644 --- a/pkgs/development/libraries/haskell/mtl/1.1.1.1.nix +++ b/pkgs/development/libraries/haskell/mtl/1.1.1.1.nix @@ -8,9 +8,6 @@ cabal.mkDerivation (self: { description = "Monad transformer library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/mtl/2.0.1.0.nix b/pkgs/development/libraries/haskell/mtl/2.0.1.0.nix index dc2ddedc121e2814f1ad6a0e01c6c72156d1f9e0..3c91b65efa0408b703aaed92fb5781aa6a68bfab 100644 --- a/pkgs/development/libraries/haskell/mtl/2.0.1.0.nix +++ b/pkgs/development/libraries/haskell/mtl/2.0.1.0.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Monad classes, using functional dependencies"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/mtl/2.1.1.nix b/pkgs/development/libraries/haskell/mtl/2.1.1.nix index 427411d410882f1fd771ba85acb9a7bddff96ee7..b9298325c207f053fe0e689c976bdf0d85bca3b3 100644 --- a/pkgs/development/libraries/haskell/mtl/2.1.1.nix +++ b/pkgs/development/libraries/haskell/mtl/2.1.1.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Monad classes, using functional dependencies"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/mtl/2.1.2.nix b/pkgs/development/libraries/haskell/mtl/2.1.2.nix index 5048a4b99686a6f467317e899f136f974ee09ab5..c10f526acf21f8fe103a1a1c26edb5bad3d132e2 100644 --- a/pkgs/development/libraries/haskell/mtl/2.1.2.nix +++ b/pkgs/development/libraries/haskell/mtl/2.1.2.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Monad classes, using functional dependencies"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/mtlparse/default.nix b/pkgs/development/libraries/haskell/mtlparse/default.nix index 349fea712eba5a96ab511d7a9534466c85152b8c..37be70cebcb13235e73c8719ba780078a987ec33 100644 --- a/pkgs/development/libraries/haskell/mtlparse/default.nix +++ b/pkgs/development/libraries/haskell/mtlparse/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "parse library using mtl package"; license = "LGPL"; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/mueval/default.nix b/pkgs/development/libraries/haskell/mueval/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..f965caf2c1e95f85ef9ae66138ac74b480ba1f0c --- /dev/null +++ b/pkgs/development/libraries/haskell/mueval/default.nix @@ -0,0 +1,21 @@ +{ cabal, Cabal, extensibleExceptions, filepath, hint, mtl, show +, simpleReflect, utf8String +}: + +cabal.mkDerivation (self: { + pname = "mueval"; + version = "0.9"; + sha256 = "1y6n3zvdlzxl5hi1raz7ac6fgy9321ilka3g2pk7p1ss9d10k8pb"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + Cabal extensibleExceptions filepath hint mtl show simpleReflect + utf8String + ]; + meta = { + homepage = "http://code.haskell.org/mubot/"; + description = "Safely evaluate pure Haskell expressions"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/multiarg/default.nix b/pkgs/development/libraries/haskell/multiarg/default.nix index 10404e64f2187f004f6ecf0b506b4bff89a890ed..f3b00a7efb2c56b125b320a6fb02c8cd24adb8bd 100644 --- a/pkgs/development/libraries/haskell/multiarg/default.nix +++ b/pkgs/development/libraries/haskell/multiarg/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Combinators to build command line parsers"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/multiplate/default.nix b/pkgs/development/libraries/haskell/multiplate/default.nix index a586b89982c053ac1a3b65ff4eeb4b1034f4487e..14310f50ef6f27a3aa553c33da7f8fbb05a43dac 100644 --- a/pkgs/development/libraries/haskell/multiplate/default.nix +++ b/pkgs/development/libraries/haskell/multiplate/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Lightweight generic library for mutually recursive data types"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/multirec/default.nix b/pkgs/development/libraries/haskell/multirec/default.nix index 98cab8421de40528b7eeb3ddefc7e51e50880929..a7d7459b4558c8c295710322cc0b90b9ac0a0a8d 100644 --- a/pkgs/development/libraries/haskell/multirec/default.nix +++ b/pkgs/development/libraries/haskell/multirec/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Generic programming for families of recursive datatypes"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/multiset/0.2.1.nix b/pkgs/development/libraries/haskell/multiset/0.2.1.nix index eb5df93d5bca63bffeadcd9c48e7fe3daf3a143e..9f85317505c90c6492120c690116d0b3c9e602d6 100644 --- a/pkgs/development/libraries/haskell/multiset/0.2.1.nix +++ b/pkgs/development/libraries/haskell/multiset/0.2.1.nix @@ -8,9 +8,6 @@ cabal.mkDerivation (self: { description = "The Data.MultiSet container type"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/multiset/0.2.2.nix b/pkgs/development/libraries/haskell/multiset/0.2.2.nix index 4ca3e4fb19f01ddf621426386ac3a130634e1c93..16fcf155747d7b00df9413b01554dff051234a9b 100644 --- a/pkgs/development/libraries/haskell/multiset/0.2.2.nix +++ b/pkgs/development/libraries/haskell/multiset/0.2.2.nix @@ -8,9 +8,6 @@ cabal.mkDerivation (self: { description = "The Data.MultiSet container type"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/murmur-hash/default.nix b/pkgs/development/libraries/haskell/murmur-hash/default.nix index 8d4c59b959e581a34a71fc3b28eaa47aeac5bf7e..0c4058eb1119ef2705845cf6cd5a219cd92fa477 100644 --- a/pkgs/development/libraries/haskell/murmur-hash/default.nix +++ b/pkgs/development/libraries/haskell/murmur-hash/default.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "MurmurHash2 implementation for Haskell"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/mwc-random/default.nix b/pkgs/development/libraries/haskell/mwc-random/default.nix index bccde70459aa2b371c6a4000e17adb50c2fab4e8..3e9be2c5e587a21a507af6e2eedc079d24bf8970 100644 --- a/pkgs/development/libraries/haskell/mwc-random/default.nix +++ b/pkgs/development/libraries/haskell/mwc-random/default.nix @@ -17,9 +17,6 @@ cabal.mkDerivation (self: { description = "Fast, high quality pseudo random number generation"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/nanospec/default.nix b/pkgs/development/libraries/haskell/nanospec/default.nix index bd3f7d7edd51707e428b0f6cdac749375d5b2f73..b7f498a35c835614487dd115c6a9588f9a752178 100644 --- a/pkgs/development/libraries/haskell/nanospec/default.nix +++ b/pkgs/development/libraries/haskell/nanospec/default.nix @@ -10,6 +10,5 @@ cabal.mkDerivation (self: { description = "A lightweight implementation of a subset of Hspec's API"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/nat/default.nix b/pkgs/development/libraries/haskell/nat/default.nix index b8fb5f9e4efc87f93752e2b57101f77f027c0b74..3ad4240e2892af3847dc41de8f3d6198c8f43e56 100644 --- a/pkgs/development/libraries/haskell/nat/default.nix +++ b/pkgs/development/libraries/haskell/nat/default.nix @@ -8,6 +8,5 @@ cabal.mkDerivation (self: { description = "Lazy binary natural numbers"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/nats/default.nix b/pkgs/development/libraries/haskell/nats/default.nix index f48a64221009095f6f2140fbdb4e8e9dff8a39d8..02f5c289836ea0ae67935c118c6d18bd5a907798 100644 --- a/pkgs/development/libraries/haskell/nats/default.nix +++ b/pkgs/development/libraries/haskell/nats/default.nix @@ -9,6 +9,5 @@ cabal.mkDerivation (self: { description = "Haskell 98 natural numbers"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/naturals/default.nix b/pkgs/development/libraries/haskell/naturals/default.nix index e08c05ac6325f704ece27e98e37e2f1d31d665d5..787ac70ffa96118df65853b0c129342decaac3aa 100644 --- a/pkgs/development/libraries/haskell/naturals/default.nix +++ b/pkgs/development/libraries/haskell/naturals/default.nix @@ -9,6 +9,5 @@ cabal.mkDerivation (self: { description = "Constructors and related functions for natural numbers"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/netlist-to-vhdl/default.nix b/pkgs/development/libraries/haskell/netlist-to-vhdl/default.nix index 47e3b62138aa465e460f5b13d14095a8408c5cd4..ff9ed1ac0bfabc2824f34466e2030463052119d5 100644 --- a/pkgs/development/libraries/haskell/netlist-to-vhdl/default.nix +++ b/pkgs/development/libraries/haskell/netlist-to-vhdl/default.nix @@ -9,6 +9,5 @@ cabal.mkDerivation (self: { description = "Convert a Netlist AST to VHDL"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/netlist/default.nix b/pkgs/development/libraries/haskell/netlist/default.nix index 91f7042509b92cefb6b96fa1f99b6f5f884bd1fc..57550dcb3d865f4ca814b703db49f394e5914a45 100644 --- a/pkgs/development/libraries/haskell/netlist/default.nix +++ b/pkgs/development/libraries/haskell/netlist/default.nix @@ -9,6 +9,5 @@ cabal.mkDerivation (self: { description = "Netlist AST"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/netwire/default.nix b/pkgs/development/libraries/haskell/netwire/default.nix index fbc143fbfaf31a015d7e81caf32a24f5f7f5ab56..d7ab9539e0c8cbd99aacff23dc48f48d5e93681e 100644 --- a/pkgs/development/libraries/haskell/netwire/default.nix +++ b/pkgs/development/libraries/haskell/netwire/default.nix @@ -14,6 +14,5 @@ cabal.mkDerivation (self: { description = "Flexible wire arrows for FRP"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/network-conduit/default.nix b/pkgs/development/libraries/haskell/network-conduit/default.nix index 80d9fc05bd82ba43463505251125dcde1ed62f99..032592f974bab5976988bd329713c0b4dd85141d 100644 --- a/pkgs/development/libraries/haskell/network-conduit/default.nix +++ b/pkgs/development/libraries/haskell/network-conduit/default.nix @@ -14,9 +14,6 @@ cabal.mkDerivation (self: { description = "Stream socket data using conduits"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/network-info/default.nix b/pkgs/development/libraries/haskell/network-info/default.nix index f15a94082a16828d650c8d3ae8d65abb447c7cbf..c1bfea43bde682a6f81fa27d95cd47715c54f8dd 100644 --- a/pkgs/development/libraries/haskell/network-info/default.nix +++ b/pkgs/development/libraries/haskell/network-info/default.nix @@ -9,6 +9,5 @@ cabal.mkDerivation (self: { description = "Access the local computer's basic network configuration"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/network-multicast/default.nix b/pkgs/development/libraries/haskell/network-multicast/default.nix index 089a346383416d38b8d97c6f70bd6b5b5022ff0c..3a461a51f53b14563309fc75af19614c83be5f74 100644 --- a/pkgs/development/libraries/haskell/network-multicast/default.nix +++ b/pkgs/development/libraries/haskell/network-multicast/default.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Simple multicast library"; license = self.stdenv.lib.licenses.publicDomain; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/network-protocol-xmpp/default.nix b/pkgs/development/libraries/haskell/network-protocol-xmpp/default.nix index e58bf679fdc5fcb039de22963c0780ac825f77b1..304017d3d24036457c7ff1029d53abfcdaa37436 100644 --- a/pkgs/development/libraries/haskell/network-protocol-xmpp/default.nix +++ b/pkgs/development/libraries/haskell/network-protocol-xmpp/default.nix @@ -16,6 +16,5 @@ cabal.mkDerivation (self: { description = "Client library for the XMPP protocol"; license = self.stdenv.lib.licenses.gpl3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/network-transport-tcp/default.nix b/pkgs/development/libraries/haskell/network-transport-tcp/default.nix index 47718bc3468e856bd0d9bd7153132b5d0e406bfe..840712e34160ffd8e7d20183b127213b1fd35f25 100644 --- a/pkgs/development/libraries/haskell/network-transport-tcp/default.nix +++ b/pkgs/development/libraries/haskell/network-transport-tcp/default.nix @@ -20,9 +20,6 @@ cabal.mkDerivation (self: { description = "TCP instantiation of Network.Transport"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/network-transport-tests/default.nix b/pkgs/development/libraries/haskell/network-transport-tests/default.nix index c709f7b853c5427cc0b31a283fd29878038a6997..7aedea7995b7f7a66226e452b496a4ebd315510a 100644 --- a/pkgs/development/libraries/haskell/network-transport-tests/default.nix +++ b/pkgs/development/libraries/haskell/network-transport-tests/default.nix @@ -10,6 +10,5 @@ cabal.mkDerivation (self: { description = "Unit tests for Network.Transport implementations"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/network-transport/default.nix b/pkgs/development/libraries/haskell/network-transport/default.nix index 86656974aa89a5372399f8577788a12541b18484..eaa41944a6bdc720cfe035655f8da925fbaa436c 100644 --- a/pkgs/development/libraries/haskell/network-transport/default.nix +++ b/pkgs/development/libraries/haskell/network-transport/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Network abstraction layer"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/network/2.2.1.4.nix b/pkgs/development/libraries/haskell/network/2.2.1.4.nix index 7d99df9ee1c856d54d7d7c5bae603b2915329207..68c7937497c425011e650d56983528adbf20fc6b 100644 --- a/pkgs/development/libraries/haskell/network/2.2.1.4.nix +++ b/pkgs/development/libraries/haskell/network/2.2.1.4.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Networking-related facilities"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/network/2.2.1.7.nix b/pkgs/development/libraries/haskell/network/2.2.1.7.nix index ba33bc36643b5d203931eb34fdb0d488c6dda8db..f66d81f79f4518c156025b02841fe120d9bd98d8 100644 --- a/pkgs/development/libraries/haskell/network/2.2.1.7.nix +++ b/pkgs/development/libraries/haskell/network/2.2.1.7.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Networking-related facilities"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/network/2.3.0.13.nix b/pkgs/development/libraries/haskell/network/2.3.0.13.nix index 107d4f50f353ca84d2cd32cd6004dd4947f3c9e5..557dea081fdb92a2cba3d21c12f64ff0b73affdf 100644 --- a/pkgs/development/libraries/haskell/network/2.3.0.13.nix +++ b/pkgs/development/libraries/haskell/network/2.3.0.13.nix @@ -11,9 +11,6 @@ cabal.mkDerivation (self: { description = "Low-level networking interface"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/network/2.3.0.2.nix b/pkgs/development/libraries/haskell/network/2.3.0.2.nix index 9d2642a487d2471251726f3392a5621bb06456f7..a1a9a36d7382f1fb439522347d6e61d2931e7f69 100644 --- a/pkgs/development/libraries/haskell/network/2.3.0.2.nix +++ b/pkgs/development/libraries/haskell/network/2.3.0.2.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Low-level networking interface"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/network/2.3.0.5.nix b/pkgs/development/libraries/haskell/network/2.3.0.5.nix index bf9330eb256a1ed1d52f3cfc46ea5349c2026ab8..9434d83d7f01ba046ba3f3160392cef5304e0aa8 100644 --- a/pkgs/development/libraries/haskell/network/2.3.0.5.nix +++ b/pkgs/development/libraries/haskell/network/2.3.0.5.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Low-level networking interface"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/network/2.3.1.0.nix b/pkgs/development/libraries/haskell/network/2.3.1.0.nix index 7cd500521dfd3ef1029b741d96801fc3265cd73e..dc0c1811e591848cf05f55e74afca22d21b54ba9 100644 --- a/pkgs/development/libraries/haskell/network/2.3.1.0.nix +++ b/pkgs/development/libraries/haskell/network/2.3.1.0.nix @@ -11,9 +11,6 @@ cabal.mkDerivation (self: { description = "Low-level networking interface"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/network/2.4.1.2.nix b/pkgs/development/libraries/haskell/network/2.4.1.2.nix index a4b2f8ac8e932c0020aa24f2de6112135dfb09aa..6f245cf18400bc7eab7366574b7ce66d33f846fa 100644 --- a/pkgs/development/libraries/haskell/network/2.4.1.2.nix +++ b/pkgs/development/libraries/haskell/network/2.4.1.2.nix @@ -15,9 +15,6 @@ cabal.mkDerivation (self: { description = "Low-level networking interface"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/newtype/default.nix b/pkgs/development/libraries/haskell/newtype/default.nix index a08ff33c0e48447fa9fa1b003d98fff8c0d84d02..40354c9472ce1e206f2637070de3517090b53fc8 100644 --- a/pkgs/development/libraries/haskell/newtype/default.nix +++ b/pkgs/development/libraries/haskell/newtype/default.nix @@ -8,6 +8,5 @@ cabal.mkDerivation (self: { description = "A typeclass and set of functions for working with newtypes"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/non-negative/default.nix b/pkgs/development/libraries/haskell/non-negative/default.nix index 934bb76dcd4215628dad0a664e0e51e1ff54c872..a50710791dbc08eb7eecc7668dc24284df0a9b4b 100644 --- a/pkgs/development/libraries/haskell/non-negative/default.nix +++ b/pkgs/development/libraries/haskell/non-negative/default.nix @@ -12,9 +12,6 @@ cabal.mkDerivation (self: { description = "Non-negative numbers"; license = "GPL"; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/numbers/default.nix b/pkgs/development/libraries/haskell/numbers/default.nix index 72b3ac1c7d5d10624b321b402c635c230c77c0d8..81a3e866dc017520c41ac08bbd92448dfb34c287 100644 --- a/pkgs/development/libraries/haskell/numbers/default.nix +++ b/pkgs/development/libraries/haskell/numbers/default.nix @@ -12,9 +12,6 @@ cabal.mkDerivation (self: { description = "Various number types"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/numeric-prelude/default.nix b/pkgs/development/libraries/haskell/numeric-prelude/default.nix index 329317f6834dc25696c2ad4977441d87ae26614a..f6f4d420e2ab37c9a556fb25d30c52d88d3ef32e 100644 --- a/pkgs/development/libraries/haskell/numeric-prelude/default.nix +++ b/pkgs/development/libraries/haskell/numeric-prelude/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "numeric-prelude"; - version = "0.3.0.2"; - sha256 = "0ihk8r06n2s72b4k67x8msn6gmn2cmxyswzk1j1r4jbhnk83b6wr"; + version = "0.4.0.1"; + sha256 = "1j361gj7cw31x31vnjhxmy7a62ldvyyqfm7irhff7sf5gv4kr5wh"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -17,9 +17,6 @@ cabal.mkDerivation (self: { description = "An experimental alternative hierarchy of numeric type classes"; license = "GPL"; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/numtype-tf/default.nix b/pkgs/development/libraries/haskell/numtype-tf/default.nix index d7e88e882cd8d1ec374fdbf155d345edd28cdc6c..76f57daca385b29311c5f9f3be7f3d6e3d3a0830 100644 --- a/pkgs/development/libraries/haskell/numtype-tf/default.nix +++ b/pkgs/development/libraries/haskell/numtype-tf/default.nix @@ -9,6 +9,5 @@ cabal.mkDerivation (self: { description = "Type-level (low cardinality) integers, implemented using type families"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/numtype/default.nix b/pkgs/development/libraries/haskell/numtype/default.nix index b55e0c50b4b3e25433e9b636b843131e14bd9f2e..be90f003f7fbfedd520176936df5a8fc7990ea8b 100644 --- a/pkgs/development/libraries/haskell/numtype/default.nix +++ b/pkgs/development/libraries/haskell/numtype/default.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Type-level (low cardinality) integers"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/oeis/default.nix b/pkgs/development/libraries/haskell/oeis/default.nix index 6d16100ccc1261abb2e223d289dd0fcfed9a9977..c8b9e984eb1c0a14202a2e4cec896d3e0cc9a41d 100644 --- a/pkgs/development/libraries/haskell/oeis/default.nix +++ b/pkgs/development/libraries/haskell/oeis/default.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Interface to the Online Encyclopedia of Integer Sequences"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/optparse-applicative/default.nix b/pkgs/development/libraries/haskell/optparse-applicative/default.nix index 3043da1bb6c91dbade480ed5f3df9eac76cd10db..a3ab241b28caeb898ce4f347d4da99b1141c152d 100644 --- a/pkgs/development/libraries/haskell/optparse-applicative/default.nix +++ b/pkgs/development/libraries/haskell/optparse-applicative/default.nix @@ -16,6 +16,5 @@ cabal.mkDerivation (self: { description = "Utilities and combinators for parsing command line options"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/pandoc-types/default.nix b/pkgs/development/libraries/haskell/pandoc-types/default.nix index ce7888cd4b7f76ff02506ad64408c993ada4df5d..d4f49791d306bb4d4a3c554739f78150d3813cd2 100644 --- a/pkgs/development/libraries/haskell/pandoc-types/default.nix +++ b/pkgs/development/libraries/haskell/pandoc-types/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Types for representing a structured document"; license = "GPL"; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/pango/default.nix b/pkgs/development/libraries/haskell/pango/default.nix index d11b33e2096ba0419bd3d1e5bd0822ddbad592f4..bbd935eb043f23e9fff171588656f3b3717c09e7 100644 --- a/pkgs/development/libraries/haskell/pango/default.nix +++ b/pkgs/development/libraries/haskell/pango/default.nix @@ -14,9 +14,6 @@ cabal.mkDerivation (self: { description = "Binding to the Pango text rendering engine"; license = self.stdenv.lib.licenses.lgpl21; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/parallel-io/default.nix b/pkgs/development/libraries/haskell/parallel-io/default.nix index 9d0c82f1aed1d23abcc0c37b9563e776045c5585..56c1a13069646063d457b4f156ba216c4b728005 100644 --- a/pkgs/development/libraries/haskell/parallel-io/default.nix +++ b/pkgs/development/libraries/haskell/parallel-io/default.nix @@ -12,6 +12,5 @@ cabal.mkDerivation (self: { description = "Combinators for executing IO actions in parallel on a thread pool"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/parallel/1.1.0.1.nix b/pkgs/development/libraries/haskell/parallel/1.1.0.1.nix index 2977a60964cf9ef44b8dcab1cc073b84f2ea9621..5212e6b2847ad2d051ae736adab2991b6e1c1a85 100644 --- a/pkgs/development/libraries/haskell/parallel/1.1.0.1.nix +++ b/pkgs/development/libraries/haskell/parallel/1.1.0.1.nix @@ -8,9 +8,6 @@ cabal.mkDerivation (self: { description = "parallel programming library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/parallel/2.2.0.1.nix b/pkgs/development/libraries/haskell/parallel/2.2.0.1.nix index 185e86b02e89d897159a971eae668a6b91f02e23..9fb661fd481f5204cd84c4343666b6862f74f43e 100644 --- a/pkgs/development/libraries/haskell/parallel/2.2.0.1.nix +++ b/pkgs/development/libraries/haskell/parallel/2.2.0.1.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Parallel programming library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/parallel/3.1.0.1.nix b/pkgs/development/libraries/haskell/parallel/3.1.0.1.nix index 37d537185cb60abbc1cd768b9a7b38f45c8d1e91..83283c2317b0dfdac04c80159fd3c17c02c3adfe 100644 --- a/pkgs/development/libraries/haskell/parallel/3.1.0.1.nix +++ b/pkgs/development/libraries/haskell/parallel/3.1.0.1.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Parallel programming library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/parallel/3.2.0.2.nix b/pkgs/development/libraries/haskell/parallel/3.2.0.2.nix index 81d37e3a2b0c99d91e5dd964f5b304fea9da1041..365ed196841977b8515c8c919fda6fef79910b95 100644 --- a/pkgs/development/libraries/haskell/parallel/3.2.0.2.nix +++ b/pkgs/development/libraries/haskell/parallel/3.2.0.2.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Parallel programming library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/parallel/3.2.0.3.nix b/pkgs/development/libraries/haskell/parallel/3.2.0.3.nix index ee8265950b76399dfb81704b142360978fc88b10..e089c8dce8ea5aefe8f0e275ab3d5152ef677cc2 100644 --- a/pkgs/development/libraries/haskell/parallel/3.2.0.3.nix +++ b/pkgs/development/libraries/haskell/parallel/3.2.0.3.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Parallel programming library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/parseargs/default.nix b/pkgs/development/libraries/haskell/parseargs/default.nix index 197376d608b0c89822f304a64302b158b5d53474..4287015115c81e56c128c23d39cde01c0cca24c5 100644 --- a/pkgs/development/libraries/haskell/parseargs/default.nix +++ b/pkgs/development/libraries/haskell/parseargs/default.nix @@ -11,9 +11,6 @@ cabal.mkDerivation (self: { description = "Command-line argument parsing library for Haskell programs"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/parsec/2.1.0.1.nix b/pkgs/development/libraries/haskell/parsec/2.1.0.1.nix index 155e4f09007c9ebdc67146504615e3300445ca31..17c046a06e1d66b4d131e47e831682cce4c715ce 100644 --- a/pkgs/development/libraries/haskell/parsec/2.1.0.1.nix +++ b/pkgs/development/libraries/haskell/parsec/2.1.0.1.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Monadic parser combinators"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/parsec/3.1.1.nix b/pkgs/development/libraries/haskell/parsec/3.1.1.nix index e740ca91dba261e1bd509acd04e7d792b927fd9e..62c5b67b0e9a63804cd7b33079bd03d21c9ed1c3 100644 --- a/pkgs/development/libraries/haskell/parsec/3.1.1.nix +++ b/pkgs/development/libraries/haskell/parsec/3.1.1.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Monadic parser combinators"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/parsec/3.1.2.nix b/pkgs/development/libraries/haskell/parsec/3.1.2.nix index 95ef6219dbb77ce2e404fab19157dc4523d1da94..ecbdbb3aef0aa2515d4c515f47a77d176b9a955d 100644 --- a/pkgs/development/libraries/haskell/parsec/3.1.2.nix +++ b/pkgs/development/libraries/haskell/parsec/3.1.2.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Monadic parser combinators"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/parsec/3.1.3.nix b/pkgs/development/libraries/haskell/parsec/3.1.3.nix index 5f6521e458336840b355bbba9914a6a37bca0e8d..b9b10f2e5b0d6a8e3ffe3005edf45a203505bcdc 100644 --- a/pkgs/development/libraries/haskell/parsec/3.1.3.nix +++ b/pkgs/development/libraries/haskell/parsec/3.1.3.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Monadic parser combinators"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/parsimony/default.nix b/pkgs/development/libraries/haskell/parsimony/default.nix index 55bc7f74d297f019b1611658e0764e1d5b2515be..4245fcf7f40bb7d1fba846f8733bd78ef3986364 100644 --- a/pkgs/development/libraries/haskell/parsimony/default.nix +++ b/pkgs/development/libraries/haskell/parsimony/default.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Monadic parser combinators derived from Parsec"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/path-pieces/default.nix b/pkgs/development/libraries/haskell/path-pieces/default.nix index 83a8c2d3faffe7b781685a4f7b6e96b3d835c298..14b9f8d708131802b2979308645042987bd154bb 100644 --- a/pkgs/development/libraries/haskell/path-pieces/default.nix +++ b/pkgs/development/libraries/haskell/path-pieces/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Components of paths"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/pathtype/default.nix b/pkgs/development/libraries/haskell/pathtype/default.nix index 00d33238c428dc4d88d80469f7d8b3c69ba7a8da..f0be81e64ae3de1d2a395ee94573929c9797f90a 100644 --- a/pkgs/development/libraries/haskell/pathtype/default.nix +++ b/pkgs/development/libraries/haskell/pathtype/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Type-safe replacement for System.FilePath etc"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/pcre-light/default.nix b/pkgs/development/libraries/haskell/pcre-light/default.nix index 3336b8f1c8a4f7e8cb67268d9f343ab79cc8e490..71e0ddadb59c415941d146f73cd1a1e2650da59f 100644 --- a/pkgs/development/libraries/haskell/pcre-light/default.nix +++ b/pkgs/development/libraries/haskell/pcre-light/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "A small, efficient and portable regex library for Perl 5 compatible regular expressions"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/pem/default.nix b/pkgs/development/libraries/haskell/pem/default.nix index 35f8ae70cfe32fce743243f5905be024b845dac5..16b47a9c8ae0d3ea34865bd63a16cd3317a1d5e8 100644 --- a/pkgs/development/libraries/haskell/pem/default.nix +++ b/pkgs/development/libraries/haskell/pem/default.nix @@ -15,9 +15,6 @@ cabal.mkDerivation (self: { description = "Privacy Enhanced Mail (PEM) format reader and writer"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/permutation/default.nix b/pkgs/development/libraries/haskell/permutation/default.nix index 6e7f44727536210c095984419ac6cbc96bf485a6..4f38dfcaa12fc110f57d4fa622ac74c98bf48e93 100644 --- a/pkgs/development/libraries/haskell/permutation/default.nix +++ b/pkgs/development/libraries/haskell/permutation/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "A library for permutations and combinations"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix index 885ad70f63fa494719a306f7723fa4a48d422fa1..251db960506d4527daabfbbcfed8fb67227d0b3f 100644 --- a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix +++ b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix @@ -16,9 +16,6 @@ cabal.mkDerivation (self: { description = "Backend for the persistent library using postgresql"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/persistent-sqlite/default.nix b/pkgs/development/libraries/haskell/persistent-sqlite/default.nix index 86bbe4e27883314a35af7b4e1e78789d1dce2868..947f75342d455b799813ca86312d613768fedaa1 100644 --- a/pkgs/development/libraries/haskell/persistent-sqlite/default.nix +++ b/pkgs/development/libraries/haskell/persistent-sqlite/default.nix @@ -14,9 +14,6 @@ cabal.mkDerivation (self: { description = "Backend for the persistent library using sqlite3"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/persistent-template/default.nix b/pkgs/development/libraries/haskell/persistent-template/default.nix index 926b4fa4cb6072250e7514c0506d52b55f2c1e69..396f51f69cb710ff967dbddeb5aa15f321dfaf45 100644 --- a/pkgs/development/libraries/haskell/persistent-template/default.nix +++ b/pkgs/development/libraries/haskell/persistent-template/default.nix @@ -13,9 +13,6 @@ cabal.mkDerivation (self: { description = "Type-safe, non-relational, multi-backend persistence"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix index 8ca0febfd840444f28f3e464ab7274cfe49769a8..036deebae20d0dbdc6a309f128a9e02698764ea7 100644 --- a/pkgs/development/libraries/haskell/persistent/default.nix +++ b/pkgs/development/libraries/haskell/persistent/default.nix @@ -22,9 +22,6 @@ cabal.mkDerivation (self: { description = "Type-safe, multi-backend data serialization"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/pgm/default.nix b/pkgs/development/libraries/haskell/pgm/default.nix index c101ec60a36d2b119e216481577c1bfd96988e22..b1be8dd6d0358427cf50087469e76f98a81f6d20 100644 --- a/pkgs/development/libraries/haskell/pgm/default.nix +++ b/pkgs/development/libraries/haskell/pgm/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Pure Haskell implementation of PGM image format"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/polyparse/default.nix b/pkgs/development/libraries/haskell/polyparse/default.nix index a0ee0e199bb95e9b54f317b001bf5c0f36503b26..45b994026c2ffc0b3ba01eb4cdabb051cd87fbb6 100644 --- a/pkgs/development/libraries/haskell/polyparse/default.nix +++ b/pkgs/development/libraries/haskell/polyparse/default.nix @@ -2,17 +2,14 @@ cabal.mkDerivation (self: { pname = "polyparse"; - version = "1.8"; - sha256 = "08nr22r87q2yxxlcpvf35pkq56b4k3f1fzj3cvjnr7137k7c7ywn"; + version = "1.9"; + sha256 = "12khjhv1dvs4j1jyh3law7m1gmkad8s6q7clh7w6l5ll2n1dc4lz"; buildDepends = [ text ]; meta = { homepage = "http://code.haskell.org/~malcolm/polyparse/"; description = "A variety of alternative parser combinator libraries"; license = "LGPL"; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/pool-conduit/default.nix b/pkgs/development/libraries/haskell/pool-conduit/default.nix index b414c2a70f088f3f0cba5ca0c74b76c679fb2041..77faceeea923b4fe2ceb47053ef31074f5141a21 100644 --- a/pkgs/development/libraries/haskell/pool-conduit/default.nix +++ b/pkgs/development/libraries/haskell/pool-conduit/default.nix @@ -12,9 +12,6 @@ cabal.mkDerivation (self: { description = "Resource pool allocations via ResourceT"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/postgresql-libpq/default.nix b/pkgs/development/libraries/haskell/postgresql-libpq/default.nix index bba70d7139b5a8556eb411841769706daac86632..90a92019f0e12da0857e7d948029565d5e0d8477 100644 --- a/pkgs/development/libraries/haskell/postgresql-libpq/default.nix +++ b/pkgs/development/libraries/haskell/postgresql-libpq/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "low-level binding to libpq"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/postgresql-simple/default.nix b/pkgs/development/libraries/haskell/postgresql-simple/default.nix index 9c30ad00e5c2e877a569896b27c6933f9bfe3c50..81a5f67c45b909c13457e7847c62d3681908d5c8 100644 --- a/pkgs/development/libraries/haskell/postgresql-simple/default.nix +++ b/pkgs/development/libraries/haskell/postgresql-simple/default.nix @@ -17,9 +17,6 @@ cabal.mkDerivation (self: { description = "Mid-Level PostgreSQL client library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/ppm/default.nix b/pkgs/development/libraries/haskell/ppm/default.nix index df204fa2482fcca51ad39394362e515f53a9c19d..c55fc0226e9c7e0564a6998ec997f8bc87b6016a 100644 --- a/pkgs/development/libraries/haskell/ppm/default.nix +++ b/pkgs/development/libraries/haskell/ppm/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "a tiny PPM image generator"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/pretty-show/1.5.nix b/pkgs/development/libraries/haskell/pretty-show/1.5.nix index 6d76aeb9bf6f362a144cf4cebcf5a52bdd3b883a..5fedd0aca292b1c1ecf2ed4282198f9024a1d773 100644 --- a/pkgs/development/libraries/haskell/pretty-show/1.5.nix +++ b/pkgs/development/libraries/haskell/pretty-show/1.5.nix @@ -12,9 +12,6 @@ cabal.mkDerivation (self: { description = "Tools for working with derived `Show` instances and generic inspection of values"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/primitive/0.5.0.1.nix b/pkgs/development/libraries/haskell/primitive/0.5.0.1.nix index 680904992835bb4d435a9fd3d9f01ff1882d71d6..af6778ccd1413342c89d96dc61e8242d5c1998d6 100644 --- a/pkgs/development/libraries/haskell/primitive/0.5.0.1.nix +++ b/pkgs/development/libraries/haskell/primitive/0.5.0.1.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Primitive memory-related operations"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/process-extras/default.nix b/pkgs/development/libraries/haskell/process-extras/default.nix index f1baf67bec72ed9a11a4d9d2e941cf9e166fa05a..1d9cb4f80620c8523258b4300faad84050b59104 100644 --- a/pkgs/development/libraries/haskell/process-extras/default.nix +++ b/pkgs/development/libraries/haskell/process-extras/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Process extras"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/profunctor-extras/default.nix b/pkgs/development/libraries/haskell/profunctor-extras/default.nix index b7b1e209ae9c7728f8f7db3a4d6e5c8f569f8355..df16898ddd3e239460e19db894e80ceb14b47c19 100644 --- a/pkgs/development/libraries/haskell/profunctor-extras/default.nix +++ b/pkgs/development/libraries/haskell/profunctor-extras/default.nix @@ -15,6 +15,5 @@ cabal.mkDerivation (self: { description = "Profunctor extras"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/profunctors/default.nix b/pkgs/development/libraries/haskell/profunctors/default.nix index f141959dcf1a93e267c4703169e93ffa379c6b65..83398295108b33f0b9413eb0382f156c8c56be4e 100644 --- a/pkgs/development/libraries/haskell/profunctors/default.nix +++ b/pkgs/development/libraries/haskell/profunctors/default.nix @@ -10,6 +10,5 @@ cabal.mkDerivation (self: { description = "Haskell 98 Profunctors"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/project-template/default.nix b/pkgs/development/libraries/haskell/project-template/default.nix index 2b225d6a87dc3dd97d7072eb1789b9fd08e08bed..fa60370f1f5ee308540bf914da70e3901a4c8ede 100644 --- a/pkgs/development/libraries/haskell/project-template/default.nix +++ b/pkgs/development/libraries/haskell/project-template/default.nix @@ -20,6 +20,5 @@ cabal.mkDerivation (self: { description = "Specify Haskell project templates and generate files"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/prolog-graph-lib/default.nix b/pkgs/development/libraries/haskell/prolog-graph-lib/default.nix index c4923836bb26a8075efe74cabb54066949724320..98b65bb59f020bb54e95f587f967c3af05eda4c9 100644 --- a/pkgs/development/libraries/haskell/prolog-graph-lib/default.nix +++ b/pkgs/development/libraries/haskell/prolog-graph-lib/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Generating images of resolution trees for Prolog queries"; license = self.stdenv.lib.licenses.publicDomain; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/prolog-graph/default.nix b/pkgs/development/libraries/haskell/prolog-graph/default.nix index 446a430ed7c0f5dc9f9aea152338d48567560f9e..8016095a40200f189b84379b5d953759b45bcf46 100644 --- a/pkgs/development/libraries/haskell/prolog-graph/default.nix +++ b/pkgs/development/libraries/haskell/prolog-graph/default.nix @@ -15,9 +15,6 @@ cabal.mkDerivation (self: { description = "A command line tool to visualize query resolution in Prolog"; license = self.stdenv.lib.licenses.publicDomain; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/prolog/default.nix b/pkgs/development/libraries/haskell/prolog/default.nix index 253903d3e3fe54c5a7e21570391790b0f6ce5db0..b1e6e1d4e303411a3f92e2ba8fe190c6a29916ae 100644 --- a/pkgs/development/libraries/haskell/prolog/default.nix +++ b/pkgs/development/libraries/haskell/prolog/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "A Prolog interpreter written in Haskell"; license = self.stdenv.lib.licenses.publicDomain; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/publicsuffixlist/default.nix b/pkgs/development/libraries/haskell/publicsuffixlist/default.nix index f61cb0f99a3004e1e3fda95fbececbac2b3f5ac2..ea1bb7164c8d7e199cfa704f1d4a2dc0f9794bee 100644 --- a/pkgs/development/libraries/haskell/publicsuffixlist/default.nix +++ b/pkgs/development/libraries/haskell/publicsuffixlist/default.nix @@ -11,6 +11,5 @@ cabal.mkDerivation (self: { description = "Is a given string a domain suffix?"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/punycode/default.nix b/pkgs/development/libraries/haskell/punycode/default.nix index fabc39123d07c5e66d711391c02e82ca7b90ca65..a4ad760d8ffe018fd77365922608ff2f374c4655 100644 --- a/pkgs/development/libraries/haskell/punycode/default.nix +++ b/pkgs/development/libraries/haskell/punycode/default.nix @@ -12,6 +12,5 @@ cabal.mkDerivation (self: { description = "Encode unicode strings to ascii forms according to RFC 3492"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/pureMD5/default.nix b/pkgs/development/libraries/haskell/pureMD5/default.nix index e6d0a3f4d80c8603b09a2356071b48a121038361..8e66b2c3c037984d6b87cc05c575487338311378 100644 --- a/pkgs/development/libraries/haskell/pureMD5/default.nix +++ b/pkgs/development/libraries/haskell/pureMD5/default.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "A Haskell-only implementation of the MD5 digest (hash) algorithm"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/pwstore-fast/default.nix b/pkgs/development/libraries/haskell/pwstore-fast/default.nix index 4d50729604e060bd9941c43a0fd63880a1cba05b..d75823d6025ea480dcf5d8a72df9ae17655ca4d6 100644 --- a/pkgs/development/libraries/haskell/pwstore-fast/default.nix +++ b/pkgs/development/libraries/haskell/pwstore-fast/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Secure password storage"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/quickcheck-io/default.nix b/pkgs/development/libraries/haskell/quickcheck-io/default.nix index 985223678cbc3a695e9358a727ecfe81903c0732..b7c33b6d1a0a44e24a4576b3262fa27cd045b362 100644 --- a/pkgs/development/libraries/haskell/quickcheck-io/default.nix +++ b/pkgs/development/libraries/haskell/quickcheck-io/default.nix @@ -9,6 +9,5 @@ cabal.mkDerivation (self: { description = "Use HUnit assertions as QuickCheck properties"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/random-fu/default.nix b/pkgs/development/libraries/haskell/random-fu/default.nix index 37ed0f7ab97486d38e0143eb9fab0232f626e64e..8dd228ad3db3f35fe1082183595c3681e75b0f28 100644 --- a/pkgs/development/libraries/haskell/random-fu/default.nix +++ b/pkgs/development/libraries/haskell/random-fu/default.nix @@ -15,9 +15,6 @@ cabal.mkDerivation (self: { description = "Random number generation"; license = self.stdenv.lib.licenses.publicDomain; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/random-shuffle/default.nix b/pkgs/development/libraries/haskell/random-shuffle/default.nix index 9c9dedde25d946bec86344a3b7a8084fc9d4e9a2..1104091ae57f87e284142032a8cfccbfc6284ee1 100644 --- a/pkgs/development/libraries/haskell/random-shuffle/default.nix +++ b/pkgs/development/libraries/haskell/random-shuffle/default.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Random shuffle implementation"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/random-source/default.nix b/pkgs/development/libraries/haskell/random-source/default.nix index 707477609b64a50ed2301d2dcc2a0864e4b547f8..acc0285a59a42d3d79058bcd9849ca9da52e72e6 100644 --- a/pkgs/development/libraries/haskell/random-source/default.nix +++ b/pkgs/development/libraries/haskell/random-source/default.nix @@ -15,9 +15,6 @@ cabal.mkDerivation (self: { description = "Generic basis for random number generators"; license = self.stdenv.lib.licenses.publicDomain; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/random/1.0.1.1.nix b/pkgs/development/libraries/haskell/random/1.0.1.1.nix index a4feee31d0234d139e24279e1310fa522a69fa22..1f4901a4d91df032d1c83c7bf6a859a9d5015e4d 100644 --- a/pkgs/development/libraries/haskell/random/1.0.1.1.nix +++ b/pkgs/development/libraries/haskell/random/1.0.1.1.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "random number library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/ranges/default.nix b/pkgs/development/libraries/haskell/ranges/default.nix index 0ba350270505372c8672583a18a0c15dc1263d96..2182e6410b530c40719d97cddce8fb02da6c9892 100644 --- a/pkgs/development/libraries/haskell/ranges/default.nix +++ b/pkgs/development/libraries/haskell/ranges/default.nix @@ -8,9 +8,6 @@ cabal.mkDerivation (self: { description = "Ranges and various functions on them"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/rank1dynamic/default.nix b/pkgs/development/libraries/haskell/rank1dynamic/default.nix index d30375f46e8332c167bb96c5294de20689bf7561..8694d2399b2bcb0fcc62017caf59a506a4f142f8 100644 --- a/pkgs/development/libraries/haskell/rank1dynamic/default.nix +++ b/pkgs/development/libraries/haskell/rank1dynamic/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Like Data.Dynamic/Data.Typeable but with support for rank-1 polymorphic types"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/reactive-banana-wx/default.nix b/pkgs/development/libraries/haskell/reactive-banana-wx/default.nix index 0fbd9d74d19cc234598edefc5ffd0c1ffb766a64..ee408fea48058b10f903608a32bb1fec7214d960 100644 --- a/pkgs/development/libraries/haskell/reactive-banana-wx/default.nix +++ b/pkgs/development/libraries/haskell/reactive-banana-wx/default.nix @@ -13,9 +13,6 @@ cabal.mkDerivation (self: { description = "Examples for the reactive-banana library, using wxHaskell"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/reactive-banana/default.nix b/pkgs/development/libraries/haskell/reactive-banana/default.nix index 682943e80f1482b7072e688a291b90fac7b173d3..8d1ee0ffc959384d827673474e6ca399ae4849f1 100644 --- a/pkgs/development/libraries/haskell/reactive-banana/default.nix +++ b/pkgs/development/libraries/haskell/reactive-banana/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "reactive-banana"; - version = "0.7.1.1"; - sha256 = "0d4dqpzglzkygy2hhn1j1c7vk2782mk66f8aqaadkyhijn7kc6i5"; + version = "0.7.1.2"; + sha256 = "1x4ln3dr937va0ii7lr86d6wsrh2qd1sxany4y9dkpcrsvb3db0l"; buildDepends = [ hashable transformers unorderedContainers vault ]; testDepends = [ hashable HUnit testFramework testFrameworkHunit transformers @@ -19,7 +19,6 @@ cabal.mkDerivation (self: { maintainers = [ self.stdenv.lib.maintainers.andres self.stdenv.lib.maintainers.bluescreen303 - self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/recaptcha/default.nix b/pkgs/development/libraries/haskell/recaptcha/default.nix index 60747bbda68bdc22bf146f6b54414f6ae19e6326..37fb26208f488c9035bc8425ce34a41f0976b724 100644 --- a/pkgs/development/libraries/haskell/recaptcha/default.nix +++ b/pkgs/development/libraries/haskell/recaptcha/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Functions for using the reCAPTCHA service in web applications"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/reflection/default.nix b/pkgs/development/libraries/haskell/reflection/default.nix index 8cdd36da014107e1e2af3146261d510db91c403e..5f227d60ca8057faa37953732f1411077d8530c2 100644 --- a/pkgs/development/libraries/haskell/reflection/default.nix +++ b/pkgs/development/libraries/haskell/reflection/default.nix @@ -2,14 +2,13 @@ cabal.mkDerivation (self: { pname = "reflection"; - version = "1.3.1"; - sha256 = "0d81zvyg846jp0xkdkj4220w6hbrnzf46zcxs5qb5frm41rwcsj8"; + version = "1.3.2"; + sha256 = "0jmdygvmvhw20aqjk7k0jah93ggfgf2bgq5zpwnz9bwgi9gs17x6"; buildDepends = [ tagged ]; meta = { homepage = "http://github.com/ekmett/reflection"; description = "Reifies arbitrary terms into types that can be reflected back into terms"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/regex-base/0.72.0.2.nix b/pkgs/development/libraries/haskell/regex-base/0.72.0.2.nix index 09e4906da011b3a082aaa935dbfaa7a5e57bd5e8..e94a233d9f1646345ea790bdd868e5de36c33e39 100644 --- a/pkgs/development/libraries/haskell/regex-base/0.72.0.2.nix +++ b/pkgs/development/libraries/haskell/regex-base/0.72.0.2.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Replaces/Enhances Text.Regex"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/regex-base/0.93.1.nix b/pkgs/development/libraries/haskell/regex-base/0.93.1.nix index 8fbc2f9e84d0326609aae2462eeeb39075d5eec1..5a49d2b6407c40227236a8ee8add2962d96c9fff 100644 --- a/pkgs/development/libraries/haskell/regex-base/0.93.1.nix +++ b/pkgs/development/libraries/haskell/regex-base/0.93.1.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Replaces/Enhances Text.Regex"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/regex-base/0.93.2.nix b/pkgs/development/libraries/haskell/regex-base/0.93.2.nix index 50f039a3d27a5bfc0ddb330d68b6f6c9b655021c..1dc559e6370294e5f9bd54e538c1bcea805a0428 100644 --- a/pkgs/development/libraries/haskell/regex-base/0.93.2.nix +++ b/pkgs/development/libraries/haskell/regex-base/0.93.2.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Replaces/Enhances Text.Regex"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/regex-compat/0.71.0.1.nix b/pkgs/development/libraries/haskell/regex-compat/0.71.0.1.nix index ed88e247e5b778a3e2157a8a1ee92c583e222128..623db0cc48b997549dd8edec7dba01bb74e2f26d 100644 --- a/pkgs/development/libraries/haskell/regex-compat/0.71.0.1.nix +++ b/pkgs/development/libraries/haskell/regex-compat/0.71.0.1.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Replaces/Enhances Text.Regex"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/regex-compat/0.92.nix b/pkgs/development/libraries/haskell/regex-compat/0.92.nix index 3db0f5d4065640fe50713e2fedc814c82cf36f51..8b9e666d6aeec6b961917857b88700bfbcb89fdc 100644 --- a/pkgs/development/libraries/haskell/regex-compat/0.92.nix +++ b/pkgs/development/libraries/haskell/regex-compat/0.92.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Replaces/Enhances Text.Regex"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/regex-compat/0.93.1.nix b/pkgs/development/libraries/haskell/regex-compat/0.93.1.nix index 3a28e505a82d7e9cd06bdb414bdec531eb63dba8..df3a7abf13f0da23b1dd9c85dcdb87a8e1db975e 100644 --- a/pkgs/development/libraries/haskell/regex-compat/0.93.1.nix +++ b/pkgs/development/libraries/haskell/regex-compat/0.93.1.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Replaces/Enhances Text.Regex"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/regex-compat/0.95.1.nix b/pkgs/development/libraries/haskell/regex-compat/0.95.1.nix index 138702e1d416f79ab6d3c3c1a72a92a1394f7d85..52c28d8b800b1d0f53162b5c37a3ef0f0579d006 100644 --- a/pkgs/development/libraries/haskell/regex-compat/0.95.1.nix +++ b/pkgs/development/libraries/haskell/regex-compat/0.95.1.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Replaces/Enhances Text.Regex"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/regex-pcre/default.nix b/pkgs/development/libraries/haskell/regex-pcre/default.nix index a34d90fa98479050f12149ac2843cf8a1d82e5a1..2b7f53e4572a2bf7c92b0c720f6e46d041b2639e 100644 --- a/pkgs/development/libraries/haskell/regex-pcre/default.nix +++ b/pkgs/development/libraries/haskell/regex-pcre/default.nix @@ -11,9 +11,6 @@ cabal.mkDerivation (self: { description = "Replaces/Enhances Text.Regex"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/regex-posix/0.72.0.3.nix b/pkgs/development/libraries/haskell/regex-posix/0.72.0.3.nix index 961aab9e2f77102ccf4aaf69ce9dea7bd1fe6af0..f1f6a89dc3d93ae0b299529bae7daee9434a8b72 100644 --- a/pkgs/development/libraries/haskell/regex-posix/0.72.0.3.nix +++ b/pkgs/development/libraries/haskell/regex-posix/0.72.0.3.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Replaces/Enhances Text.Regex"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/regex-posix/0.94.1.nix b/pkgs/development/libraries/haskell/regex-posix/0.94.1.nix index 223c9baedcdd525f9e19dc62aabd71e9add24b10..662d8236c45a9ebd8d33f66af7a8186c3c21f745 100644 --- a/pkgs/development/libraries/haskell/regex-posix/0.94.1.nix +++ b/pkgs/development/libraries/haskell/regex-posix/0.94.1.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Replaces/Enhances Text.Regex"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/regex-posix/0.94.2.nix b/pkgs/development/libraries/haskell/regex-posix/0.94.2.nix index 9a570d4ca20da84af2bdc0304f67623911d2af88..11e02b398b5c0a6ccaf8faf8880826c1d75f03ee 100644 --- a/pkgs/development/libraries/haskell/regex-posix/0.94.2.nix +++ b/pkgs/development/libraries/haskell/regex-posix/0.94.2.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Replaces/Enhances Text.Regex"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/regex-posix/0.94.4.nix b/pkgs/development/libraries/haskell/regex-posix/0.94.4.nix index e78c7fe2584dab28e26df0cc2e83d89901db3fe9..42ee42ba7ef7c44a003a4c767aaddfb4fcd43128 100644 --- a/pkgs/development/libraries/haskell/regex-posix/0.94.4.nix +++ b/pkgs/development/libraries/haskell/regex-posix/0.94.4.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Replaces/Enhances Text.Regex"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/regex-posix/0.95.1.nix b/pkgs/development/libraries/haskell/regex-posix/0.95.1.nix index ca6358baeedb1ab151bd83075db240f74c0c403d..58106bc8b74134131e32e4b7707c87426db6c1ba 100644 --- a/pkgs/development/libraries/haskell/regex-posix/0.95.1.nix +++ b/pkgs/development/libraries/haskell/regex-posix/0.95.1.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Replaces/Enhances Text.Regex"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/regex-posix/0.95.2.nix b/pkgs/development/libraries/haskell/regex-posix/0.95.2.nix index 22e1dca23ba07dfebba09b864d85950bfe525c90..6d7fac51658efdcc5679a646e790cabd764d9748 100644 --- a/pkgs/development/libraries/haskell/regex-posix/0.95.2.nix +++ b/pkgs/development/libraries/haskell/regex-posix/0.95.2.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Replaces/Enhances Text.Regex"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/regex-tdfa/default.nix b/pkgs/development/libraries/haskell/regex-tdfa/default.nix index 82fa24016bc534691504600747daca190135055a..67073790d25bc6216b55d963a76faf4e44819caa 100644 --- a/pkgs/development/libraries/haskell/regex-tdfa/default.nix +++ b/pkgs/development/libraries/haskell/regex-tdfa/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Replaces/Enhances Text.Regex"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/regexpr/default.nix b/pkgs/development/libraries/haskell/regexpr/default.nix index 538b980b4383dfc3d6ef8c4c68f909fe1649c1f6..c5389a7b66367d0340115d937c0aef570322f86e 100644 --- a/pkgs/development/libraries/haskell/regexpr/default.nix +++ b/pkgs/development/libraries/haskell/regexpr/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "regular expression like Perl/Ruby in Haskell"; license = "LGPL"; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/regular/default.nix b/pkgs/development/libraries/haskell/regular/default.nix index bee3cf33d1aef91862730c2eb8a2a12e2884f3eb..8a3e740491cb723d6d779a3eb1762f6fdd3f8ae4 100644 --- a/pkgs/development/libraries/haskell/regular/default.nix +++ b/pkgs/development/libraries/haskell/regular/default.nix @@ -8,9 +8,6 @@ cabal.mkDerivation (self: { description = "Generic programming library for regular datatypes"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/remote/default.nix b/pkgs/development/libraries/haskell/remote/default.nix index 75c94bea23be26e902fb776b11dca6f9fbf01db1..3e160130ea8f348cd10db8c952393b3806903157 100644 --- a/pkgs/development/libraries/haskell/remote/default.nix +++ b/pkgs/development/libraries/haskell/remote/default.nix @@ -13,9 +13,6 @@ cabal.mkDerivation (self: { description = "Cloud Haskell"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/repa-algorithms/default.nix b/pkgs/development/libraries/haskell/repa-algorithms/default.nix index b81a37f8ee5fb45b6f3b6e8146f5d423d1115cde..acf9dc712f35d8292e93e0be8c27fed7aede0357 100644 --- a/pkgs/development/libraries/haskell/repa-algorithms/default.nix +++ b/pkgs/development/libraries/haskell/repa-algorithms/default.nix @@ -12,9 +12,6 @@ cabal.mkDerivation (self: { description = "Algorithms using the Repa array library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/repa-examples/default.nix b/pkgs/development/libraries/haskell/repa-examples/default.nix index 03941f57316eeaa048a8dc6ef140e80e18a510cd..bea9d9f7f043c6d3c474b28aee0c8a2377227d07 100644 --- a/pkgs/development/libraries/haskell/repa-examples/default.nix +++ b/pkgs/development/libraries/haskell/repa-examples/default.nix @@ -18,9 +18,6 @@ cabal.mkDerivation (self: { description = "Examples using the Repa array library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/repa-io/default.nix b/pkgs/development/libraries/haskell/repa-io/default.nix index 23e8b2b761efd9a845bb7d87c32466b433feb646..046fafca43a79e0d26c5427311a96727dce74337 100644 --- a/pkgs/development/libraries/haskell/repa-io/default.nix +++ b/pkgs/development/libraries/haskell/repa-io/default.nix @@ -11,9 +11,6 @@ cabal.mkDerivation (self: { description = "Read and write Repa arrays in various formats"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/repa/default.nix b/pkgs/development/libraries/haskell/repa/default.nix index f6cb286ff794020ccd8745e0d26fd800a8abba51..66a8838c8d82299edcbb0a5bea5c6966be8311ad 100644 --- a/pkgs/development/libraries/haskell/repa/default.nix +++ b/pkgs/development/libraries/haskell/repa/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "High performance, regular, shape polymorphic parallel arrays"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/repr/default.nix b/pkgs/development/libraries/haskell/repr/default.nix index 951288c04aae00227c0d87c58f795d74c5fca24d..c44735eda00beaca7a86e02232e57936bca98110 100644 --- a/pkgs/development/libraries/haskell/repr/default.nix +++ b/pkgs/development/libraries/haskell/repr/default.nix @@ -12,9 +12,6 @@ cabal.mkDerivation (self: { description = "Render overloaded expressions to their textual representation"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/resource-pool/default.nix b/pkgs/development/libraries/haskell/resource-pool/default.nix index c8c28f0e7749105e8a386f885c25f879e541920c..77bc91051937b9360bd82b31f4556fe6ab5e7da7 100644 --- a/pkgs/development/libraries/haskell/resource-pool/default.nix +++ b/pkgs/development/libraries/haskell/resource-pool/default.nix @@ -14,9 +14,6 @@ cabal.mkDerivation (self: { description = "A high-performance striped resource pooling implementation"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/resourcet/default.nix b/pkgs/development/libraries/haskell/resourcet/default.nix index aca334e20b27f21dbca1cc1dc186ffe38ddc637a..4b2defc79d7186c0b998b5ee8f41688496f8f234 100644 --- a/pkgs/development/libraries/haskell/resourcet/default.nix +++ b/pkgs/development/libraries/haskell/resourcet/default.nix @@ -15,9 +15,6 @@ cabal.mkDerivation (self: { description = "Deterministic allocation and freeing of scarce resources"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/rvar/default.nix b/pkgs/development/libraries/haskell/rvar/default.nix index c6435cfc8df0b9c8276c51cf473a1412a1d17e5a..6f2ed95ab636e713090d51aeddfab92ee0e1d051 100644 --- a/pkgs/development/libraries/haskell/rvar/default.nix +++ b/pkgs/development/libraries/haskell/rvar/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Random Variables"; license = self.stdenv.lib.licenses.publicDomain; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/safe/default.nix b/pkgs/development/libraries/haskell/safe/default.nix index 067b7c4cf67d0c4928e4d8d76bd8c2a2c14244dd..6c16af12107d430b01410416ff407e2820298827 100644 --- a/pkgs/development/libraries/haskell/safe/default.nix +++ b/pkgs/development/libraries/haskell/safe/default.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Library for safe (pattern match free) functions"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/sample-frame/default.nix b/pkgs/development/libraries/haskell/sample-frame/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..f8acbf1fda8394490fd4302d40b5ba145d142993 --- /dev/null +++ b/pkgs/development/libraries/haskell/sample-frame/default.nix @@ -0,0 +1,16 @@ +{ cabal, QuickCheck, storableRecord }: + +cabal.mkDerivation (self: { + pname = "sample-frame"; + version = "0.0.2"; + sha256 = "1k1fyslgw5vvn9a38mhp7c9j1xxf75ys010rcn2vr3pm6aj868sx"; + isLibrary = true; + isExecutable = true; + buildDepends = [ QuickCheck storableRecord ]; + meta = { + homepage = "http://www.haskell.org/haskellwiki/Synthesizer"; + description = "Handling of samples in an (audio) signal"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/scotty/default.nix b/pkgs/development/libraries/haskell/scotty/default.nix index 7de31bcf65675eb43f6bbb9fe3339c784355e076..9baaa89d2d4c308325718b13a68b84b9c968fe86 100644 --- a/pkgs/development/libraries/haskell/scotty/default.nix +++ b/pkgs/development/libraries/haskell/scotty/default.nix @@ -15,6 +15,5 @@ cabal.mkDerivation (self: { description = "Haskell web framework inspired by Ruby's Sinatra, using WAI and Warp"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/semigroupoid-extras/default.nix b/pkgs/development/libraries/haskell/semigroupoid-extras/default.nix index 26949f5004d7009e8d2bda2e3eb87e0e154cc2ca..263adb42f25342e6d58419ef6519ba2e4b4e89f3 100644 --- a/pkgs/development/libraries/haskell/semigroupoid-extras/default.nix +++ b/pkgs/development/libraries/haskell/semigroupoid-extras/default.nix @@ -10,6 +10,5 @@ cabal.mkDerivation (self: { description = "Semigroupoids requiring Haskell extensions"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/semigroupoids/default.nix b/pkgs/development/libraries/haskell/semigroupoids/default.nix index dcbb09b5613f8a1f80cedfed81e36a2b3aa2cdbb..4f1367dd559d51f0165f2fe35bb8d49c46ef9fcb 100644 --- a/pkgs/development/libraries/haskell/semigroupoids/default.nix +++ b/pkgs/development/libraries/haskell/semigroupoids/default.nix @@ -10,6 +10,5 @@ cabal.mkDerivation (self: { description = "Haskell 98 semigroupoids: Category sans id"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/semigroups/default.nix b/pkgs/development/libraries/haskell/semigroups/default.nix index 1a1234413aaa402918718c9b46972604be2a1a9d..ded335ca524db1f1426b9ee8af98c67493fbf548 100644 --- a/pkgs/development/libraries/haskell/semigroups/default.nix +++ b/pkgs/development/libraries/haskell/semigroups/default.nix @@ -2,17 +2,14 @@ cabal.mkDerivation (self: { pname = "semigroups"; - version = "0.9.1"; - sha256 = "1i49180fw9bxnszmqc5jl877kjhkaa22py1jwfh69slx4z3giyxq"; + version = "0.9.2"; + sha256 = "06r6zdfbks48yb7ib0bc168xxk4qciv4dbazq76dpmnlhwxcf1li"; buildDepends = [ nats ]; meta = { homepage = "http://github.com/ekmett/semigroups/"; description = "Haskell 98 semigroups"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/sendfile/default.nix b/pkgs/development/libraries/haskell/sendfile/default.nix index 0cc3a64ccc8fb3346f707fe3d42d41dc669750d2..dc1f24757af28b8927ec6e46c99bd25fb8ef2a3b 100644 --- a/pkgs/development/libraries/haskell/sendfile/default.nix +++ b/pkgs/development/libraries/haskell/sendfile/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "A portable sendfile library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/setenv/default.nix b/pkgs/development/libraries/haskell/setenv/default.nix index 02df359df8683245e2f7965c36d82e9552aec490..b19728820aadaf4b480fbeeaf9abf7e8e3a08fef 100644 --- a/pkgs/development/libraries/haskell/setenv/default.nix +++ b/pkgs/development/libraries/haskell/setenv/default.nix @@ -10,6 +10,5 @@ cabal.mkDerivation (self: { description = "A cross-platform library for setting environment variables"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/shake/default.nix b/pkgs/development/libraries/haskell/shake/default.nix index e2b46cfcbc52d6976e619893f676d64ddf355499..c5cc24cc8da1716fa051381477b812737ffe5bcc 100644 --- a/pkgs/development/libraries/haskell/shake/default.nix +++ b/pkgs/development/libraries/haskell/shake/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "shake"; - version = "0.10.2"; - sha256 = "0045dz46iacrihqlsdg00zmnkrma5swnmy2bp4h91fx0829lki9n"; + version = "0.10.3"; + sha256 = "0dvpjswiiw2s4zh5sjx7qs4xp41bw2wqny0k61pkg5wvgw3b7jmh"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -17,6 +17,5 @@ cabal.mkDerivation (self: { description = "Build system library, like Make, but more accurate dependencies"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/shakespeare-css/default.nix b/pkgs/development/libraries/haskell/shakespeare-css/default.nix index 3e9a5fb250c716f7a45af69ce62c6ddc1b082fae..a18df3062e296d077cb8e0c0cfd5b2112cbd88fd 100644 --- a/pkgs/development/libraries/haskell/shakespeare-css/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-css/default.nix @@ -11,9 +11,6 @@ cabal.mkDerivation (self: { description = "Stick your haskell variables into css at compile time"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix b/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix index a624bb140d155db8064876f428cd5a35fa5d4b8b..1150ead039416aaa71e289e78dba7b804ed5401b 100644 --- a/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "A type-based approach to internationalization"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/shakespeare-js/default.nix b/pkgs/development/libraries/haskell/shakespeare-js/default.nix index d492b6d250586348d00ce1ee48f92fb8190ea322..802fc8851371c80e36ebff35bdb80672532e487d 100644 --- a/pkgs/development/libraries/haskell/shakespeare-js/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-js/default.nix @@ -11,9 +11,6 @@ cabal.mkDerivation (self: { description = "Stick your haskell variables into javascript/coffeescript at compile time"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/shakespeare-text/default.nix b/pkgs/development/libraries/haskell/shakespeare-text/default.nix index d5551d0ef8cd89bc63e0faea2c0260f1bfd209c9..d4cc135cc62af548665703c762eecc7e0e8a7d3c 100644 --- a/pkgs/development/libraries/haskell/shakespeare-text/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-text/default.nix @@ -11,9 +11,6 @@ cabal.mkDerivation (self: { description = "Interpolation with quasi-quotation: put variables strings"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/shakespeare/default.nix b/pkgs/development/libraries/haskell/shakespeare/default.nix index d90812c21cd534a02574bf1efe67d78a798be7c4..16ad7ffa44a602b4a4a956eb4363bcf282f7bd68 100644 --- a/pkgs/development/libraries/haskell/shakespeare/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare/default.nix @@ -13,9 +13,6 @@ cabal.mkDerivation (self: { description = "A toolkit for making compile-time interpolated templates"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/shelly/default.nix b/pkgs/development/libraries/haskell/shelly/default.nix index 9c167eb126be9cdff7c49046d79528642e0a78c4..1e9e1f8c6ccb0274acbd44f7b13775f614ff8a0f 100644 --- a/pkgs/development/libraries/haskell/shelly/default.nix +++ b/pkgs/development/libraries/haskell/shelly/default.nix @@ -17,9 +17,6 @@ cabal.mkDerivation (self: { description = "shell-like (systems) programming in Haskell"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/show/default.nix b/pkgs/development/libraries/haskell/show/default.nix index 7eed37f5a40dac1432b0a2d9b406fb0c8e605a4c..28ed4371264be206892dc106f1c85ab91471900d 100644 --- a/pkgs/development/libraries/haskell/show/default.nix +++ b/pkgs/development/libraries/haskell/show/default.nix @@ -1,17 +1,14 @@ -{ cabal, QuickCheck, random, simpleReflect, smallcheck, syb }: +{ cabal, syb }: cabal.mkDerivation (self: { pname = "show"; - version = "0.5"; - sha256 = "1s9nwhbc1935359r76glirg858c1sg8nfvv0bzzrncrgf0gxcl4f"; - buildDepends = [ QuickCheck random simpleReflect smallcheck syb ]; + version = "0.6"; + sha256 = "15bvfffnr034z8wbmhxa8h5qskbxwbflk434dx023l1qlm3sjmsg"; + buildDepends = [ syb ]; meta = { description = "'Show' instances for Lambdabot"; license = "GPL"; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/silently/default.nix b/pkgs/development/libraries/haskell/silently/default.nix index 87a3ac1d4633411d79ca087e989a6df54d9e769a..fcd7a0a872a5110c87104ce9635ae63fa2d84e50 100644 --- a/pkgs/development/libraries/haskell/silently/default.nix +++ b/pkgs/development/libraries/haskell/silently/default.nix @@ -11,6 +11,5 @@ cabal.mkDerivation (self: { description = "Prevent or capture writing to stdout and other handles"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/simple-reflect/default.nix b/pkgs/development/libraries/haskell/simple-reflect/default.nix index af6a6a6e69433db1d15497b3902b690c6a4d00be..7a7f40c6d833efeb580749ec99f1f75c86b1ea21 100644 --- a/pkgs/development/libraries/haskell/simple-reflect/default.nix +++ b/pkgs/development/libraries/haskell/simple-reflect/default.nix @@ -9,6 +9,5 @@ cabal.mkDerivation (self: { description = "Simple reflection of expressions containing variables"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/simple-sendfile/default.nix b/pkgs/development/libraries/haskell/simple-sendfile/default.nix index f1d245f9358e8e8f3ea5321a7c6050cfa88e4e19..9e8f638c65cfd7153fc646f0ba041d98f5f86029 100644 --- a/pkgs/development/libraries/haskell/simple-sendfile/default.nix +++ b/pkgs/development/libraries/haskell/simple-sendfile/default.nix @@ -11,9 +11,6 @@ cabal.mkDerivation (self: { description = "Cross platform library for the sendfile system call"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/sized-types/default.nix b/pkgs/development/libraries/haskell/sized-types/default.nix index 99cb87b7c046be330fc89aca0598342712822abe..672b2c090ef26ff5cfa5ce0537d754592fff866b 100644 --- a/pkgs/development/libraries/haskell/sized-types/default.nix +++ b/pkgs/development/libraries/haskell/sized-types/default.nix @@ -11,6 +11,5 @@ cabal.mkDerivation (self: { description = "Sized types in Haskell"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/skein/default.nix b/pkgs/development/libraries/haskell/skein/default.nix index 9bb3efc65034d9454c8965ff9de8cc84457a38d1..3db59020b15466c28e517989da2859b0b94dcf55 100644 --- a/pkgs/development/libraries/haskell/skein/default.nix +++ b/pkgs/development/libraries/haskell/skein/default.nix @@ -11,9 +11,6 @@ cabal.mkDerivation (self: { description = "Skein, a family of cryptographic hash functions. Includes Skein-MAC as well."; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/smallcheck/default.nix b/pkgs/development/libraries/haskell/smallcheck/default.nix index ff710b0ea07dbf2a4881ee7d2385284654fa4ad9..6d82e7e5132dafa5d346c5913945d3242e8ec71e 100644 --- a/pkgs/development/libraries/haskell/smallcheck/default.nix +++ b/pkgs/development/libraries/haskell/smallcheck/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "A property-based testing library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/snap/core.nix b/pkgs/development/libraries/haskell/snap/core.nix index 7aa6cfae73e9cfa7da4e2c422491da8a1ef2b0c7..a20ec8e7ca5a2e16f9fcbf2ff8d12fbaa4593e70 100644 --- a/pkgs/development/libraries/haskell/snap/core.nix +++ b/pkgs/development/libraries/haskell/snap/core.nix @@ -20,9 +20,6 @@ cabal.mkDerivation (self: { description = "Snap: A Haskell Web Framework (core interfaces and types)"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/snap/loader-dynamic.nix b/pkgs/development/libraries/haskell/snap/loader-dynamic.nix index 85a39546e45f6434efd067ecd257a3ee01379099..abe4d4cc074b8cefbc212eb52e28325fd843863c 100644 --- a/pkgs/development/libraries/haskell/snap/loader-dynamic.nix +++ b/pkgs/development/libraries/haskell/snap/loader-dynamic.nix @@ -10,6 +10,5 @@ cabal.mkDerivation (self: { description = "Snap: A Haskell Web Framework: dynamic loader"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/snap/loader-static.nix b/pkgs/development/libraries/haskell/snap/loader-static.nix index 09402c1a5502094892458881e2974fce345174a3..e75ae50d6c875604a8e7273c797bdda221a3051a 100644 --- a/pkgs/development/libraries/haskell/snap/loader-static.nix +++ b/pkgs/development/libraries/haskell/snap/loader-static.nix @@ -9,6 +9,5 @@ cabal.mkDerivation (self: { description = "Snap: A Haskell Web Framework: static loader"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/snap/server.nix b/pkgs/development/libraries/haskell/snap/server.nix index 7bd2ca8fdbe95895446b004f07a3b02da3a5aabe..c11dfe4f398f89adc04cae4a882ee9545720e8c3 100644 --- a/pkgs/development/libraries/haskell/snap/server.nix +++ b/pkgs/development/libraries/haskell/snap/server.nix @@ -18,9 +18,6 @@ cabal.mkDerivation (self: { description = "A fast, iteratee-based, epoll-enabled web server for the Snap Framework"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/snap/snap.nix b/pkgs/development/libraries/haskell/snap/snap.nix index 9c7c350c5174e51f2b2dcd3b351b5f773e4b1334..80cdf575d70bdff25fca4a3833f4c1c97bca2c3b 100644 --- a/pkgs/development/libraries/haskell/snap/snap.nix +++ b/pkgs/development/libraries/haskell/snap/snap.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "snap"; - version = "0.11.3.1"; - sha256 = "0hlwpzrckq89wpa8603j7p3aghlqshrp3kzsdrryf44k24q3vgrj"; + version = "0.12.0"; + sha256 = "0nccmbvhwrcfkz4771bhc210mh2ic0i93ks1752ndgk3007rkiff"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -19,12 +19,10 @@ cabal.mkDerivation (self: { snapCore snapServer stm syb text time transformers unorderedContainers vector vectorAlgorithms xmlhtml ]; - jailbreak = true; meta = { homepage = "http://snapframework.com/"; description = "Top-level package for the Snap Web Framework"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/socks/default.nix b/pkgs/development/libraries/haskell/socks/default.nix index 311c8b224134f110bded0e5a383d924e90a5e705..27dd54b29598860d624e16cc50963c3be0219f40 100644 --- a/pkgs/development/libraries/haskell/socks/default.nix +++ b/pkgs/development/libraries/haskell/socks/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Socks proxy (version 5) implementation"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/split/0.2.1.1.nix b/pkgs/development/libraries/haskell/split/0.2.1.1.nix index c9f9ecad73cf07c0e0bb16970cdad4789a07c515..0fb28b53ac94fb46051a3d56696b7cdf58445eac 100644 --- a/pkgs/development/libraries/haskell/split/0.2.1.1.nix +++ b/pkgs/development/libraries/haskell/split/0.2.1.1.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Combinator library for splitting lists"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/split/0.2.2.nix b/pkgs/development/libraries/haskell/split/0.2.2.nix index 62e30fa330038f82f66f9edb6768ebb7d8198c26..ab60774cca40f2a5ef125fbf738811fa6120a4cb 100644 --- a/pkgs/development/libraries/haskell/split/0.2.2.nix +++ b/pkgs/development/libraries/haskell/split/0.2.2.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Combinator library for splitting lists"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/srcloc/default.nix b/pkgs/development/libraries/haskell/srcloc/default.nix index eef8a1505cfc4e4cc952ee1808790e5bb5128cd3..f652ed001e4096a7b63c9fff67c9c23645f69a96 100644 --- a/pkgs/development/libraries/haskell/srcloc/default.nix +++ b/pkgs/development/libraries/haskell/srcloc/default.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Data types for managing source code locations"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/stateref/default.nix b/pkgs/development/libraries/haskell/stateref/default.nix index b14fd6ebadebfc6504418278b9b3d04739e70be0..bc3913f6726dadb6f268979ac6d1161e1e377f18 100644 --- a/pkgs/development/libraries/haskell/stateref/default.nix +++ b/pkgs/development/libraries/haskell/stateref/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Abstraction for things that work like IORef"; license = self.stdenv.lib.licenses.publicDomain; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/statistics/default.nix b/pkgs/development/libraries/haskell/statistics/default.nix index 0218db413d5f107a2d99c16ca65631796a9272ce..4576a447fde4b6fb196fd5e35631ddf0c8f588fe 100644 --- a/pkgs/development/libraries/haskell/statistics/default.nix +++ b/pkgs/development/libraries/haskell/statistics/default.nix @@ -23,9 +23,6 @@ cabal.mkDerivation (self: { description = "A library of statistical types, data, and functions"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/stb-image/default.nix b/pkgs/development/libraries/haskell/stb-image/default.nix index 1521763f2bfe10241e6ce6af3c0df2c3f7db709b..1b1f1ba705bff79ea5c6befa20bd4f893aab2d34 100644 --- a/pkgs/development/libraries/haskell/stb-image/default.nix +++ b/pkgs/development/libraries/haskell/stb-image/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "A wrapper around Sean Barrett's JPEG/PNG decoder"; license = self.stdenv.lib.licenses.publicDomain; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/stm-chans/default.nix b/pkgs/development/libraries/haskell/stm-chans/default.nix index 07bc40d42d685fddbc571cc6899752e5024a6f04..16dc7622031164a448d0dcb67755eec31c34d095 100644 --- a/pkgs/development/libraries/haskell/stm-chans/default.nix +++ b/pkgs/development/libraries/haskell/stm-chans/default.nix @@ -2,14 +2,13 @@ cabal.mkDerivation (self: { pname = "stm-chans"; - version = "1.3.1"; - sha256 = "15agd0d3r3zmya72hpi9pkmzqw7mj6l84946dhds0hsb6d12r6qj"; + version = "2.0.0"; + sha256 = "041dmjmr70was4vxf1ihizzarms7a8x53m80i65ggxxmq5xqmsa3"; buildDepends = [ stm ]; meta = { homepage = "http://code.haskell.org/~wren/"; description = "Additional types of channels for STM"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/stm-conduit/default.nix b/pkgs/development/libraries/haskell/stm-conduit/default.nix index fc9c7c5027a3ecff153a5005791918d0dcf9e444..778d333c956cfc11b3ab8a5e0565030178d85a4e 100644 --- a/pkgs/development/libraries/haskell/stm-conduit/default.nix +++ b/pkgs/development/libraries/haskell/stm-conduit/default.nix @@ -17,6 +17,5 @@ cabal.mkDerivation (self: { description = "Introduces conduits to channels, and promotes using conduits concurrently"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/stm/2.1.1.2.nix b/pkgs/development/libraries/haskell/stm/2.1.1.2.nix index 6184a324181f90793ccd916c64eadf08e5849b68..fe308211ebb560d5dc9ed47532faa7f285f82ae7 100644 --- a/pkgs/development/libraries/haskell/stm/2.1.1.2.nix +++ b/pkgs/development/libraries/haskell/stm/2.1.1.2.nix @@ -8,9 +8,6 @@ cabal.mkDerivation (self: { description = "Software Transactional Memory"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/stm/2.1.2.1.nix b/pkgs/development/libraries/haskell/stm/2.1.2.1.nix index 8615f10be80fc02f794ab5526d483f7c6d2f106c..492fb6e3557fd6e9e19f4c576e20986e616a394f 100644 --- a/pkgs/development/libraries/haskell/stm/2.1.2.1.nix +++ b/pkgs/development/libraries/haskell/stm/2.1.2.1.nix @@ -8,9 +8,6 @@ cabal.mkDerivation (self: { description = "Software Transactional Memory"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/stm/2.2.0.1.nix b/pkgs/development/libraries/haskell/stm/2.2.0.1.nix index 1174a9740e5b1bfe4ddf06f298a9725c0e59069f..fc33a979adff2293f126342c8588bccefcb7b52e 100644 --- a/pkgs/development/libraries/haskell/stm/2.2.0.1.nix +++ b/pkgs/development/libraries/haskell/stm/2.2.0.1.nix @@ -8,9 +8,6 @@ cabal.mkDerivation (self: { description = "Software Transactional Memory"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/stm/2.3.nix b/pkgs/development/libraries/haskell/stm/2.3.nix index 7057ede7052e346734d88e29717c542a929c8e63..4057b1f7fb3c0056ba7418483b2489b8a07ceb7c 100644 --- a/pkgs/development/libraries/haskell/stm/2.3.nix +++ b/pkgs/development/libraries/haskell/stm/2.3.nix @@ -8,9 +8,6 @@ cabal.mkDerivation (self: { description = "Software Transactional Memory"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/stm/2.4.2.nix b/pkgs/development/libraries/haskell/stm/2.4.2.nix index d75f133d896a4efae14d413a127cbb4969e11282..a3fa76e4a5190262282c9f3ecf8ca0b4fa2df440 100644 --- a/pkgs/development/libraries/haskell/stm/2.4.2.nix +++ b/pkgs/development/libraries/haskell/stm/2.4.2.nix @@ -8,9 +8,6 @@ cabal.mkDerivation (self: { description = "Software Transactional Memory"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/stm/2.4.nix b/pkgs/development/libraries/haskell/stm/2.4.nix index 13d3653ff653aa0f6e73c95ea9f1e0605af5cb9a..a949474cef122e07795aa00649d0a2eb2ff67fe4 100644 --- a/pkgs/development/libraries/haskell/stm/2.4.nix +++ b/pkgs/development/libraries/haskell/stm/2.4.nix @@ -8,9 +8,6 @@ cabal.mkDerivation (self: { description = "Software Transactional Memory"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/storable-complex/default.nix b/pkgs/development/libraries/haskell/storable-complex/default.nix index dc36d53f046a8ab83806023772b11bbf526fe636..4450308a91071658b4683fd2a8f4d419e681e7c5 100644 --- a/pkgs/development/libraries/haskell/storable-complex/default.nix +++ b/pkgs/development/libraries/haskell/storable-complex/default.nix @@ -8,9 +8,6 @@ cabal.mkDerivation (self: { description = "Storable instance for Complex"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/storable-record/default.nix b/pkgs/development/libraries/haskell/storable-record/default.nix index caf8e218b18173c3045fb10305a04a7a6da260d1..455d860ba5e91f8d9e159a077fd87dd5ef5fd237 100644 --- a/pkgs/development/libraries/haskell/storable-record/default.nix +++ b/pkgs/development/libraries/haskell/storable-record/default.nix @@ -12,9 +12,6 @@ cabal.mkDerivation (self: { description = "Elegant definition of Storable instances for records"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/strict/default.nix b/pkgs/development/libraries/haskell/strict/default.nix index 99239884b0a3a957acc2c62f3e69c007e5ad4d5d..61b34efbe4516d99ad00a19227d83e128033efae 100644 --- a/pkgs/development/libraries/haskell/strict/default.nix +++ b/pkgs/development/libraries/haskell/strict/default.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Strict data types and String IO"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/strictConcurrency/default.nix b/pkgs/development/libraries/haskell/strictConcurrency/default.nix index 083f3e06d5b7175910a662be6be062fd6bf200d3..915fad7006a4e01273b893269aed893dfc7a06a6 100644 --- a/pkgs/development/libraries/haskell/strictConcurrency/default.nix +++ b/pkgs/development/libraries/haskell/strictConcurrency/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Strict concurrency abstractions"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/string-combinators/default.nix b/pkgs/development/libraries/haskell/string-combinators/default.nix index 75c31a3971f96ca9f401a541893b542753852f21..bfc38fb07e89f117a3ed8cf4cc5175b405c3c6e9 100644 --- a/pkgs/development/libraries/haskell/string-combinators/default.nix +++ b/pkgs/development/libraries/haskell/string-combinators/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Polymorphic functions to build and combine stringlike values"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/string-qq/default.nix b/pkgs/development/libraries/haskell/string-qq/default.nix index eb5d7303cdd327a5be601692e20ec1609fb8b322..78fe1c3930f7f259fc8ab386f8d096c30874a83a 100644 --- a/pkgs/development/libraries/haskell/string-qq/default.nix +++ b/pkgs/development/libraries/haskell/string-qq/default.nix @@ -8,6 +8,5 @@ cabal.mkDerivation (self: { description = "QuasiQuoter for non-interpolated strings, texts and bytestrings"; license = self.stdenv.lib.licenses.publicDomain; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/stringbuilder/default.nix b/pkgs/development/libraries/haskell/stringbuilder/default.nix index ddb219cc307527dee8d28f5ac5241a73447be3b8..efe0956afc0f1cd23da5ed43eb2f6147c52ec08b 100644 --- a/pkgs/development/libraries/haskell/stringbuilder/default.nix +++ b/pkgs/development/libraries/haskell/stringbuilder/default.nix @@ -9,6 +9,5 @@ cabal.mkDerivation (self: { description = "A writer monad for multi-line string literals"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/stringprep/default.nix b/pkgs/development/libraries/haskell/stringprep/default.nix index b37be3680cb79402d4b6dc2b9bb8eb52296e0f0b..f1654751f75301f810b7aa7077dcff1e3c31fd1a 100644 --- a/pkgs/development/libraries/haskell/stringprep/default.nix +++ b/pkgs/development/libraries/haskell/stringprep/default.nix @@ -9,6 +9,5 @@ cabal.mkDerivation (self: { description = "Implements the \"StringPrep\" algorithm"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/stringsearch/default.nix b/pkgs/development/libraries/haskell/stringsearch/default.nix index dc3bdd6a2c358fce355e8e81b99056b7bf1c014a..f8032f8cde41e4c3b24655e9811e8282003b56e7 100644 --- a/pkgs/development/libraries/haskell/stringsearch/default.nix +++ b/pkgs/development/libraries/haskell/stringsearch/default.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Fast searching, splitting and replacing of ByteStrings"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/strptime/default.nix b/pkgs/development/libraries/haskell/strptime/default.nix index 9e50b646e3b79e0b375fb0c8a2aea41a6e18c440..c092f0c0d15b32072bc505ee9deff2c1fabe8392 100644 --- a/pkgs/development/libraries/haskell/strptime/default.nix +++ b/pkgs/development/libraries/haskell/strptime/default.nix @@ -9,6 +9,5 @@ cabal.mkDerivation (self: { description = "Efficient parsing of LocalTime using a binding to C's strptime, with some extra features (i.e. fractional seconds)"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/stylish-haskell/default.nix b/pkgs/development/libraries/haskell/stylish-haskell/default.nix index 87d79b6e0610d0f156c838e39ddbc76c1c582721..1d2cea756ffb870eaba2d7fd806dd0e0622ea531 100644 --- a/pkgs/development/libraries/haskell/stylish-haskell/default.nix +++ b/pkgs/development/libraries/haskell/stylish-haskell/default.nix @@ -20,6 +20,5 @@ cabal.mkDerivation (self: { description = "Haskell code prettifier"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/svgcairo/default.nix b/pkgs/development/libraries/haskell/svgcairo/default.nix index 08c812f74241f15e91d1201bba8be86200370e15..e7aafd37264e8bd64355a52f43cfd9931a4e59cb 100644 --- a/pkgs/development/libraries/haskell/svgcairo/default.nix +++ b/pkgs/development/libraries/haskell/svgcairo/default.nix @@ -13,9 +13,6 @@ cabal.mkDerivation (self: { description = "Binding to the libsvg-cairo library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/syb/0.2.2.nix b/pkgs/development/libraries/haskell/syb/0.2.2.nix index 070279fadfde0412ae72ab7c2ad4cf9c9c8c9523..b03cb947d27d72708bb2537924d36130dce0f1f6 100644 --- a/pkgs/development/libraries/haskell/syb/0.2.2.nix +++ b/pkgs/development/libraries/haskell/syb/0.2.2.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Scrap Your Boilerplate"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/syb/0.3.3.nix b/pkgs/development/libraries/haskell/syb/0.3.3.nix index 01cc80c883dd59c9bc7e816a4281a823671a4e39..7caf5908a2dcf501ba87c6e1e3cc9b31543520dd 100644 --- a/pkgs/development/libraries/haskell/syb/0.3.3.nix +++ b/pkgs/development/libraries/haskell/syb/0.3.3.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Scrap Your Boilerplate"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/syb/0.3.6.1.nix b/pkgs/development/libraries/haskell/syb/0.3.6.1.nix index 04e5b7e1b0e73fc3ea93d410a61b306e13a91ea5..7638ab3332f2402abd612637f270a34d7c8221b4 100644 --- a/pkgs/development/libraries/haskell/syb/0.3.6.1.nix +++ b/pkgs/development/libraries/haskell/syb/0.3.6.1.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Scrap Your Boilerplate"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/syb/0.3.6.2.nix b/pkgs/development/libraries/haskell/syb/0.3.6.2.nix index 70f1b01db0ac96ad4a952abfa6573a1a907d7f99..a37e238ff710655c281b210c192db219164f7ca2 100644 --- a/pkgs/development/libraries/haskell/syb/0.3.6.2.nix +++ b/pkgs/development/libraries/haskell/syb/0.3.6.2.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Scrap Your Boilerplate"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/syb/0.3.7.nix b/pkgs/development/libraries/haskell/syb/0.3.7.nix index 5063009b93af62cc8e5cb87ff38178718e2c2634..44a16e0bf5ca4c4feb5b8ac4986e37a5f7d244ec 100644 --- a/pkgs/development/libraries/haskell/syb/0.3.7.nix +++ b/pkgs/development/libraries/haskell/syb/0.3.7.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Scrap Your Boilerplate"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/syb/0.3.nix b/pkgs/development/libraries/haskell/syb/0.3.nix index ddf16ad41e553459fbbf03595fea2013695e500d..4b999a94416d47934fcbb0449c355201e1fdbc36 100644 --- a/pkgs/development/libraries/haskell/syb/0.3.nix +++ b/pkgs/development/libraries/haskell/syb/0.3.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Scrap Your Boilerplate"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/syb/0.4.0.nix b/pkgs/development/libraries/haskell/syb/0.4.0.nix index f6ca59529659caed44b850913e919aac8fe771be..7408d0ac5375014ec44a2e3e029b9d099a4b568a 100644 --- a/pkgs/development/libraries/haskell/syb/0.4.0.nix +++ b/pkgs/development/libraries/haskell/syb/0.4.0.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Scrap Your Boilerplate"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/syb/syb-with-class-instances-text.nix b/pkgs/development/libraries/haskell/syb/syb-with-class-instances-text.nix index 2f3167ff62801976790e3b9601ac9925976f2676..0cf40a87d4174bc73c59670e033c5f95e7e15f6a 100644 --- a/pkgs/development/libraries/haskell/syb/syb-with-class-instances-text.nix +++ b/pkgs/development/libraries/haskell/syb/syb-with-class-instances-text.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Scrap Your Boilerplate With Class Text instance"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/syb/syb-with-class.nix b/pkgs/development/libraries/haskell/syb/syb-with-class.nix index 81a5529e9cae4bc12158144393dad9d558e89ea6..c6a85e27df15a395cef1b9ea48dfc58aae7802a3 100644 --- a/pkgs/development/libraries/haskell/syb/syb-with-class.nix +++ b/pkgs/development/libraries/haskell/syb/syb-with-class.nix @@ -8,9 +8,6 @@ cabal.mkDerivation (self: { description = "Scrap Your Boilerplate With Class"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/symbol/default.nix b/pkgs/development/libraries/haskell/symbol/default.nix index 2b91c145e8b0d6d5e66eaba34ba07353cb816b75..d82a196887825ec91d05c11eb24edfc4b40a9289 100644 --- a/pkgs/development/libraries/haskell/symbol/default.nix +++ b/pkgs/development/libraries/haskell/symbol/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "A 'Symbol' type for fast symbol comparison"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/system-fileio/default.nix b/pkgs/development/libraries/haskell/system-fileio/default.nix index 1f78cd4c511506e745027e38a1e4c8e3315ad66a..f61dedb7b8c558d1033c18d27762ef8a0ee3bd5a 100644 --- a/pkgs/development/libraries/haskell/system-fileio/default.nix +++ b/pkgs/development/libraries/haskell/system-fileio/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Consistent filesystem interaction across GHC versions"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/system-filepath/default.nix b/pkgs/development/libraries/haskell/system-filepath/default.nix index f845ca85266946ef08b18cc9d0f6d24df1f98b12..851b28baafeacf0b2de60a2235b8a16aba5c5baa 100644 --- a/pkgs/development/libraries/haskell/system-filepath/default.nix +++ b/pkgs/development/libraries/haskell/system-filepath/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "High-level, byte-based file and directory path manipulations"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/tabular/default.nix b/pkgs/development/libraries/haskell/tabular/default.nix index bde48cd3d5e03c6b813ae04a621ce8f3b147ae89..32ede2f660b316f47a9819bf7a5ed174ae8aa86a 100644 --- a/pkgs/development/libraries/haskell/tabular/default.nix +++ b/pkgs/development/libraries/haskell/tabular/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Two-dimensional data tables with rendering functions"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/tagged/default.nix b/pkgs/development/libraries/haskell/tagged/default.nix index e48bcb39f09a29019780bd1caee449a74a8698e8..42f0beef125d82a75aee9f7a6567b160efd2ca65 100644 --- a/pkgs/development/libraries/haskell/tagged/default.nix +++ b/pkgs/development/libraries/haskell/tagged/default.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/tagsoup/default.nix b/pkgs/development/libraries/haskell/tagsoup/default.nix index 4fbea6c0cc200a8dc36a51dcc63e9bf8e539b31e..3258267f0120049d03dc037041e166f7c753e012 100644 --- a/pkgs/development/libraries/haskell/tagsoup/default.nix +++ b/pkgs/development/libraries/haskell/tagsoup/default.nix @@ -12,9 +12,6 @@ cabal.mkDerivation (self: { description = "Parsing and extracting information from (possibly malformed) HTML/XML documents"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/tagstream-conduit/default.nix b/pkgs/development/libraries/haskell/tagstream-conduit/default.nix index 089593c5da341a87361309851158fa03ae58695d..1b290bd310baa4ae9bfc0506fe809895a79b1942 100644 --- a/pkgs/development/libraries/haskell/tagstream-conduit/default.nix +++ b/pkgs/development/libraries/haskell/tagstream-conduit/default.nix @@ -17,6 +17,5 @@ cabal.mkDerivation (self: { description = "streamlined html tag parser"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/tar/default.nix b/pkgs/development/libraries/haskell/tar/default.nix index 4a10c2ff04108c3ff8d22d57107f15203c05d48d..04257960a64c7cd9c79d21f866c06976e6c474f1 100644 --- a/pkgs/development/libraries/haskell/tar/default.nix +++ b/pkgs/development/libraries/haskell/tar/default.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Reading, writing and manipulating \".tar\" archive files."; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/temporary/default.nix b/pkgs/development/libraries/haskell/temporary/default.nix index f24b9e1b162fd1a4c1308d82c52488586f1ad8e6..df93cae198a0f585998a6fcd2e44643dbd447d60 100644 --- a/pkgs/development/libraries/haskell/temporary/default.nix +++ b/pkgs/development/libraries/haskell/temporary/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Portable temporary file and directory support for Windows and Unix, based on code from Cabal"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/terminal-progress-bar/default.nix b/pkgs/development/libraries/haskell/terminal-progress-bar/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..d5e16e43d3ae359f20f8aaedda6df83c26bf1a59 --- /dev/null +++ b/pkgs/development/libraries/haskell/terminal-progress-bar/default.nix @@ -0,0 +1,19 @@ +{ cabal, baseUnicodeSymbols, HUnit, testFramework +, testFrameworkHunit +}: + +cabal.mkDerivation (self: { + pname = "terminal-progress-bar"; + version = "0.0.1.3"; + sha256 = "04glnz72ivnaqfhyxb5sc175yxiq7lf7xi1jhbk9gi95md00f1js"; + buildDepends = [ baseUnicodeSymbols ]; + testDepends = [ + baseUnicodeSymbols HUnit testFramework testFrameworkHunit + ]; + meta = { + homepage = "https://github.com/roelvandijk/terminal-progress-bar"; + description = "A simple progress bar in the terminal"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/terminfo/default.nix b/pkgs/development/libraries/haskell/terminfo/default.nix index cb08aabfdeee0e684bee7ecd1a31f589d49e6cc1..24221912025ac89c06eeef826047fb0d30440c4a 100644 --- a/pkgs/development/libraries/haskell/terminfo/default.nix +++ b/pkgs/development/libraries/haskell/terminfo/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Haskell bindings to the terminfo library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/test-framework-hunit/default.nix b/pkgs/development/libraries/haskell/test-framework-hunit/default.nix index a4bbc52b1b649581c8b209c8b6264ef61e0c558b..011d791643cc5bf35068a3770dd018ccf67d0e95 100644 --- a/pkgs/development/libraries/haskell/test-framework-hunit/default.nix +++ b/pkgs/development/libraries/haskell/test-framework-hunit/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "HUnit support for the test-framework package"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix b/pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix index 7133c9a144ea78c51d4a9ffb7d7c1d496e2e2606..cabc0fe1d0a40f3bfb8ec047d79330d6d3d5ace5 100644 --- a/pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix +++ b/pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix @@ -14,9 +14,6 @@ cabal.mkDerivation (self: { description = "QuickCheck support for the test-framework package"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix b/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix index ac70e3d2aff73636031f7747152ba522d206c4be..b944c1e104cc6c50e5ba07301d125b369debf7fe 100644 --- a/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix +++ b/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix @@ -13,9 +13,6 @@ cabal.mkDerivation (self: { description = "QuickCheck2 support for the test-framework package"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/test-framework-th-prime/default.nix b/pkgs/development/libraries/haskell/test-framework-th-prime/default.nix index e7d9ade6d4011020f24576553d39d462492f9c0e..ebcd608eb6a603989e238d8fdbf11af03f4ebf57 100644 --- a/pkgs/development/libraries/haskell/test-framework-th-prime/default.nix +++ b/pkgs/development/libraries/haskell/test-framework-th-prime/default.nix @@ -9,6 +9,5 @@ cabal.mkDerivation (self: { description = "Template Haskell for test framework"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/test-framework-th/default.nix b/pkgs/development/libraries/haskell/test-framework-th/default.nix index 31f293ac9e2f45e5814e01686aaf7d1a64b36285..f70e522a2ce49fd47c7196b13c51efee8015e64c 100644 --- a/pkgs/development/libraries/haskell/test-framework-th/default.nix +++ b/pkgs/development/libraries/haskell/test-framework-th/default.nix @@ -14,9 +14,6 @@ cabal.mkDerivation (self: { description = "Automagically generate the HUnit- and Quickcheck-bulk-code using Template Haskell"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/test-framework/default.nix b/pkgs/development/libraries/haskell/test-framework/default.nix index fb9f4f7fd4cafd0ed0fd16bec47fa6230b2dca1a..b9f335e1a5af67cd8a0db1ff8cdf1c6d1b70470b 100644 --- a/pkgs/development/libraries/haskell/test-framework/default.nix +++ b/pkgs/development/libraries/haskell/test-framework/default.nix @@ -17,9 +17,6 @@ cabal.mkDerivation (self: { description = "Framework for running and organising tests, with HUnit and QuickCheck support"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/texmath/default.nix b/pkgs/development/libraries/haskell/texmath/default.nix index c9534ef57ed0965189989b88e7342f22b7009f6f..8082e77d2824a131c87c0e201aaaac18a41823f9 100644 --- a/pkgs/development/libraries/haskell/texmath/default.nix +++ b/pkgs/development/libraries/haskell/texmath/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "texmath"; - version = "0.6.1.4"; - sha256 = "0cw3lzadk8cx5h26b18i50hvs1vk8vbd0dxmmcszj4a8a0rbpmd9"; + version = "0.6.1.5"; + sha256 = "15cxki04khq29m9h5wxzxgppc3r58ccp2hgsslp2g1f59x2wm348"; isLibrary = true; isExecutable = true; buildDepends = [ parsec syb xml ]; @@ -12,9 +12,6 @@ cabal.mkDerivation (self: { description = "Conversion of LaTeX math formulas to MathML or OMML"; license = "GPL"; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/text-icu/default.nix b/pkgs/development/libraries/haskell/text-icu/default.nix index ba467ce6d1347a2d3cc75e440fcfbdb9688a2369..16115809f5b14d0a01fc027b575caa43f48dfcf0 100644 --- a/pkgs/development/libraries/haskell/text-icu/default.nix +++ b/pkgs/development/libraries/haskell/text-icu/default.nix @@ -11,6 +11,5 @@ cabal.mkDerivation (self: { description = "Bindings to the ICU library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/text/0.11.0.5.nix b/pkgs/development/libraries/haskell/text/0.11.0.5.nix index e64be4197df3e2613f249d70fd5ba47711b004ec..59644d057201eed60ee6db1ec218773a4071cbe1 100644 --- a/pkgs/development/libraries/haskell/text/0.11.0.5.nix +++ b/pkgs/development/libraries/haskell/text/0.11.0.5.nix @@ -11,9 +11,6 @@ cabal.mkDerivation (self: { description = "An efficient packed Unicode text type"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/text/0.11.0.6.nix b/pkgs/development/libraries/haskell/text/0.11.0.6.nix index 6bc6baf36ce4585dad9b1cc1b69d41063172db56..04fd250dfe9f14ccc6f48a226a5615d753c82764 100644 --- a/pkgs/development/libraries/haskell/text/0.11.0.6.nix +++ b/pkgs/development/libraries/haskell/text/0.11.0.6.nix @@ -11,9 +11,6 @@ cabal.mkDerivation (self: { description = "An efficient packed Unicode text type"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/text/0.11.1.13.nix b/pkgs/development/libraries/haskell/text/0.11.1.13.nix index 41569875a9eb47e933c563580a87e5c8946cbd81..71d0c28e48d7097c5704e5a3c32bac3ee78e8d11 100644 --- a/pkgs/development/libraries/haskell/text/0.11.1.13.nix +++ b/pkgs/development/libraries/haskell/text/0.11.1.13.nix @@ -17,9 +17,6 @@ cabal.mkDerivation (self: { description = "An efficient packed Unicode text type"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/text/0.11.1.5.nix b/pkgs/development/libraries/haskell/text/0.11.1.5.nix index 79804b49b2a1b14c74eaf1b8fe61a8ac5ec7fa1b..03c2d90ff8da546eb8a73b0a7d5bab9c109d824f 100644 --- a/pkgs/development/libraries/haskell/text/0.11.1.5.nix +++ b/pkgs/development/libraries/haskell/text/0.11.1.5.nix @@ -11,9 +11,6 @@ cabal.mkDerivation (self: { description = "An efficient packed Unicode text type"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/text/0.11.2.0.nix b/pkgs/development/libraries/haskell/text/0.11.2.0.nix index a2a737b0199010b61edcb1e3c1cbf6f5a8f5e0b8..ab784807bfa2dfd1ba1ec66ff645150739ad4c5b 100644 --- a/pkgs/development/libraries/haskell/text/0.11.2.0.nix +++ b/pkgs/development/libraries/haskell/text/0.11.2.0.nix @@ -17,9 +17,6 @@ cabal.mkDerivation (self: { description = "An efficient packed Unicode text type"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/text/0.11.2.3.nix b/pkgs/development/libraries/haskell/text/0.11.2.3.nix index 9bdf7fc97caaaa1a0cef8d8520fbf4e210e1a4f9..afa0e7eb5d3d14fd2ea18b660767cd665c4449d6 100644 --- a/pkgs/development/libraries/haskell/text/0.11.2.3.nix +++ b/pkgs/development/libraries/haskell/text/0.11.2.3.nix @@ -17,9 +17,6 @@ cabal.mkDerivation (self: { description = "An efficient packed Unicode text type"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/text/0.11.3.1.nix b/pkgs/development/libraries/haskell/text/0.11.3.1.nix index 8c3de985955ed34705cc596a5441bff2a924361a..6bbab990b8a9bd940e2853e19f2519c813d99fa7 100644 --- a/pkgs/development/libraries/haskell/text/0.11.3.1.nix +++ b/pkgs/development/libraries/haskell/text/0.11.3.1.nix @@ -17,9 +17,6 @@ cabal.mkDerivation (self: { description = "An efficient packed Unicode text type"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/th-extras/default.nix b/pkgs/development/libraries/haskell/th-extras/default.nix index e8df62c6190f166ae04014a121fb78ec8571579d..3475ccb804a0d24b6cfc32571640ad1b4dd9de73 100644 --- a/pkgs/development/libraries/haskell/th-extras/default.nix +++ b/pkgs/development/libraries/haskell/th-extras/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "A grab bag of functions for use with Template Haskell"; license = self.stdenv.lib.licenses.publicDomain; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/th-lift/default.nix b/pkgs/development/libraries/haskell/th-lift/default.nix index aa7b5224de61336af0083ef52aef682f583bf2e4..b8a118b56a65e4fcf20a149d538aac96d06c6a96 100644 --- a/pkgs/development/libraries/haskell/th-lift/default.nix +++ b/pkgs/development/libraries/haskell/th-lift/default.nix @@ -8,9 +8,6 @@ cabal.mkDerivation (self: { description = "Derive Template Haskell's Lift class for datatypes"; license = "unknown"; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/th-orphans/default.nix b/pkgs/development/libraries/haskell/th-orphans/default.nix index 6b6a971bf688d9c9ab71778cac6fe091d9000160..da14adfe339bf7d2922d0bce19d6720003e8c68d 100644 --- a/pkgs/development/libraries/haskell/th-orphans/default.nix +++ b/pkgs/development/libraries/haskell/th-orphans/default.nix @@ -10,6 +10,5 @@ cabal.mkDerivation (self: { description = "Orphan instances for TH datatypes"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/thespian/default.nix b/pkgs/development/libraries/haskell/thespian/default.nix index d4108f0a012e1d4a17ba59b1712a364ad94c6039..aa848e4aa08708130b89b6978bb9b5d9f6f99029 100644 --- a/pkgs/development/libraries/haskell/thespian/default.nix +++ b/pkgs/development/libraries/haskell/thespian/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Lightweight Erlang-style actors for Haskell"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/threadmanager/default.nix b/pkgs/development/libraries/haskell/threadmanager/default.nix index 4517a5f451260fce56f8cf5b4528951a78eb59eb..dc058844247d4d445c29dfaaf00a2013ee96c2d1 100644 --- a/pkgs/development/libraries/haskell/threadmanager/default.nix +++ b/pkgs/development/libraries/haskell/threadmanager/default.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Simple thread management"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/threads/default.nix b/pkgs/development/libraries/haskell/threads/default.nix index ad02cca08de6a00bbcede1ad4828d4634dc23887..d802790da9d786c4db7dee92727588c9bd741a84 100644 --- a/pkgs/development/libraries/haskell/threads/default.nix +++ b/pkgs/development/libraries/haskell/threads/default.nix @@ -17,6 +17,5 @@ cabal.mkDerivation (self: { description = "Fork threads and wait for their result"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/time-compat/default.nix b/pkgs/development/libraries/haskell/time-compat/default.nix index 50535015a215e35064e9d56484f6a856f60acd8f..fa7c3ff4185538e0d5fdf32dd76926fc5e90bb3e 100644 --- a/pkgs/development/libraries/haskell/time-compat/default.nix +++ b/pkgs/development/libraries/haskell/time-compat/default.nix @@ -10,6 +10,5 @@ cabal.mkDerivation (self: { description = "Compatibility with old-time for the time package"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/time/1.1.2.4.nix b/pkgs/development/libraries/haskell/time/1.1.2.4.nix index 7ced3956a8a3684c19e26a04c58dd9a9eaf008d5..56072676b67b6aa2146591de84d837671dd85efc 100644 --- a/pkgs/development/libraries/haskell/time/1.1.2.4.nix +++ b/pkgs/development/libraries/haskell/time/1.1.2.4.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "A time library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/time/1.4.0.2.nix b/pkgs/development/libraries/haskell/time/1.4.0.2.nix index 2c6f0ae55947bd771053e699fa4e2a282b7bdfc8..62232d1aa5a7f16bf18f8db451e2d0f9910f97b5 100644 --- a/pkgs/development/libraries/haskell/time/1.4.0.2.nix +++ b/pkgs/development/libraries/haskell/time/1.4.0.2.nix @@ -15,9 +15,6 @@ cabal.mkDerivation (self: { description = "A time library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/tls-extra/default.nix b/pkgs/development/libraries/haskell/tls-extra/default.nix index 163852c312eceebc98411703e12bd793b8d7abd8..c9ab989ed76d5919fa5766e4cfadce9d4b240367 100644 --- a/pkgs/development/libraries/haskell/tls-extra/default.nix +++ b/pkgs/development/libraries/haskell/tls-extra/default.nix @@ -18,9 +18,6 @@ cabal.mkDerivation (self: { description = "TLS extra default values and helpers"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/tls/default.nix b/pkgs/development/libraries/haskell/tls/default.nix index c900975e87400a8b0055508f58d0856993216ec6..72e0976ceaff497449c4b3ee2e64ec05063518c5 100644 --- a/pkgs/development/libraries/haskell/tls/default.nix +++ b/pkgs/development/libraries/haskell/tls/default.nix @@ -21,9 +21,6 @@ cabal.mkDerivation (self: { description = "TLS/SSL protocol native implementation (Server and Client)"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/transformers-base/default.nix b/pkgs/development/libraries/haskell/transformers-base/default.nix index 951458eb4eb10b0731cbaf5782459fd71a25bf05..e323905f81b6a3116c649916096791797e381bb2 100644 --- a/pkgs/development/libraries/haskell/transformers-base/default.nix +++ b/pkgs/development/libraries/haskell/transformers-base/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Lift computations from the bottom of a transformer stack"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/transformers-compat/default.nix b/pkgs/development/libraries/haskell/transformers-compat/default.nix index 0eb34b9444c46959ccd136a5507d77b0f7dd2526..f3120a61f201cb77e6a489b6061bc6e5c853a7c7 100644 --- a/pkgs/development/libraries/haskell/transformers-compat/default.nix +++ b/pkgs/development/libraries/haskell/transformers-compat/default.nix @@ -11,6 +11,5 @@ cabal.mkDerivation (self: { description = "A small compatibility shim exposing the new types from transformers 0.3 to older Haskell platforms."; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/transformers/0.2.2.0.nix b/pkgs/development/libraries/haskell/transformers/0.2.2.0.nix index f38605c17ad3a5d6dcb6626ef9627488c86d2e8d..6d2e374687fce0af13440aa76edd6c460e8cb4e7 100644 --- a/pkgs/development/libraries/haskell/transformers/0.2.2.0.nix +++ b/pkgs/development/libraries/haskell/transformers/0.2.2.0.nix @@ -8,9 +8,6 @@ cabal.mkDerivation (self: { description = "Concrete functor and monad transformers"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/transformers/0.3.0.0.nix b/pkgs/development/libraries/haskell/transformers/0.3.0.0.nix index 50675d901ec01a9edd927ff8d23b64db8fa0b999..ec1b85248d9cc0b148ce95db25e2eca5008045e9 100644 --- a/pkgs/development/libraries/haskell/transformers/0.3.0.0.nix +++ b/pkgs/development/libraries/haskell/transformers/0.3.0.0.nix @@ -8,9 +8,6 @@ cabal.mkDerivation (self: { description = "Concrete functor and monad transformers"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/tuple/default.nix b/pkgs/development/libraries/haskell/tuple/default.nix index fa06558fc0dd3d3b55125016d98a7c9ca598020f..90441f31867cc6ff5687b9bd19e8835753305836 100644 --- a/pkgs/development/libraries/haskell/tuple/default.nix +++ b/pkgs/development/libraries/haskell/tuple/default.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Various functions on tuples"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/type-equality/default.nix b/pkgs/development/libraries/haskell/type-equality/default.nix index 979fdc57a3beff64ffa76c4548b1fd70a68bc66b..ee90387b63701b699016621a9755396a650194ea 100644 --- a/pkgs/development/libraries/haskell/type-equality/default.nix +++ b/pkgs/development/libraries/haskell/type-equality/default.nix @@ -2,16 +2,13 @@ cabal.mkDerivation (self: { pname = "type-equality"; - version = "0.1.1"; - sha256 = "0sgb7aki0ns3547y3abv1xh9rlmwhjm1c370pf3jjssysayh2wzv"; + version = "0.1.2"; + sha256 = "06acqpkvyvalv5knjzzbgm40hzas6cdfsypvjxsbb0mhq4d80xwr"; meta = { homepage = "http://github.com/hesselink/type-equality/"; description = "Type equality, coercion/cast and other operations"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/type-level-natural-number/default.nix b/pkgs/development/libraries/haskell/type-level-natural-number/default.nix index 80af1951f5868142f44b2de5f6865c4c95a8c4c3..8dff0ffd58fc573da20020bde4587f384ba52b04 100644 --- a/pkgs/development/libraries/haskell/type-level-natural-number/default.nix +++ b/pkgs/development/libraries/haskell/type-level-natural-number/default.nix @@ -8,6 +8,5 @@ cabal.mkDerivation (self: { description = "Simple, Haskell 2010-compatible type level natural numbers"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/unbound/default.nix b/pkgs/development/libraries/haskell/unbound/default.nix index 1db17d844e7527f47652f41e25e12039b465922d..a90381202e1ad7bcdcf5ab81593ff3b5ec20bb60 100644 --- a/pkgs/development/libraries/haskell/unbound/default.nix +++ b/pkgs/development/libraries/haskell/unbound/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Generic support for programming with names and binders"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/unbounded-delays/default.nix b/pkgs/development/libraries/haskell/unbounded-delays/default.nix index ea4e66a95faee79ba5ff244bad2fed1c5e5c1d88..ccccf9d95d38ddacc977942e78c4e4ba54a6edda 100644 --- a/pkgs/development/libraries/haskell/unbounded-delays/default.nix +++ b/pkgs/development/libraries/haskell/unbounded-delays/default.nix @@ -9,6 +9,5 @@ cabal.mkDerivation (self: { description = "Unbounded thread delays and timeouts"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/uniplate/default.nix b/pkgs/development/libraries/haskell/uniplate/default.nix index a5fef1484ff6212f75373b2aa014dc669561a6f0..8519ff451b2ef1d2e6b5bf1d5b7c7026d8910e75 100644 --- a/pkgs/development/libraries/haskell/uniplate/default.nix +++ b/pkgs/development/libraries/haskell/uniplate/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Help writing simple, concise and fast generic operations"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/uniqueid/default.nix b/pkgs/development/libraries/haskell/uniqueid/default.nix index d717bd27871afac29ede2030f67dd3d3e35819e2..399ac02e3ce2c5835c5231fd541577c29ef66440 100644 --- a/pkgs/development/libraries/haskell/uniqueid/default.nix +++ b/pkgs/development/libraries/haskell/uniqueid/default.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Splittable Unique Identifier Supply"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/unix-compat/default.nix b/pkgs/development/libraries/haskell/unix-compat/default.nix index 35097601783a8ab56e9e1a2cb5f9edae8172f733..9742b193e7baefbe343a163099f0306dc3795c13 100644 --- a/pkgs/development/libraries/haskell/unix-compat/default.nix +++ b/pkgs/development/libraries/haskell/unix-compat/default.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Portable POSIX-compatibility layer"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/unix-time/default.nix b/pkgs/development/libraries/haskell/unix-time/default.nix index 3d3fbdeca45c8bc326a6bc7112b7d0483f4dd0aa..22d3af28fd0862ba1cf7308828a434407b309f69 100644 --- a/pkgs/development/libraries/haskell/unix-time/default.nix +++ b/pkgs/development/libraries/haskell/unix-time/default.nix @@ -2,13 +2,12 @@ cabal.mkDerivation (self: { pname = "unix-time"; - version = "0.1.6"; - sha256 = "0l8k42n67qwc1ljxw2ksmdnj630q1ql0im0j1z7yv9kak9pmqfy6"; + version = "0.1.8"; + sha256 = "1s9r2i4hl7nm1f4zya03q0a2ayliby51caziz1w79schhplfa5sv"; testDepends = [ doctest hspec QuickCheck time ]; meta = { description = "Unix time parser/formatter and utilities"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/unlambda/default.nix b/pkgs/development/libraries/haskell/unlambda/default.nix index 2344e4606932526f7a0ec9212722ae5ddd3c6a1e..474bb1a8b092c99ec801c826ad7ed04c1302ca09 100644 --- a/pkgs/development/libraries/haskell/unlambda/default.nix +++ b/pkgs/development/libraries/haskell/unlambda/default.nix @@ -11,9 +11,6 @@ cabal.mkDerivation (self: { description = "Unlambda interpreter"; license = "GPL"; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/unordered-containers/0.2.3.0.nix b/pkgs/development/libraries/haskell/unordered-containers/0.2.3.0.nix new file mode 100644 index 0000000000000000000000000000000000000000..a8f1ae922ee15063abb556df696712391d7ce4b4 --- /dev/null +++ b/pkgs/development/libraries/haskell/unordered-containers/0.2.3.0.nix @@ -0,0 +1,21 @@ +{ cabal, ChasingBottoms, deepseq, hashable, HUnit, QuickCheck +, testFramework, testFrameworkHunit, testFrameworkQuickcheck2 +}: + +cabal.mkDerivation (self: { + pname = "unordered-containers"; + version = "0.2.3.0"; + sha256 = "1vzgjr9jxdkmgq970ng9zi2j60awvx8iv1v6kzjlrkwzxx1a9dpd"; + buildDepends = [ deepseq hashable ]; + testDepends = [ + ChasingBottoms hashable HUnit QuickCheck testFramework + testFrameworkHunit testFrameworkQuickcheck2 + ]; + doCheck = false; + meta = { + homepage = "https://github.com/tibbe/unordered-containers"; + description = "Efficient hashing-based container types"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/unordered-containers/default.nix b/pkgs/development/libraries/haskell/unordered-containers/0.2.3.1.nix similarity index 86% rename from pkgs/development/libraries/haskell/unordered-containers/default.nix rename to pkgs/development/libraries/haskell/unordered-containers/0.2.3.1.nix index df0be2ea477678aa5af50f3ac3dcda7a9945fb36..af4f93c7457acf996788c854a8c511fbad375cce 100644 --- a/pkgs/development/libraries/haskell/unordered-containers/default.nix +++ b/pkgs/development/libraries/haskell/unordered-containers/0.2.3.1.nix @@ -17,9 +17,5 @@ cabal.mkDerivation (self: { description = "Efficient hashing-based container types"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; }; }) diff --git a/pkgs/development/libraries/haskell/url/default.nix b/pkgs/development/libraries/haskell/url/default.nix index e4726ef011d66d52fb92728935d5caed904b9385..5353895815d9863723a6092153f14ace7f7f0176 100644 --- a/pkgs/development/libraries/haskell/url/default.nix +++ b/pkgs/development/libraries/haskell/url/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "A library for working with URLs"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/urlencoded/default.nix b/pkgs/development/libraries/haskell/urlencoded/default.nix index bb2ec05db0bcda493f074b76f095568241eb95b4..05bd2ab09bbd20762c4611948b158f9869481194 100644 --- a/pkgs/development/libraries/haskell/urlencoded/default.nix +++ b/pkgs/development/libraries/haskell/urlencoded/default.nix @@ -12,6 +12,5 @@ cabal.mkDerivation (self: { description = "Generate or process x-www-urlencoded data"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/utf8-light/default.nix b/pkgs/development/libraries/haskell/utf8-light/default.nix index 59ebfe3b5e6fc13391feb9cb218928009188019d..42591158cd7cb34b1204921437c8bc175951ee99 100644 --- a/pkgs/development/libraries/haskell/utf8-light/default.nix +++ b/pkgs/development/libraries/haskell/utf8-light/default.nix @@ -8,9 +8,6 @@ cabal.mkDerivation (self: { description = "Unicode"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/utf8-string/default.nix b/pkgs/development/libraries/haskell/utf8-string/default.nix index 0928ae0347b13b8230ff8a46b13b584b86f4c786..e627c77bda2bc996aafc802b64f5db7670b0ab38 100644 --- a/pkgs/development/libraries/haskell/utf8-string/default.nix +++ b/pkgs/development/libraries/haskell/utf8-string/default.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Support for reading and writing UTF8 Strings"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/utility-ht/default.nix b/pkgs/development/libraries/haskell/utility-ht/default.nix index 41c6ca0cffecafe5f4f7bca61182770b255c292f..76ce975b11e81bb7f192f8ebdb84af5477e32273 100644 --- a/pkgs/development/libraries/haskell/utility-ht/default.nix +++ b/pkgs/development/libraries/haskell/utility-ht/default.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Various small helper functions for Lists, Maybes, Tuples, Functions"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/uu-interleaved/default.nix b/pkgs/development/libraries/haskell/uu-interleaved/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..a71111282fadea2a164b6f249153579cb5d6330a --- /dev/null +++ b/pkgs/development/libraries/haskell/uu-interleaved/default.nix @@ -0,0 +1,13 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "uu-interleaved"; + version = "0.1.0.0"; + sha256 = "00zq89fjz3r5pj6qbci017cm9y2rsvl265y9d95q0rv6ljhsayzs"; + meta = { + homepage = "http://www.cs.uu.nl/wiki/bin/view/HUT/ParserCombinators"; + description = "Providing an interleaving combinator for use with applicative/alternative style implementations"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/uu-options/default.nix b/pkgs/development/libraries/haskell/uu-options/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..651cd9fe450aabe83e90edbf499827d0f2b4591f --- /dev/null +++ b/pkgs/development/libraries/haskell/uu-options/default.nix @@ -0,0 +1,18 @@ +{ cabal, lenses, mtl, transformers, uuInterleaved, uuParsinglib }: + +cabal.mkDerivation (self: { + pname = "uu-options"; + version = "0.1.0.1"; + sha256 = "0dygg4w3rlnf1pnmwq7i6vzz0v90b4g18ipfc5whn1ss1bixwxk4"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + lenses mtl transformers uuInterleaved uuParsinglib + ]; + meta = { + homepage = "http://www.cs.uu.nl/wiki/bin/view/HUT/ParserCombinators"; + description = "Parse command line options using uu-interleave and uu-parsinglib"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/uu-parsinglib/default.nix b/pkgs/development/libraries/haskell/uu-parsinglib/default.nix index 31c504139bbeee53ed3d1dcf75edeca663bbcf33..8d0b0bda23d204daf02d9d940276b8662d1ed7f9 100644 --- a/pkgs/development/libraries/haskell/uu-parsinglib/default.nix +++ b/pkgs/development/libraries/haskell/uu-parsinglib/default.nix @@ -1,18 +1,15 @@ -{ cabal, ListLike, time }: +{ cabal, ListLike, time, uuInterleaved }: cabal.mkDerivation (self: { pname = "uu-parsinglib"; - version = "2.7.4.3"; - sha256 = "0q907gfxia7i63wc1p0zfmp102f5xpanhrq5pa259mp1nwqq6lyg"; - buildDepends = [ ListLike time ]; + version = "2.8.1"; + sha256 = "10phjwm8dm45rms2vfpx9vzm56v7b9wp0308xkfbalh5zbvxmv35"; + buildDepends = [ ListLike time uuInterleaved ]; meta = { homepage = "http://www.cs.uu.nl/wiki/bin/view/HUT/ParserCombinators"; description = "Fast, online, error-correcting, monadic, applicative, merging, permuting, idiomatic parser combinators"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/uuid/default.nix b/pkgs/development/libraries/haskell/uuid/default.nix index 5b74c74b490428002e3592e7750ad4a6afad518c..2aa30d8823ec8482d15e35f0fc24cd251c24de04 100644 --- a/pkgs/development/libraries/haskell/uuid/default.nix +++ b/pkgs/development/libraries/haskell/uuid/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "uuid"; - version = "1.2.12"; - sha256 = "023954gx1hqf1v4qlzwy3nlxwn9yll0642p16w3vayrahcm27ljb"; + version = "1.2.13"; + sha256 = "0y9r71iqvabmvyrglw42g37skgisyknkv3pkfih2qfrfkk75zw0s"; buildDepends = [ binary cryptohash maccatcher random time ]; testDepends = [ criterion deepseq HUnit mersenneRandomPure64 QuickCheck random @@ -16,6 +16,5 @@ cabal.mkDerivation (self: { description = "For creating, comparing, parsing and printing Universally Unique Identifiers"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/uulib/default.nix b/pkgs/development/libraries/haskell/uulib/default.nix index 9b1660404ee2a5507b6a58143adf771035d73a40..2521c44bec6e6f025fef93a38054dd936546b49f 100644 --- a/pkgs/development/libraries/haskell/uulib/default.nix +++ b/pkgs/development/libraries/haskell/uulib/default.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Haskell Utrecht Tools Library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/vacuum-cairo/default.nix b/pkgs/development/libraries/haskell/vacuum-cairo/default.nix index ccabd8cc7fa22334ebf736c9c513e51b11d30bd7..5ab1d4f85464587081b9adf7c5f741fc9e75df53 100644 --- a/pkgs/development/libraries/haskell/vacuum-cairo/default.nix +++ b/pkgs/development/libraries/haskell/vacuum-cairo/default.nix @@ -13,9 +13,6 @@ cabal.mkDerivation (self: { description = "Visualize live Haskell data structures using vacuum, graphviz and cairo"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/vacuum/default.nix b/pkgs/development/libraries/haskell/vacuum/default.nix index 8be1ffee52875eef93c4a3e314da8b0ed3f13095..8506e58050222fb40f6471c652fe7f43070cf0f5 100644 --- a/pkgs/development/libraries/haskell/vacuum/default.nix +++ b/pkgs/development/libraries/haskell/vacuum/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Graph representation of the GHC heap"; license = self.stdenv.lib.licenses.gpl3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/vault/default.nix b/pkgs/development/libraries/haskell/vault/default.nix index 6aed9be5799c8e9c24c104b5e4d3078633dd078b..6039e74247722e6f902b333e2dad8079df2f225f 100644 --- a/pkgs/development/libraries/haskell/vault/default.nix +++ b/pkgs/development/libraries/haskell/vault/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "a persistent store for values of arbitrary types"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/vcs-revision/default.nix b/pkgs/development/libraries/haskell/vcs-revision/default.nix index 1b34c7b5578278800f37510d0fae8fac89257e26..a1cd2783931f1451bed7e20325e47e3de3c6e1c2 100644 --- a/pkgs/development/libraries/haskell/vcs-revision/default.nix +++ b/pkgs/development/libraries/haskell/vcs-revision/default.nix @@ -8,6 +8,5 @@ cabal.mkDerivation (self: { description = "Facilities for accessing the version control revision of the current directory"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/vect/default.nix b/pkgs/development/libraries/haskell/vect/default.nix index 636ea7d0259b9ef040761d46faf19ab13e41ecd5..2d81a01317665b67e9979319b135151b47fb7ea2 100644 --- a/pkgs/development/libraries/haskell/vect/default.nix +++ b/pkgs/development/libraries/haskell/vect/default.nix @@ -10,6 +10,5 @@ cabal.mkDerivation (self: { description = "A low-dimensional linear algebra library, tailored to computer graphics"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/vector-algorithms/default.nix b/pkgs/development/libraries/haskell/vector-algorithms/default.nix index d933d7e009f5b4cdad46c115c2b29ad511e49ee4..dc8c9dd35bae460065c8ec226487bf7b9d884d6b 100644 --- a/pkgs/development/libraries/haskell/vector-algorithms/default.nix +++ b/pkgs/development/libraries/haskell/vector-algorithms/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Efficient algorithms for vector arrays"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/vector-space-points/default.nix b/pkgs/development/libraries/haskell/vector-space-points/default.nix index 37a131a32443b483947e114d955c997c4cb3f93f..2a5c1eb2fc4278cc84c78b4c3ec373403c517819 100644 --- a/pkgs/development/libraries/haskell/vector-space-points/default.nix +++ b/pkgs/development/libraries/haskell/vector-space-points/default.nix @@ -9,6 +9,5 @@ cabal.mkDerivation (self: { description = "A type for points, as distinct from vectors"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/vector-space/default.nix b/pkgs/development/libraries/haskell/vector-space/default.nix index 7d59f7874aa03e156ff37b3e1c50a7bcf62fef79..c6d440a5d471aa90fbbdd64f977e6889235fbc24 100644 --- a/pkgs/development/libraries/haskell/vector-space/default.nix +++ b/pkgs/development/libraries/haskell/vector-space/default.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Vector & affine spaces, linear maps, and derivatives"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/vector/0.10.0.1.nix b/pkgs/development/libraries/haskell/vector/0.10.0.1.nix index 66173051e8ab7bc884a73e396a16a813fa2138eb..7acc89d6a91c7c93f38cd2eb97d00e472b2cd233 100644 --- a/pkgs/development/libraries/haskell/vector/0.10.0.1.nix +++ b/pkgs/development/libraries/haskell/vector/0.10.0.1.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Efficient Arrays"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/vector/0.10.nix b/pkgs/development/libraries/haskell/vector/0.10.nix index 9d9fd8c71caf4009972534efcbe062bb61bbdf48..8fac71eed4b3b6c695e19104af90b43ae9ee9e09 100644 --- a/pkgs/development/libraries/haskell/vector/0.10.nix +++ b/pkgs/development/libraries/haskell/vector/0.10.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Efficient Arrays"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/vector/0.9.1.nix b/pkgs/development/libraries/haskell/vector/0.9.1.nix index c5c06fe93e5c7b13cedec17706fbc6753a98f360..63add64226d62d4fbe0deee9f6cd0ea75d2d66b9 100644 --- a/pkgs/development/libraries/haskell/vector/0.9.1.nix +++ b/pkgs/development/libraries/haskell/vector/0.9.1.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Efficient Arrays"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/void/default.nix b/pkgs/development/libraries/haskell/void/default.nix index 59220ee3c1ce9c0b35354c4c0c9bd2b647cedf40..591040a9548095f4d83bbada89f2df05e9375db1 100644 --- a/pkgs/development/libraries/haskell/void/default.nix +++ b/pkgs/development/libraries/haskell/void/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "A Haskell 98 logically uninhabited data type"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/vty-ui/default.nix b/pkgs/development/libraries/haskell/vty-ui/default.nix index aac778973be2828c4d0250fa018a0c1265e37dac..3b38db8c1de498f54ad3bb68e76eda1232de8df0 100644 --- a/pkgs/development/libraries/haskell/vty-ui/default.nix +++ b/pkgs/development/libraries/haskell/vty-ui/default.nix @@ -17,6 +17,5 @@ cabal.mkDerivation (self: { description = "An interactive terminal user interface library for Vty"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/vty/default.nix b/pkgs/development/libraries/haskell/vty/default.nix index e2b223df58b5a140b40899e1afd8cb155f1dcae1..3121399b3a909fee01aa7b3b3a0a546cf000b533 100644 --- a/pkgs/development/libraries/haskell/vty/default.nix +++ b/pkgs/development/libraries/haskell/vty/default.nix @@ -21,9 +21,6 @@ cabal.mkDerivation (self: { description = "A simple terminal UI library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/wai-app-static/default.nix b/pkgs/development/libraries/haskell/wai-app-static/default.nix index 10e9073dcf341bab404f6988b64252f9d1bc999d..74ec00c58fddeb13b44fec22395841092b82182d 100644 --- a/pkgs/development/libraries/haskell/wai-app-static/default.nix +++ b/pkgs/development/libraries/haskell/wai-app-static/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "wai-app-static"; - version = "1.3.1.2"; - sha256 = "1i0j3n0cp1zq43g06nb3cxajd4k9isg4chdwzzlyimm078a9w54x"; + version = "1.3.1.3"; + sha256 = "0h6m1an3srkvyaz50w16v2mhjyfdqbqq2d7ng3yhrrmb1fyvhas1"; buildDepends = [ base64Bytestring blazeBuilder blazeHtml blazeMarkup cereal cryptoConduit cryptohash fileEmbed httpDate httpTypes mimeTypes @@ -22,9 +22,6 @@ cabal.mkDerivation (self: { description = "WAI application for static serving"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix index baaa6114ba68ed735a1ac00abcae9786d468ad02..4be1beecafd273070e62d9e0726eb664287af0b6 100644 --- a/pkgs/development/libraries/haskell/wai-extra/default.nix +++ b/pkgs/development/libraries/haskell/wai-extra/default.nix @@ -24,9 +24,6 @@ cabal.mkDerivation (self: { description = "Provides some basic WAI handlers and middleware"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/wai-logger/default.nix b/pkgs/development/libraries/haskell/wai-logger/default.nix index a6c534937bab917de4b9f416f73753cfaee344b9..16f02f8774625f655ca9e2e4887053b719235273 100644 --- a/pkgs/development/libraries/haskell/wai-logger/default.nix +++ b/pkgs/development/libraries/haskell/wai-logger/default.nix @@ -14,9 +14,6 @@ cabal.mkDerivation (self: { description = "A logging system for WAI"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/wai-test/default.nix b/pkgs/development/libraries/haskell/wai-test/default.nix index 832cebab1222d9c5e839813c6c458f31870cb25f..2d0f6637171ee8d7b6448f4542e3a42b90741ca7 100644 --- a/pkgs/development/libraries/haskell/wai-test/default.nix +++ b/pkgs/development/libraries/haskell/wai-test/default.nix @@ -17,6 +17,5 @@ cabal.mkDerivation (self: { description = "Unit test framework (built on HUnit) for WAI applications"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/wai/default.nix b/pkgs/development/libraries/haskell/wai/default.nix index 7594474c0719307cc390181078ac4f4db4cdc018..deb1090dd4abbd63b5b89b1fa99abed477f69ca2 100644 --- a/pkgs/development/libraries/haskell/wai/default.nix +++ b/pkgs/development/libraries/haskell/wai/default.nix @@ -14,9 +14,6 @@ cabal.mkDerivation (self: { description = "Web Application Interface"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix index fcc9dcc3ecc81273b66593e09d0b44fe4f06d3be..0f3956dfe6e6cd3b9f994322aa3db8ecbfbfe8cb 100644 --- a/pkgs/development/libraries/haskell/warp/default.nix +++ b/pkgs/development/libraries/haskell/warp/default.nix @@ -23,9 +23,6 @@ cabal.mkDerivation (self: { description = "A fast, light-weight web server for WAI applications"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/wl-pprint-extras/default.nix b/pkgs/development/libraries/haskell/wl-pprint-extras/default.nix index 93f151dcabfb92aceea966b957abed6781f143da..77670b4f117e2c856bba0f8452aa07950bb21f99 100644 --- a/pkgs/development/libraries/haskell/wl-pprint-extras/default.nix +++ b/pkgs/development/libraries/haskell/wl-pprint-extras/default.nix @@ -10,6 +10,5 @@ cabal.mkDerivation (self: { description = "A free monad based on the Wadler/Leijen pretty printer"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/wl-pprint-terminfo/default.nix b/pkgs/development/libraries/haskell/wl-pprint-terminfo/default.nix index 57baeee387c590c7d6e8881a0078db9646fcc000..d2bd35eebd41b2f8eefc75193e9e750e46528b1f 100644 --- a/pkgs/development/libraries/haskell/wl-pprint-terminfo/default.nix +++ b/pkgs/development/libraries/haskell/wl-pprint-terminfo/default.nix @@ -14,6 +14,5 @@ cabal.mkDerivation (self: { description = "A color pretty printer with terminfo support"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/wl-pprint-text/default.nix b/pkgs/development/libraries/haskell/wl-pprint-text/default.nix index d13768d5e2203451fd14b1a848874613dbc305d7..083f269255a0bf5e63448957abe8c05499eda7a9 100644 --- a/pkgs/development/libraries/haskell/wl-pprint-text/default.nix +++ b/pkgs/development/libraries/haskell/wl-pprint-text/default.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "A Wadler/Leijen Pretty Printer for Text values"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/wl-pprint/default.nix b/pkgs/development/libraries/haskell/wl-pprint/default.nix index 5cfea69b266dcf4b90af0e73a3ea5993896d0e1e..9849d4fab0e517d2a5bfddb97f78fd1e4132ae16 100644 --- a/pkgs/development/libraries/haskell/wl-pprint/default.nix +++ b/pkgs/development/libraries/haskell/wl-pprint/default.nix @@ -8,6 +8,5 @@ cabal.mkDerivation (self: { description = "The Wadler/Leijen Pretty Printer"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/word8/default.nix b/pkgs/development/libraries/haskell/word8/default.nix index 0b63bed127fa6d3cbfd74577c7555d05ab1a1ebd..e8abded243818928d07d206cfc354decd7e91b03 100644 --- a/pkgs/development/libraries/haskell/word8/default.nix +++ b/pkgs/development/libraries/haskell/word8/default.nix @@ -9,6 +9,5 @@ cabal.mkDerivation (self: { description = "Word8 library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/wxHaskell/wx.nix b/pkgs/development/libraries/haskell/wxHaskell/wx.nix index 44bb4f411a27d7f6a2811d9a4e6c7d637910e62d..dc030f68059ae808372a9e361a41ff80f051573f 100644 --- a/pkgs/development/libraries/haskell/wxHaskell/wx.nix +++ b/pkgs/development/libraries/haskell/wxHaskell/wx.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "wxHaskell"; license = "unknown"; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix b/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix index a8186f517eab1b93a62658d99e0f81154b6ef542..98032d91c8e42f0ccb1b4622fff2ca338f16c457 100644 --- a/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix +++ b/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix @@ -13,9 +13,6 @@ cabal.mkDerivation (self: { description = "wxHaskell core"; license = "unknown"; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix b/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix index 7ad6a04c01ce90a9b19690c91a852cf1b45da8ca..a1caaef1bc9ef846d0c82c13115535f043bec5ae 100644 --- a/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix +++ b/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix @@ -12,9 +12,6 @@ cabal.mkDerivation (self: { description = "helper tool for building wxHaskell"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/xdg-basedir/default.nix b/pkgs/development/libraries/haskell/xdg-basedir/default.nix index a62b52242f793a1fd0f7e6867c4193307c22eaf6..3a12faf07c9efb32ae57d409a92cba3403bafa41 100644 --- a/pkgs/development/libraries/haskell/xdg-basedir/default.nix +++ b/pkgs/development/libraries/haskell/xdg-basedir/default.nix @@ -10,6 +10,5 @@ cabal.mkDerivation (self: { description = "A basic implementation of the XDG Base Directory specification"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/xdot/default.nix b/pkgs/development/libraries/haskell/xdot/default.nix index 2875861676ad42fe386b75b89b7808b14d9a5014..27aaad02b357236f5ae724ae8db8c6861cc7bf02 100644 --- a/pkgs/development/libraries/haskell/xdot/default.nix +++ b/pkgs/development/libraries/haskell/xdot/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Parse Graphviz xdot files and interactively view them using GTK and Cairo"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/xhtml/3000.2.0.1.nix b/pkgs/development/libraries/haskell/xhtml/3000.2.0.1.nix index 3c369103486aee58f785e9666f034c57dd50603c..605339d0811f4bb1c831e5ad9cdfc9a5c4826f4d 100644 --- a/pkgs/development/libraries/haskell/xhtml/3000.2.0.1.nix +++ b/pkgs/development/libraries/haskell/xhtml/3000.2.0.1.nix @@ -8,9 +8,6 @@ cabal.mkDerivation (self: { description = "An XHTML combinator library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/xhtml/3000.2.0.4.nix b/pkgs/development/libraries/haskell/xhtml/3000.2.0.4.nix index 33527b9affd4ec79b93d6db31c03f951c67e55fc..3a72cb8fba0bb53f4763b32759ae51dd2269424b 100644 --- a/pkgs/development/libraries/haskell/xhtml/3000.2.0.4.nix +++ b/pkgs/development/libraries/haskell/xhtml/3000.2.0.4.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "An XHTML combinator library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/xhtml/3000.2.0.5.nix b/pkgs/development/libraries/haskell/xhtml/3000.2.0.5.nix index c5a374eb2d0cbf67b0fb471c1e6b340d1e354659..05e13b4a7b337c7d238995cfbf57d0b15108782d 100644 --- a/pkgs/development/libraries/haskell/xhtml/3000.2.0.5.nix +++ b/pkgs/development/libraries/haskell/xhtml/3000.2.0.5.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "An XHTML combinator library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/xhtml/3000.2.1.nix b/pkgs/development/libraries/haskell/xhtml/3000.2.1.nix index 2078c317123fa88adf7291273add7ba63467833b..66196c806acc59a4e235d2238fede36cf059d52d 100644 --- a/pkgs/development/libraries/haskell/xhtml/3000.2.1.nix +++ b/pkgs/development/libraries/haskell/xhtml/3000.2.1.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "An XHTML combinator library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/xml-conduit/default.nix b/pkgs/development/libraries/haskell/xml-conduit/default.nix index a1192955540bf6c541f3c4c773be9ac27b8089ae..b586a6336bcaeb3b90ae7e9cc97044776942ae9c 100644 --- a/pkgs/development/libraries/haskell/xml-conduit/default.nix +++ b/pkgs/development/libraries/haskell/xml-conduit/default.nix @@ -21,9 +21,6 @@ cabal.mkDerivation (self: { description = "Pure-Haskell utilities for dealing with XML with the conduit package"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/xml-hamlet/default.nix b/pkgs/development/libraries/haskell/xml-hamlet/default.nix index bc6b7b2537ff3056602d5e856e29626127f7e84f..9c85223d654b730560bb05e5e3d45fd6e568d658 100644 --- a/pkgs/development/libraries/haskell/xml-hamlet/default.nix +++ b/pkgs/development/libraries/haskell/xml-hamlet/default.nix @@ -11,6 +11,5 @@ cabal.mkDerivation (self: { description = "Hamlet-style quasiquoter for XML content"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/xml-types/default.nix b/pkgs/development/libraries/haskell/xml-types/default.nix index d123a4db7329b48ca86716db8dd0809715f88ec6..48bd32b7c8974afe118b937686aca23893548635 100644 --- a/pkgs/development/libraries/haskell/xml-types/default.nix +++ b/pkgs/development/libraries/haskell/xml-types/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Basic types for representing XML"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/xml/default.nix b/pkgs/development/libraries/haskell/xml/default.nix index 126ab9b1f087c3cfab6cb3c06064b0cfb3f606bb..072e5d8bc1cc0872c99ad566fc4e005dc783da7c 100644 --- a/pkgs/development/libraries/haskell/xml/default.nix +++ b/pkgs/development/libraries/haskell/xml/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "A simple XML library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/xmlhtml/default.nix b/pkgs/development/libraries/haskell/xmlhtml/default.nix index d550e47259083efb37cd130fc7798004ee115f5a..66c1f645267a2547fe0f694c1eccbe5c4246413b 100644 --- a/pkgs/development/libraries/haskell/xmlhtml/default.nix +++ b/pkgs/development/libraries/haskell/xmlhtml/default.nix @@ -13,6 +13,5 @@ cabal.mkDerivation (self: { description = "XML parser and renderer with HTML 5 quirks mode"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/xss-sanitize/default.nix b/pkgs/development/libraries/haskell/xss-sanitize/default.nix index b21caa38afb374b19f627ce879df310f358f0689..89bdab65b17d97e5a72dc27153ad8be069f18a35 100644 --- a/pkgs/development/libraries/haskell/xss-sanitize/default.nix +++ b/pkgs/development/libraries/haskell/xss-sanitize/default.nix @@ -17,9 +17,6 @@ cabal.mkDerivation (self: { description = "sanitize untrusted HTML to prevent XSS attacks"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/yaml/default.nix b/pkgs/development/libraries/haskell/yaml/default.nix index f8f2ca510499e79cdb3b9318d48cad83207207b9..fe40fb785c9a275c063db4c07b9537d0db26a801 100644 --- a/pkgs/development/libraries/haskell/yaml/default.nix +++ b/pkgs/development/libraries/haskell/yaml/default.nix @@ -18,9 +18,6 @@ cabal.mkDerivation (self: { description = "Support for parsing and rendering YAML documents"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/yap/default.nix b/pkgs/development/libraries/haskell/yap/default.nix index 62dc82b1068527c17441d500e7d00211c99dfbe1..ab162988c958ce7c843047f3e7df720394075ee6 100644 --- a/pkgs/development/libraries/haskell/yap/default.nix +++ b/pkgs/development/libraries/haskell/yap/default.nix @@ -8,9 +8,6 @@ cabal.mkDerivation (self: { description = "yet another prelude - a simplistic refactoring with algebraic classes"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix index ba0af8456856eaaeb933dca30b049aa271c72395..c93a507e28bac89e097999a7518f1005f7a8ac2b 100644 --- a/pkgs/development/libraries/haskell/yesod-auth/default.nix +++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix @@ -22,9 +22,6 @@ cabal.mkDerivation (self: { description = "Authentication for Yesod"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index 8f9a9ed1a71ad314eb75cce7d253452c9cc636cc..fff50366233bdc7830c905cc702e2b7418e9a4e1 100644 --- a/pkgs/development/libraries/haskell/yesod-core/default.nix +++ b/pkgs/development/libraries/haskell/yesod-core/default.nix @@ -29,9 +29,6 @@ cabal.mkDerivation (self: { description = "Creation of type-safe, RESTful web applications"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/yesod-default/default.nix b/pkgs/development/libraries/haskell/yesod-default/default.nix index 8fac7f9e2b87711a8b15fe59138b484858feb3f8..b0e720ff487947fe0544d018ef81ba4d73d237cb 100644 --- a/pkgs/development/libraries/haskell/yesod-default/default.nix +++ b/pkgs/development/libraries/haskell/yesod-default/default.nix @@ -17,9 +17,6 @@ cabal.mkDerivation (self: { description = "Default config and main functions for your yesod application"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix index 6719fa20a934cde65a88236edda7e4307da82819..adf11916b90d07f506fc0bea7970aa9d5645526a 100644 --- a/pkgs/development/libraries/haskell/yesod-form/default.nix +++ b/pkgs/development/libraries/haskell/yesod-form/default.nix @@ -20,9 +20,6 @@ cabal.mkDerivation (self: { description = "Form handling support for Yesod Web Framework"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/yesod-json/default.nix b/pkgs/development/libraries/haskell/yesod-json/default.nix index 3506ca89f15af2ffe12b410186b3069f0c7439ca..b395645557b555841cab0ffbbe3caf19f216bae3 100644 --- a/pkgs/development/libraries/haskell/yesod-json/default.nix +++ b/pkgs/development/libraries/haskell/yesod-json/default.nix @@ -17,9 +17,6 @@ cabal.mkDerivation (self: { description = "Generate content for Yesod using the aeson package"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/yesod-persistent/default.nix b/pkgs/development/libraries/haskell/yesod-persistent/default.nix index bb4b686c4566a831344f37639f7b7f5d1d5a1bed..e69bc2a512753fbd6e8df7cd92ab489ee5895f8b 100644 --- a/pkgs/development/libraries/haskell/yesod-persistent/default.nix +++ b/pkgs/development/libraries/haskell/yesod-persistent/default.nix @@ -12,9 +12,6 @@ cabal.mkDerivation (self: { description = "Some helpers for using Persistent from Yesod"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/yesod-routes/default.nix b/pkgs/development/libraries/haskell/yesod-routes/default.nix index ee68874cbfcdef8f909000fac540d52e238c51db..0ebfeb92bf1091737581862596ed26f065865567 100644 --- a/pkgs/development/libraries/haskell/yesod-routes/default.nix +++ b/pkgs/development/libraries/haskell/yesod-routes/default.nix @@ -11,9 +11,6 @@ cabal.mkDerivation (self: { description = "Efficient routing for Yesod"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/yesod-static/default.nix b/pkgs/development/libraries/haskell/yesod-static/default.nix index ef919fc172101c8662f38a08469b5aab85647f55..ff514a9a599b6f9df31393aa36790f843b8e60d4 100644 --- a/pkgs/development/libraries/haskell/yesod-static/default.nix +++ b/pkgs/development/libraries/haskell/yesod-static/default.nix @@ -22,9 +22,6 @@ cabal.mkDerivation (self: { description = "Static file serving subsite for Yesod Web Framework"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/yesod-test/default.nix b/pkgs/development/libraries/haskell/yesod-test/default.nix index 27f700932eb5c6627e2254dec98c904632d02c72..8b32b48af8734cbcf5e366586226fad2a97676d8 100644 --- a/pkgs/development/libraries/haskell/yesod-test/default.nix +++ b/pkgs/development/libraries/haskell/yesod-test/default.nix @@ -20,6 +20,5 @@ cabal.mkDerivation (self: { description = "integration testing for WAI/Yesod Applications"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix index 09b0f9e2a16fa7d6a10a32a873f840a4e823107a..b118ce951b0e59407cf95ce62b5b239910884577 100644 --- a/pkgs/development/libraries/haskell/yesod/default.nix +++ b/pkgs/development/libraries/haskell/yesod/default.nix @@ -32,9 +32,6 @@ cabal.mkDerivation (self: { description = "Creation of type-safe, RESTful web applications"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/yst/default.nix b/pkgs/development/libraries/haskell/yst/default.nix index 157eaeaaa2c42b641cb8f52f8043bb1139e1c070..d194b1970c8db2f2b4c748ce2617772783d0a828 100644 --- a/pkgs/development/libraries/haskell/yst/default.nix +++ b/pkgs/development/libraries/haskell/yst/default.nix @@ -17,9 +17,6 @@ cabal.mkDerivation (self: { description = "Builds a static website from templates and data in YAML or CSV files"; license = "GPL"; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/zeromq-haskell/default.nix b/pkgs/development/libraries/haskell/zeromq-haskell/default.nix index 030cbe13b0a09ca6d0a00ee4ff85f45607b6fb16..20d414ac6b14fbdfd0325475790d1ca1ce226357 100644 --- a/pkgs/development/libraries/haskell/zeromq-haskell/default.nix +++ b/pkgs/development/libraries/haskell/zeromq-haskell/default.nix @@ -15,9 +15,6 @@ cabal.mkDerivation (self: { description = "Bindings to ZeroMQ 2.1.x"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix b/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix index 5d8a155ea721aa7718f899ea6b8fab35a62595a6..3b4f9f8ff3264d323b40a0861d65284a45bf6321 100644 --- a/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix +++ b/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix @@ -18,6 +18,5 @@ cabal.mkDerivation (self: { description = "Bindings to ZeroMQ 3.x"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/zip-archive/default.nix b/pkgs/development/libraries/haskell/zip-archive/default.nix index 53ebf3709d828a0e2456a9d3ff1173364f073f77..38290c8cd54415d2c70899ac4ba6fe6d8d463aa6 100644 --- a/pkgs/development/libraries/haskell/zip-archive/default.nix +++ b/pkgs/development/libraries/haskell/zip-archive/default.nix @@ -16,9 +16,6 @@ cabal.mkDerivation (self: { description = "Library for creating and modifying zip archives"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/zipper/default.nix b/pkgs/development/libraries/haskell/zipper/default.nix index 0995ec4d0c42473d67f992c71c640706ef4b87b7..5ff1da422efaf5166aba4c65cb52f94deaaa8dbf 100644 --- a/pkgs/development/libraries/haskell/zipper/default.nix +++ b/pkgs/development/libraries/haskell/zipper/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Generic zipper for families of recursive datatypes"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/zlib-bindings/default.nix b/pkgs/development/libraries/haskell/zlib-bindings/default.nix index 97d8291190822eb1be246cca1af44fe497ef8a26..f69be8ae99e2fc11c3a78e00584d055d6e8dc604 100644 --- a/pkgs/development/libraries/haskell/zlib-bindings/default.nix +++ b/pkgs/development/libraries/haskell/zlib-bindings/default.nix @@ -11,9 +11,6 @@ cabal.mkDerivation (self: { description = "Low-level bindings to the zlib package"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/zlib-conduit/default.nix b/pkgs/development/libraries/haskell/zlib-conduit/default.nix index bb67c04489cb10ada53581566c824fda708d8dd7..b283c496a2993801863872e137579a7feefba386 100644 --- a/pkgs/development/libraries/haskell/zlib-conduit/default.nix +++ b/pkgs/development/libraries/haskell/zlib-conduit/default.nix @@ -13,9 +13,6 @@ cabal.mkDerivation (self: { description = "Streaming compression/decompression via conduits"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/zlib-enum/default.nix b/pkgs/development/libraries/haskell/zlib-enum/default.nix index e6c118ff3e1fbdcd0cfa9f624e03b275d7c75709..f799194c0f695a4e781aee0dc73f0e6bb2b4d28b 100644 --- a/pkgs/development/libraries/haskell/zlib-enum/default.nix +++ b/pkgs/development/libraries/haskell/zlib-enum/default.nix @@ -12,9 +12,6 @@ cabal.mkDerivation (self: { description = "Enumerator interface for zlib compression"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/zlib/0.5.0.0.nix b/pkgs/development/libraries/haskell/zlib/0.5.0.0.nix index 60f81e7f9846b8d6a87226e06ae2676302873018..28f109e8c36436f267f28922a8f988e5c6d1da24 100644 --- a/pkgs/development/libraries/haskell/zlib/0.5.0.0.nix +++ b/pkgs/development/libraries/haskell/zlib/0.5.0.0.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Compression and decompression in the gzip and zlib formats"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/zlib/0.5.2.0.nix b/pkgs/development/libraries/haskell/zlib/0.5.2.0.nix index 5ec59a9690f3d3daa654f39cfce2008353e143ed..6a917af1fe7a9533e3e4f5c04a9f26400a115bf4 100644 --- a/pkgs/development/libraries/haskell/zlib/0.5.2.0.nix +++ b/pkgs/development/libraries/haskell/zlib/0.5.2.0.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Compression and decompression in the gzip and zlib formats"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/zlib/0.5.3.1.nix b/pkgs/development/libraries/haskell/zlib/0.5.3.1.nix index f4355c0a9549d9d828e112d0f1cf10ec9a8546b1..f13b9f7b1d48a84e450411aab3ff55c7b1ec65e5 100644 --- a/pkgs/development/libraries/haskell/zlib/0.5.3.1.nix +++ b/pkgs/development/libraries/haskell/zlib/0.5.3.1.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Compression and decompression in the gzip and zlib formats"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/zlib/0.5.3.3.nix b/pkgs/development/libraries/haskell/zlib/0.5.3.3.nix index 2835605529e09470932bd49999cde688e236654d..bba9e1a13fe4bf29e07d62dc139f154fb7012fbe 100644 --- a/pkgs/development/libraries/haskell/zlib/0.5.3.3.nix +++ b/pkgs/development/libraries/haskell/zlib/0.5.3.3.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Compression and decompression in the gzip and zlib formats"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/zlib/0.5.4.0.nix b/pkgs/development/libraries/haskell/zlib/0.5.4.0.nix index 4d1166db25011d3dc1df9753301fc76a94f6e0f6..abeed295e0355c10910fefe7ed8e73d4079cd2a9 100644 --- a/pkgs/development/libraries/haskell/zlib/0.5.4.0.nix +++ b/pkgs/development/libraries/haskell/zlib/0.5.4.0.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Compression and decompression in the gzip and zlib formats"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/zlib/0.5.4.1.nix b/pkgs/development/libraries/haskell/zlib/0.5.4.1.nix index 3f6c85f1cd6e321c0e95a4824060851a95ecb9a3..c1fa7d78d0a955a4374b0e10965e7f963f49f3ce 100644 --- a/pkgs/development/libraries/haskell/zlib/0.5.4.1.nix +++ b/pkgs/development/libraries/haskell/zlib/0.5.4.1.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Compression and decompression in the gzip and zlib formats"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/jansson/default.nix b/pkgs/development/libraries/jansson/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..a1f9983abe2cbddd5e49b89f35fef60bfadc0f7a --- /dev/null +++ b/pkgs/development/libraries/jansson/default.nix @@ -0,0 +1,16 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation rec { + name = "jansson-2.4"; + + src = fetchurl { + url = "http://www.digip.org/jansson/releases/${name}.tar.gz"; + sha256 = "1fcbd1ac3d8b610644acf86a5731d760bb228c9acbace20a2ad0f23baec79b41"; + }; + + meta = { + homepage = "http://www.digip.org/jansson/"; + description = "Jansson is a C library for encoding, decoding and manipulating JSON data."; + license = "MIT"; + }; +} diff --git a/pkgs/development/libraries/leveldb/default.nix b/pkgs/development/libraries/leveldb/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..12846dfbe8b5413835c56547d0892001b1ef5bb1 --- /dev/null +++ b/pkgs/development/libraries/leveldb/default.nix @@ -0,0 +1,27 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation rec { + name = "leveldb-1.9.0"; + + src = fetchurl { + url = "https://leveldb.googlecode.com/files/${name}.tar.gz"; + sha256 = "b2699b04e5aba8e98382c4955b94725d1f76bd0b5decd60c5628205b717a1d4f"; + }; + + buildPhase = "make all db_bench"; + + installPhase = " + mkdir -p $out/lib/ + cp libleveldb* $out/lib/ + mkdir -p $out/include/ + cp -r include $out/ + mkdir -p $out/bin/ + cp db_bench $out/lib/ + "; + + meta = { + homepage = "https://code.google.com/p/leveldb/"; + description = "A fast and lightweight key/value database library by Google."; + license = "BSD"; + }; +} diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix index 64d769fab75b26fd88be3a775a8124a94baa8f44..851601fe9639bcf1476d7c116546598ed13c5f61 100644 --- a/pkgs/development/libraries/libarchive/default.nix +++ b/pkgs/development/libraries/libarchive/default.nix @@ -9,11 +9,9 @@ stdenv.mkDerivation rec { sha256 = "76e8d7c7b100ec4071e48c1b7d3f3ea1d22b39db3e45b7189f75b5ff4df90fac"; }; - propagatedBuildInputs = [ libxml2 zlib bzip2 openssl xz ] ++ + buildInputs = [ sharutils libxml2 zlib bzip2 openssl xz ] ++ stdenv.lib.optionals stdenv.isLinux [ e2fsprogs attr acl ]; - buildInputs = [ sharutils ]; - meta = { description = "Multi-format archive and compression library"; longDescription = '' diff --git a/pkgs/development/libraries/libbluedevil/default.nix b/pkgs/development/libraries/libbluedevil/default.nix index 4b233437adbf90b149029ba0568226b960996073..8443ddaa6062a9acc30b7f572684900f5346b0db 100644 --- a/pkgs/development/libraries/libbluedevil/default.nix +++ b/pkgs/development/libraries/libbluedevil/default.nix @@ -1,12 +1,13 @@ -{ stdenv, fetchgit, cmake, qt4 }: +{ stdenv, fetchurl, cmake, qt4 }: stdenv.mkDerivation rec { - name = "libbluedevil-20110304"; + name = "${pname}-${version}"; + pname = "libbluedevil"; + version = "1.9.3"; - src = fetchgit { - url = git://anongit.kde.org/libbluedevil.git; - rev = "b44537b1784528cacc62ab1d570c1565bd326b4f"; - sha256 = "15rx44dncg7hm2x04yz53ni4l1fpb40c3bma3pbvr7l2yd89x3sa"; + src = fetchurl { + url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.bz2"; + sha256 = "0fdq083145mb3ynw14pc471ahp7is48wqpmswrvfz3hkyayriss3"; }; buildInputs = [ cmake qt4 ]; diff --git a/pkgs/development/libraries/libcanberra/default.nix b/pkgs/development/libraries/libcanberra/default.nix index b57ea63fde7594316f8106864f348b125e6aa588..6d56cd4463383c6457eeb784bebfa9b242bad43f 100644 --- a/pkgs/development/libraries/libcanberra/default.nix +++ b/pkgs/development/libraries/libcanberra/default.nix @@ -1,21 +1,25 @@ { stdenv, fetchurl, pkgconfig, libtool, gtk ? null -, alsaLib, pulseaudio, gstreamer, gst_plugins_base, libvorbis }: +, alsaLib, pulseaudio, gstreamer ? null, libvorbis, libcap }: stdenv.mkDerivation rec { - name = "libcanberra-0.30"; + name = "libcanberra-0.28"; src = fetchurl { - url = "http://0pointer.de/lennart/projects/libcanberra/${name}.tar.xz"; - sha256 = "0wps39h8rx2b00vyvkia5j40fkak3dpipp1kzilqla0cgvk73dn2"; + url = "http://0pointer.de/lennart/projects/libcanberra/${name}.tar.gz"; + sha256 = "1346d2y24wiyanyr5bvdnjjgq7iysy8nlq2dwjv0fzxdmcn8n7zb"; }; - buildInputs = # ToDo: gstreamer not found (why?), add (g)udev? - [ pkgconfig libtool alsaLib pulseaudio /*gstreamer gst_plugins_base*/ libvorbis gtk ]; + buildInputs = + [ pkgconfig libtool alsaLib pulseaudio gstreamer libvorbis libcap gtk ]; - configureFlags = "--disable-oss"; + configureFlags = "--disable-oss --disable-schemas-install"; + + passthru = { + gtkModule = "/lib/gtk-2.0/"; + }; meta = { - description = "An implementation of the XDG Sound Theme and Name Specifications"; + description = "libcanberra, an implementation of the XDG Sound Theme and Name Specifications"; longDescription = '' libcanberra is an implementation of the XDG Sound Theme and Name diff --git a/pkgs/development/libraries/libcroco/default.nix b/pkgs/development/libraries/libcroco/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..99604475e625cf19c7b07c84b32d0a9500567d33 --- /dev/null +++ b/pkgs/development/libraries/libcroco/default.nix @@ -0,0 +1,11 @@ +{stdenv, fetchurl, pkgconfig, libxml2, glib}: + +stdenv.mkDerivation { + name = "libcroco-0.6.4"; + + src = fetchurl { + url = mirror://gnome/sources/libcroco/0.6/libcroco-0.6.4.tar.xz; + sha256 = "1sij88na1skd4d5dx75l803fww3v9872q8m2hj6sjlkc839vl5n8"; + }; + buildInputs = [ pkgconfig libxml2 glib ]; +} diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index 4e0038d4c34cdd115ead41b4da4e5b5253c87c5c..a2546bf2d69af850c2d3aac514fbdd31e22c366f 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, udev }: stdenv.mkDerivation rec { - name = "libdrm-2.4.42"; - + name = "libdrm-2.4.33"; + src = fetchurl { url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2"; - sha256 = "1qbnpi64hyqzd650hj6jki1d50pzypdhj3rw9m3whwbqly110rz0"; + sha256 = "1slgi61n4dlsfli47ql354fd1ppj7n40jd94wvnsdqx0mna9syrd"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libftdi/default.nix b/pkgs/development/libraries/libftdi/default.nix index 6805434dcecf7007a2495f596b805fe4c624ed10..ef7a67b7fcd427e9645a7d69a0f1244eaa9c7cda 100644 --- a/pkgs/development/libraries/libftdi/default.nix +++ b/pkgs/development/libraries/libftdi/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, libusb}: stdenv.mkDerivation rec { - name = "libftdi-0.17"; + name = "libftdi-0.20"; src = fetchurl { url = "http://www.intra2net.com/en/developer/libftdi/download/${name}.tar.gz"; - sha256 = "1w5bzq4h4v9qah9dx0wbz6w7ircr91ack0sh6wqs8s5b4m8jgh6m"; + sha256 = "13l39f6k6gff30hsgh0wa2z422g9pyl91rh8a8zz6f34k2sxaxii"; }; buildInputs = [ libusb ]; diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index c262535a1f7d2e75a7f6c4f9bccf1bff13908b63..d705bd80bdc2b69b0b9f18b75959e99c7ec1ce63 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, libgpgerror }: stdenv.mkDerivation rec { - name = "libgcrypt-1.5.2"; + name = "libgcrypt-1.5.0"; src = fetchurl { url = "mirror://gnupg/libgcrypt/${name}.tar.bz2"; - sha256 = "0gwnzqd64cpwdmk93nll54nidsr74jpimxzj4p4z7502ylwl66p4"; + sha256 = "1ykkh7dm0gyndz7bbpvn3agijj8xb2h02m02f42hm504c18zqqjb"; }; propagatedBuildInputs = [ libgpgerror ]; diff --git a/pkgs/development/libraries/libgnome-keyring/3.x.nix b/pkgs/development/libraries/libgnome-keyring/3.x.nix new file mode 100644 index 0000000000000000000000000000000000000000..54a023a16f8b9ab698b95ee18f1a11033e55e664 --- /dev/null +++ b/pkgs/development/libraries/libgnome-keyring/3.x.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl, glib, dbus_libs, libgcrypt, pkgconfig, +intltool }: + +stdenv.mkDerivation { + name = "libgnome-keyring-3.2.2"; + + src = fetchurl { + url = mirror://gnome/sources/libgnome-keyring/3.2/libgnome-keyring-3.2.2.tar.xz; + sha256 = "1cxd2vb1lzm8smq1q45dsn13s6kdqdb60lashdk7hwv035xy9jrb"; + }; + + propagatedBuildInputs = [ glib dbus_libs libgcrypt ]; + nativeBuildInputs = [ pkgconfig intltool ]; + + meta = { + inherit (glib.meta) platforms maintainers; + }; +} diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix index eb0de7aa2bed07dcc5806cac5404789c5c05652f..f7052b90b42ca7884688aee0dc1ea84aaa92809f 100644 --- a/pkgs/development/libraries/libgpg-error/default.nix +++ b/pkgs/development/libraries/libgpg-error/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, bash }: stdenv.mkDerivation (rec { - name = "libgpg-error-1.11"; + name = "libgpg-error-1.10"; src = fetchurl { url = "mirror://gnupg/libgpg-error/${name}.tar.bz2"; - sha256 = "1h0ql8j65ns2rmhj9wnc9035026crzkg226xg8614fq71947ccxf"; + sha256 = "0cal3jdnzdailr13qcy74grfbplbghkgr3qwk6qjjp4bass2j1jj"; }; doCheck = true; diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix index 35576baeb3282fafc03a3fe0da0980645011bff5..56f6242c09e8255129e67991df7ba87f9f1123f1 100644 --- a/pkgs/development/libraries/libgsf/default.nix +++ b/pkgs/development/libraries/libgsf/default.nix @@ -1,21 +1,26 @@ -{ fetchurl, stdenv, pkgconfig, intltool, gettext, glib, libxml2, zlib, bzip2 -, python, libiconvOrEmpty -}: +{ fetchurl, stdenv, perl, perlXMLParser, pkgconfig, libxml2 +, gettext, intltool, bzip2, glib, python +, gnomeSupport ? true, gdk_pixbuf ? null +, gnome_vfs ? null, libbonobo ? null }: -with { inherit (stdenv.lib) optionals; }; +assert gnomeSupport -> gdk_pixbuf != null && gnome_vfs != null && libbonobo != null + && glib != null; stdenv.mkDerivation rec { name = "libgsf-1.14.25"; src = fetchurl { url = "mirror://gnome/sources/libgsf/1.14/${name}.tar.xz"; - sha256 = "18ni8hwi3q83vs3m6mg6xwd4g7jvss4kz70kzf21k587gvq4hx8j"; + sha256 = "127548f07e07951984fb139c3f89d65b9e471aefe6555387de03e1113944d1a2"; }; - nativeBuildInputs = [ pkgconfig intltool ]; - buildInputs = [ gettext bzip2 zlib python ]; + nativeBuildInputs = [ intltool pkgconfig ]; + buildInputs = + [ perl perlXMLParser gettext bzip2 python ] + ++ stdenv.lib.optionals gnomeSupport [ gnome_vfs gdk_pixbuf ]; - propagatedBuildInputs = [ libxml2 glib ] ++ libiconvOrEmpty; + propagatedBuildInputs = [ libxml2 glib ] + ++ stdenv.lib.optionals gnomeSupport [ libbonobo ]; doCheck = true; diff --git a/pkgs/development/libraries/libgweather/default.nix b/pkgs/development/libraries/libgweather/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..5e7a4cff741f7526970b5414962f0c4fdf6cab88 --- /dev/null +++ b/pkgs/development/libraries/libgweather/default.nix @@ -0,0 +1,13 @@ +{ stdenv, fetchurl, pkgconfig, libxml2, gtk3, intltool, libsoup, GConf3 }: + +stdenv.mkDerivation { + name = "libgweather-3.4.1"; + + src = fetchurl { + url = mirror://gnome/sources/libgweather/3.4/libgweather-3.4.1.tar.xz; + sha256 = "0q0vkggrbvy2ihwcsfynlv5qk9l3wjinls8yvmkb1qisyc4lv77f"; + }; + configureFlags = if stdenv ? glibc then "--with-zoneinfo-dir=${stdenv.glibc}/share/zoneinfo" else ""; + propagatedBuildInputs = [ libxml2 gtk3 libsoup GConf3 ]; + nativeBuildInputs = [ pkgconfig intltool ]; +} diff --git a/pkgs/development/libraries/libmtp/default.nix b/pkgs/development/libraries/libmtp/default.nix index 95d060df7f7d43022674bdd0fa8be5d811c618f7..ced11c0ef4da79581b387089cd4154539e5e8080 100644 --- a/pkgs/development/libraries/libmtp/default.nix +++ b/pkgs/development/libraries/libmtp/default.nix @@ -1,17 +1,13 @@ -{ stdenv, fetchurl, pkgconfig, libusb1 }: +{ stdenv, fetchurl, libusb }: stdenv.mkDerivation rec { - name = "libmtp-1.1.5"; + name = "libmtp-1.0.1"; - propagatedBuildInputs = [ libusb1 ]; - buildInputs = [ pkgconfig ]; - - # tried to install files to /lib/udev, hopefully OK - configureFlags = [ "--with-udev=$$out/lib/udev" ]; + propagatedBuildInputs = [ libusb ]; src = fetchurl { url = "mirror://sourceforge/libmtp/${name}.tar.gz"; - sha256 = "0fn6y7kirgln6sfizmwvjsy7qkdb0p3rccf0zkr3r2xg3cbpjxkq"; + sha256 = "19iha1yi07cdqzlba4ng1mn7h701binalwwkb71q0ld9b88mad6s"; }; meta = { diff --git a/pkgs/development/libraries/libp11/default.nix b/pkgs/development/libraries/libp11/default.nix index acfca9bf88854bee1d4bdad3d4bed70a760ddbad..4f1bd7de3d957b4858e6a6b46f75da3dbcfe458f 100644 --- a/pkgs/development/libraries/libp11/default.nix +++ b/pkgs/development/libraries/libp11/default.nix @@ -4,7 +4,10 @@ stdenv.mkDerivation rec { name = "libp11-0.2.7"; src = fetchurl { - url = "http://www.opensc-project.org/files/libp11/${name}.tar.gz"; + urls = [ + "http://www.opensc-project.org/files/libp11/${name}.tar.gz" + "http://www.openadk.org/distfiles/${name}.tar.gz" + ]; sha256 = "0kaz5qafaxm0ycywmajl166c29fh9cz89b8i043jqsbxlpzf4hdp"; }; diff --git a/pkgs/development/libraries/libpaper/default.nix b/pkgs/development/libraries/libpaper/default.nix deleted file mode 100644 index 9505a6cf052fd2945d29a4c5b505eef92c77acce..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/libpaper/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ stdenv, fetchurl }: - -stdenv.mkDerivation rec { - version = "1.1.24"; - name = "libpaper-${version}"; - - src = fetchurl { - url = "mirror://debian/pool/main/libp/libpaper/libpaper_${version}.tar.gz"; - sha256 = "0zhcx67afb6b5r936w5jmaydj3ks8zh83n9rm5sv3m3k8q8jib1q"; - }; - - meta = { - description = "Library for handling paper characteristics"; - homepage = "http://packages.debian.org/unstable/source/libpaper"; - license = "GPLv2"; - }; -} diff --git a/pkgs/development/libraries/libpng/15.nix b/pkgs/development/libraries/libpng/15.nix deleted file mode 100644 index 8f62ef1e8dc971c1d7555144aa245ffef6138e48..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/libpng/15.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, zlib }: - -assert zlib != null; - -stdenv.mkDerivation rec { - name = "libpng-1.5.15"; - - src = fetchurl { - url = "mirror://sourceforge/libpng/${name}.tar.xz"; - sha256 = "1iaplghmv5qhd4dgwfymhp42sh27vz6s2107jk698xm57z2v9hwm"; - }; - - propagatedBuildInputs = [ zlib ]; - - doCheck = true; - - passthru = { inherit zlib; }; - - meta = { - description = "The official reference implementation for the PNG file format"; - homepage = http://www.libpng.org/pub/png/libpng.html; - license = "free-non-copyleft"; # http://www.libpng.org/pub/png/src/libpng-LICENSE.txt - }; -} diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix index 72821ef7028ffd5378ab16f6d6326c0f99fcb56e..ce23cf48587a875fbb565fbfc786ee8dee7582cb 100644 --- a/pkgs/development/libraries/libpng/default.nix +++ b/pkgs/development/libraries/libpng/default.nix @@ -3,17 +3,15 @@ assert zlib != null; stdenv.mkDerivation rec { - name = "libpng-1.6.2"; + name = "libpng-1.5.13"; src = fetchurl { url = "mirror://sourceforge/libpng/${name}.tar.xz"; - sha256 = "1pljkqjqgyz8c32w8fipd9f0v2gcyhah2ypp0h7ya1r1q85sk5qw"; + sha256 = "1vks4mqv4140b10kp53qrywsx9m4xan5ibwsrlmf42ni075zjhxq"; }; propagatedBuildInputs = [ zlib ]; - doCheck = true; - passthru = { inherit zlib; }; meta = { diff --git a/pkgs/development/libraries/libpng/libpng-apng.nix b/pkgs/development/libraries/libpng/libpng-apng.nix index bc6a773dba3b9f22d91d8c0dbec64fd4b64de060..534b0ae5a45fe5278bff470a4a482582ab111376 100644 --- a/pkgs/development/libraries/libpng/libpng-apng.nix +++ b/pkgs/development/libraries/libpng/libpng-apng.nix @@ -1,27 +1,29 @@ { stdenv, fetchurl, zlib }: +assert zlib != null; + stdenv.mkDerivation rec { - version = "1.5.14"; + version = "1.4.4"; name = "libpng-apng-${version}"; - + patch_src = fetchurl { - url = "mirror://sourceforge/libpng-apng/libpng15/${version}/libpng-${version}-apng.patch.gz"; - sha256 = "1vcqbkdssy4srm8jqyzaipdc70xzanilqssypmwqyngp8ph0m45p"; + url = "mirror://sourceforge/project/libpng-apng/libpng-master/${version}/libpng-${version}-apng.patch.gz"; + sha256 = "d729a2feacfd80547e06c30343d598302f4417cf2e6f649e4ee617690987bd24"; }; src = fetchurl { - url = "mirror://sourceforge/libpng/libpng-${version}.tar.xz"; - sha256 = "0m3vz3gig7s63zanq5b1dgb5ph12qm0cylw4g4fbxlsq3f74hn8l"; + url = "mirror://sourceforge/libpng/libpng-${version}.tar.gz"; + sha256 = "d07616ba1e9c161017384feb3b576d70c160b970abfd9549ad39a622284b574a"; }; preConfigure = '' gunzip < ${patch_src} | patch -Np1 ''; - + propagatedBuildInputs = [ zlib ]; passthru = { inherit zlib; }; - + meta = { description = "The official reference implementation for the PNG file format with animation patch"; homepage = http://www.libpng.org/pub/png/libpng.html; diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 13385dfb65c02f846f9587dac75fd6e8e6eb6817..0da3020387698025187b33167a99b7d9650b2010 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -1,24 +1,16 @@ -{ stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, pango, cairo -, libxml2, libgsf, bzip2, libcroco -, gtk2 ? null, gtk3 ? null -, gobjectIntrospection ? null, enableIntrospection ? false }: +{stdenv, fetchurl, pkgconfig, libxml2, libgsf, bzip2, glib, gtk, libcroco}: -# no introspection by default, it's too big - -stdenv.mkDerivation rec { - name = "librsvg-2.36.4"; +stdenv.mkDerivation { + name = "librsvg-2.34.2"; src = fetchurl { - url = "mirror://gnome/sources/librsvg/2.36/${name}.tar.xz"; - sha256 = "1hp6325gdkzx8yqn2d2r915ak3k6hfshjjh0sc54z3vr0i99688h"; + url = mirror://gnome/sources/librsvg/2.34/librsvg-2.34.2.tar.xz; + sha256 = "0r24xr10chmz4l3ka2zy9c2245s7svzljbw9nrda3h44bcr03rsx"; }; - buildInputs = [ libxml2 libgsf bzip2 libcroco pango cairo ] - ++ stdenv.lib.optional enableIntrospection [ gobjectIntrospection ]; - propagatedBuildInputs = [ glib gdk_pixbuf gtk2 gtk3 ]; + buildInputs = [ libxml2 libgsf bzip2 libcroco ]; + propagatedBuildInputs = [ glib gtk ]; nativeBuildInputs = [ pkgconfig ]; - configureFlags = ["--enable-introspection=auto"]; - # It wants to add loaders and update the loaders.cache in gdk-pixbuf # Patching the Makefiles to it creates rsvg specific loaders and the # relevant loader.cache here. diff --git a/pkgs/development/libraries/libssh2/default.nix b/pkgs/development/libraries/libssh2/default.nix index a0723d9567178c417147ac6b00ea5ee7495af6a0..93377429e7ea3a654bd851844044cb6b6f34590f 100644 --- a/pkgs/development/libraries/libssh2/default.nix +++ b/pkgs/development/libraries/libssh2/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurlBoot, openssl, zlib}: stdenv.mkDerivation rec { - name = "libssh2-1.2.6"; + name = "libssh2-1.4.3"; src = fetchurlBoot { url = "${meta.homepage}/download/${name}.tar.gz"; - sha256 = "00f6hw972v7jd0rrdr6kx5cn7pa1spyx8xgc7vhjydksgsig3f8b"; + sha256 = "eac6f85f9df9db2e6386906a6227eb2cd7b3245739561cad7d6dc1d5d021b96d"; }; buildInputs = [ openssl zlib ]; diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index e073717de5680f303bd2a63a23eae0caed146e18..ba5966d13d4b21063b57b070382730b003ee24b5 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, zlib, libjpeg }: -let version = "4.0.3"; in +let version = "3.9.7"; in stdenv.mkDerivation rec { name = "libtiff-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { [ "ftp://ftp.remotesensing.org/pub/libtiff/tiff-${version}.tar.gz" "http://download.osgeo.org/libtiff/tiff-${version}.tar.gz" ]; - sha256 = "0wj8d1iwk9vnpax2h29xqc2hwknxg3s0ay2d5pxkg59ihbifn6pa"; + sha256 = "0spg1hr5rsrmg88sfzb05qnf0haspq7r5hvdkxg5zib1rva4vmpm"; }; propagatedBuildInputs = [ zlib libjpeg ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Library and utilities for working with the TIFF image file format"; - homepage = http://www.remotesensing.org/libtiff/; + homepage = http://www.libtiff.org/; license = "bsd"; }; } diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix index 811909c659d2a17f1f3b3d63fc0a12edd3283729..8a1580d4fbe80d8fe41c415f2528486aac78fc54 100644 --- a/pkgs/development/libraries/libusb1/default.nix +++ b/pkgs/development/libraries/libusb1/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "libusb-1.0.9"; @@ -8,8 +8,6 @@ stdenv.mkDerivation rec { sha256 = "16sz34ix6hw2wwl3kqx6rf26fg210iryr68wc439dc065pffw879"; }; - buildInputs = [ pkgconfig ]; - meta = { homepage = http://www.libusb.org; description = "User-space USB library"; diff --git a/pkgs/development/libraries/libvdpau/default.nix b/pkgs/development/libraries/libvdpau/default.nix index 158106247055407686c42d0cbc477067897f226e..92ab8d67c91ea1c2ffcf74d7512475c6442b09c1 100644 --- a/pkgs/development/libraries/libvdpau/default.nix +++ b/pkgs/development/libraries/libvdpau/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurl, pkgconfig, xlibs }: +{ stdenv, fetchurl, pkgconfig, libX11 }: stdenv.mkDerivation rec { - name = "libvdpau-0.6"; - + name = "libvdpau-0.5"; + src = fetchurl { url = "http://people.freedesktop.org/~aplattner/vdpau/${name}.tar.gz"; - sha256 = "0x9dwxzw0ilsy88kqlih3170z1zfrrsx1dr9jbwbn0cbkpnbwmcv"; + sha256 = "0k2ydz4yp7zynlkpd1llfwax30xndwbca36z83ah1i4ldjw2gfhx"; }; - buildInputs = with xlibs; [ pkgconfig dri2proto libXext ]; + buildInputs = [ pkgconfig libX11 ]; - propagatedBuildInputs = [ xlibs.libX11 ]; + propagatedBuildInputs = [ libX11 ]; meta = { homepage = http://people.freedesktop.org/~aplattner/vdpau/; diff --git a/pkgs/development/libraries/libxkbcommon/default.nix b/pkgs/development/libraries/libxkbcommon/default.nix deleted file mode 100644 index 4a1327778d4720720c87587807f473edc2996622..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/libxkbcommon/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, yacc, flex, xkeyboard_config }: - -stdenv.mkDerivation rec { - name = "libxkbcommon-0.2.0"; - - src = fetchurl { - url = "http://xkbcommon.org/download/${name}.tar.bz2"; - sha256 = "0hpvfa8p4bhvhc1gcb578m354p5idd192xb8zlaq16d33h90msvl"; - }; - - buildInputs = [ yacc flex xkeyboard_config ]; - - configureFlags = '' - --with-xkb-config-root=${xkeyboard_config}/etc/X11/xkb - ''; - - meta = { - description = "A library to handle keyboard descriptions"; - homepage = http://xkbcommon.org; - }; -} diff --git a/pkgs/development/libraries/libxtc_dxtn/default.nix b/pkgs/development/libraries/libxtc_dxtn/default.nix index a23d74a2be865f30f2120e37cd8b4f5130466d3c..0e7442633d77f95d5dbed669cd43af46da660c4f 100644 --- a/pkgs/development/libraries/libxtc_dxtn/default.nix +++ b/pkgs/development/libraries/libxtc_dxtn/default.nix @@ -8,5 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0q5fjaknl7s0z206dd8nzk9bdh8g4p23bz7784zrllnarl90saa5"; }; - NIX_CFLAGS_COMPILE = "-I ${mesa}/include"; + postUnpack = '' + tar xf ${mesa.src} --wildcards '*/include/' + export NIX_CFLAGS_COMPILE="-I $NIX_BUILD_TOP/[mM]esa*/include" + ''; } diff --git a/pkgs/development/libraries/mesa-glu/default.nix b/pkgs/development/libraries/mesa-glu/default.nix deleted file mode 100644 index 502329226ff3f78847ffd6e81bfcf2a575f616ef..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/mesa-glu/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, mesa_noglu }: - -stdenv.mkDerivation rec { - name = "glu-9.0.0"; - - src = fetchurl { - url = "ftp://ftp.freedesktop.org/pub/mesa/glu/${name}.tar.bz2"; - sha256 = "04nzlil3a6fifcmb95iix3yl8mbxdl66b99s62yzq8m7g79x0yhz"; - }; - - buildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ mesa_noglu ]; - - meta = { - description = "OpenGL utility library"; - homepage = http://cgit.freedesktop.org/mesa/glu/; - license = "bsd"; # SGI-B-2.0, which seems BSD-like - }; -} diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index a07323b61b2e4a6345cb1b15489b6af0ede072e9..d3f7afbd3084d296d41fb2839ba350a64c3519a6 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -1,48 +1,41 @@ -{ stdenv, fetchurl, flex, bison, pkgconfig, intltool, libdrm, file, expat, makedepend +{ stdenv, fetchurl, flex, bison, pkgconfig, libdrm, file, expat, makedepend , libXxf86vm, libXfixes, libXdamage, glproto, dri2proto, libX11, libxcb, libXext -, libXt, udev, enableTextureFloats ? false, enableR600LlvmCompiler ? false -, python, libxml2Python, autoconf, automake, libtool, llvm, writeText -, libffi, wayland }: +, libXt, udev, enableTextureFloats ? false +, python, libxml2Python }: if ! stdenv.lib.lists.elem stdenv.system stdenv.lib.platforms.mesaPlatforms then throw "unsupported platform for Mesa" else -let - version = "9.1.2"; -in +let version = "8.0.4"; in + stdenv.mkDerivation { - name = "mesa-noglu-${version}"; + name = "mesa-${version}"; src = fetchurl { url = "ftp://ftp.freedesktop.org/pub/mesa/${version}/MesaLib-${version}.tar.bz2"; - sha256="1ns366armqmp2bxj1l7fff95v22b5z9mnkyykbdj81lhg9gi3586"; + md5 = "d546f988adfdf986cff45b1efa2d8a46"; }; - prePatch = "patchShebangs ."; + patches = + stdenv.lib.optional (stdenv.system == "mips64el-linux") ./mips_wmb.patch; - preConfigure = "./autogen.sh"; + prePatch = "patchShebangs ."; configureFlags = - "" - + " --enable-gles1 --enable-gles2 --enable-gallium-egl" - + " --with-gallium-drivers=i915,nouveau,r300,r600,svga,swrast" - + " --with-egl-platforms=x11,wayland,drm --enable-gbm --enable-shared-glapi" - + stdenv.lib.optionalString enableR600LlvmCompiler " --enable-r600-llvm-compiler" + " --enable-gles1 --enable-gles2 --enable-gallium-egl" + + " --with-gallium-drivers=i915,nouveau,r600,svga,swrast" # Texture floats are patented, see docs/patents.txt + stdenv.lib.optionalString enableTextureFloats " --enable-texture-float"; - buildInputs = [ - autoconf automake libtool intltool expat libxml2Python udev llvm - libdrm libXxf86vm libXfixes libXdamage glproto dri2proto libX11 libXext libxcb libXt - libffi wayland - ]; + buildInputs = [ expat libdrm libXxf86vm libXfixes libXdamage glproto dri2proto + libxml2Python libX11 libXext libxcb libXt udev ]; nativeBuildInputs = [ pkgconfig python makedepend file flex bison ]; enableParallelBuilding = true; - passthru = { inherit libdrm; inherit version; }; + passthru = { inherit libdrm; }; meta = { description = "An open source implementation of OpenGL"; diff --git a/pkgs/development/libraries/mesa/mips_wmb.patch b/pkgs/development/libraries/mesa/mips_wmb.patch new file mode 100644 index 0000000000000000000000000000000000000000..1ffa1bdd8df481dc3d926a6344f7cfa5a25f1475 --- /dev/null +++ b/pkgs/development/libraries/mesa/mips_wmb.patch @@ -0,0 +1,16 @@ +rixed told me (viric) it's the patch to apply for mesa. +I adapted his patch for mesa 7.5 to this 7.10 + +diff --git a/src/mesa/drivers/dri/sis/sis_context.h b/src/mesa/drivers/dri/sis/sis_context.h +index a82a659..d8d8d9a 100644 +--- a/src/mesa/drivers/dri/sis/sis_context.h ++++ b/src/mesa/drivers/dri/sis/sis_context.h +@@ -404,6 +404,8 @@ struct sis_context + #define MMIO_WMB() __asm __volatile("" : : : "memory") + #elif defined(__ia64__) + #define MMIO_WMB() __asm __volatile("mf" : : : "memory") ++#elif defined(__mips__) ++#define MMIO_WMB() __asm __volatile("" : : : "memory") + #else + #error platform needs WMB + #endif diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix index 291ca560c03d17272378a5b7d5f2d49c707a40b3..a7e514a5780fb599babe025f36dfe8e6b078d41c 100644 --- a/pkgs/development/libraries/opencv/default.nix +++ b/pkgs/development/libraries/opencv/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, cmake, gtk, libjpeg, libpng, libtiff, jasper, ffmpeg , pkgconfig, gstreamer, xineLib, glib, python27, python27Packages }: -let v = "2.4.3"; in +let v = "2.4.5"; in stdenv.mkDerivation rec { name = "opencv-${v}"; src = fetchurl { - url = "mirror://sourceforge/opencvlibrary/OpenCV-${v}.tar.bz2"; - sha256 = "16zmyr383x9ka81mp6h2s9hlfzd383njddf3x1rswkldjy2ykyzq"; + url = "mirror://sourceforge/opencvlibrary/opencv-${v}.tar.gz"; + sha256 = "14k2w07jcchp11c9v6p5x49h3h1zmg2m9brm2sypz5sp9g7yw2yk"; }; buildInputs = [ gtk glib libjpeg libpng libtiff jasper ffmpeg xineLib gstreamer diff --git a/pkgs/development/libraries/openjpeg/default.nix b/pkgs/development/libraries/openjpeg/default.nix index 7fd18af450c3e7f08111374e17742dacea4e6fd4..6024456652c6794ff85c38f458d0c852db5fe7cf 100644 --- a/pkgs/development/libraries/openjpeg/default.nix +++ b/pkgs/development/libraries/openjpeg/default.nix @@ -1,21 +1,13 @@ -{ stdenv, fetchurl, pkgconfig, libpng, libtiff, lcms2, glib/*passthru only*/ }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "openjpeg-1.5.1"; - passthru = { - incDir = "openjpeg-1.5"; - }; src = fetchurl { url = "http://openjpeg.googlecode.com/files/${name}.tar.gz"; sha256 = "13dbyf3jwr4h2dn1k11zph3jgx17z7d66xmi640mbsf8l6bk1yvc"; }; - nativebuildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ libpng libtiff lcms2 ]; # in closure anyway - - postInstall = glib.flattenInclude; - meta = { homepage = http://www.openjpeg.org/; description = "Open-source JPEG 2000 codec written in C language"; diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/1.30.x.nix similarity index 77% rename from pkgs/development/libraries/pango/default.nix rename to pkgs/development/libraries/pango/1.30.x.nix index 418a2acb0b771dc863e8a8a3f93dbe32968da77b..c32891b95cfd2d98b90394ec91407fe373f152ae 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/1.30.x.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchurl, pkgconfig, gettext, x11, glib, cairo, libpng, harfbuzz, fontconfig }: +{ stdenv, fetchurl, pkgconfig, gettext, x11, glib, cairo, libpng, fontconfig }: stdenv.mkDerivation rec { - name = "pango-1.32.5"; #.6 needs a not-yet-stable fontconfig + name = "pango-1.30.1"; src = fetchurl { - url = "mirror://gnome/sources/pango/1.32/${name}.tar.xz"; - sha256 = "08aqis6j8nd1lb4f2h4h9d9kjvp54iwf8zvqzss0qn4v7nfcjyvx"; + url = "mirror://gnome/sources/pango/1.30/${name}.tar.xz"; + sha256 = "3a8c061e143c272ddcd5467b3567e970cfbb64d1d1600a8f8e62435556220cbe"; }; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ gettext fontconfig ]; nativeBuildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ x11 glib cairo libpng harfbuzz ]; + propagatedBuildInputs = [ x11 glib cairo libpng ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/pangox-compat/default.nix b/pkgs/development/libraries/pangox-compat/default.nix deleted file mode 100644 index 8518083b4d3592e6e8c0556a45d5ec79719d83b3..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/pangox-compat/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, pango, libX11 }: - -stdenv.mkDerivation rec { - name = "pangox-compat-0.0.2"; - - src = fetchurl { - url = "mirror://gnome/sources/pangox-compat/0.0/${name}.tar.xz"; - sha256 = "0ip0ziys6mrqqmz4n71ays0kf5cs1xflj1gfpvs4fgy2nsrr482m"; - }; - - buildInputs = [ pkgconfig glib pango libX11 ]; - - meta = { - description = "A compatibility library for pango>1.30.*"; - - homepage = http://www.pango.org/; - license = "LGPLv2+"; - }; -} diff --git a/pkgs/development/libraries/pcl/default.nix b/pkgs/development/libraries/pcl/default.nix index 183170bd85aa48a122bb9b984b4a9e50378d0697..1a3484c2ee5e19f9464f88a8130ced960babb290 100644 --- a/pkgs/development/libraries/pcl/default.nix +++ b/pkgs/development/libraries/pcl/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; meta = { - homeapge = http://pointclouds.org/; + homepage = http://pointclouds.org/; description = "Open project for 2D/3D image and point cloud processing"; license = "BSD"; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/development/libraries/php-xcache/default.nix b/pkgs/development/libraries/php-xcache/default.nix index b1d1bde358a88d799c2ed6f72d2caae8bc2c0510..5f175aa72ff1228395b3398bdd031d8916be6447 100644 --- a/pkgs/development/libraries/php-xcache/default.nix +++ b/pkgs/development/libraries/php-xcache/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, php, autoconf, automake, libtool, m4 }: stdenv.mkDerivation rec { - name = "php-xcache-1.3.1"; + name = "php-xcache-3.0.1"; src = fetchurl { - url = http://xcache.lighttpd.net/pub/Releases/1.3.1/xcache-1.3.1.tar.bz2; - sha256 = "16qj6hns7frs655k2vg9dabnk28085hf6qxhr9dybw6ja5aj24g3"; + url = http://xcache.lighttpd.net/pub/Releases/3.0.1/xcache-3.0.1.tar.bz2; + md5 = "45086010bc4f82f506c08be1c556941b"; }; preConfigure = '' diff --git a/pkgs/development/libraries/pixman/default.nix b/pkgs/development/libraries/pixman/default.nix deleted file mode 100644 index 7fbcedda39564e393946477737a9b19a180523ca..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/pixman/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, perl, withPNG ? true, libpng, glib /*just passthru*/ }: - -stdenv.mkDerivation rec { - name = "pixman-0.28.2"; - - src = fetchurl { - url = "http://cairographics.org/releases/${name}.tar.gz"; - sha256 = "0mcvxd5gx3w1wzgph91l2vaiic91jmx7s01hi2igphyvd80ckyia"; - }; - - nativeBuildInputs = [ pkgconfig perl ]; - - buildInputs = stdenv.lib.optional withPNG [ libpng ]; # NOT in closure anyway - - postInstall = glib.flattenInclude; - - meta = { - homepage = http://pixman.org; - description = "A low-level library for pixel manipulation"; - license = "MIT"; - }; -} diff --git a/pkgs/development/libraries/pkcs11helper/default.nix b/pkgs/development/libraries/pkcs11helper/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..5443df89704d5701b17e7d226bb4326e7c25f19d --- /dev/null +++ b/pkgs/development/libraries/pkcs11helper/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, pkgconfig, openssl, autoconf, automake, libtool }: + +let + rev = "5d412bad60"; +in +stdenv.mkDerivation rec { + name = "pkcs11-helper-20121123-${rev}"; + + src = fetchurl { + url = "https://github.com/alonbl/pkcs11-helper/tarball/${rev}"; + name = "${name}.tar.gz"; + sha256 = "1mih6mha39yr5s5m18lg4854qc105asgnwmjw7f95kgmzni62kxp"; + }; + + preConfigure = "autoreconf -vfi"; + + buildInputs = [ pkgconfig openssl autoconf automake libtool ]; + + meta = { + homepage = https://www.opensc-project.org/opensc/wiki/pkcs11-helper; + license = [ "BSD" "GPLv2" ]; + description = "Library that simplifies the interaction with PKCS#11 providers"; + }; +} diff --git a/pkgs/development/libraries/poppler/0.18.nix b/pkgs/development/libraries/poppler/0.18.nix deleted file mode 100644 index 3297b0a19e64a2a5067199043137016f762d3cc7..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/poppler/0.18.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ fetchurl, stdenv, cairo, freetype, fontconfig, zlib -, libjpeg, curl, libpthreadstubs, xorg, openjpeg -, libxml2, pkgconfig, cmake, lcms2 -, glibSupport ? false, glib, gtk3Support ? false, gtk3 # gtk2 no longer accepted -, qt4Support ? false, qt4 ? null -}: - -stdenv.mkDerivation rec { - name = "poppler-0.18.4"; - - src = fetchurl { - url = "${meta.homepage}${name}.tar.gz"; - sha256 = "0bnl05al7mjndp2h0355946j59nfw76f5v0x57d47q68rm412hik"; - }; - - propagatedBuildInputs = with xorg; - [ zlib cairo freetype fontconfig libjpeg lcms2 curl - libpthreadstubs libxml2 stdenv.gcc.libc - libXau libXdmcp libxcb libXrender libXext - openjpeg - ] - ++ stdenv.lib.optional glibSupport glib - ++ stdenv.lib.optional gtk3Support gtk3 - ++ stdenv.lib.optional qt4Support qt4; - - nativeBuildInputs = [ pkgconfig cmake ]; - - cmakeFlags = "-DENABLE_XPDF_HEADERS=ON -DENABLE_LIBCURL=ON -DENABLE_ZLIB=ON"; - - patches = [ ./datadir_env.patch ]; - - # XXX: The Poppler/Qt4 test suite refers to non-existent PDF files - # such as `../../../test/unittestcases/UseNone.pdf'. - #doCheck = !qt4Support; - checkTarget = "test"; - - enableParallelBuilding = true; - - meta = { - homepage = http://poppler.freedesktop.org/; - description = "Poppler, a PDF rendering library"; - - longDescription = '' - Poppler is a PDF rendering library based on the xpdf-3.0 code base. - ''; - - platforms = if qt4Support - then qt4.meta.platforms - else stdenv.lib.platforms.all; - - license = "GPLv2"; - }; -} diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 263162336485cb5af0555c19819fcedde1d71b44..2512979bfa3dcdac399c1915170f114da0a65c81 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -1,76 +1,50 @@ -{ stdenv, fetchurl, fetchgit, cairo, freetype, fontconfig, zlib -, libjpeg, curl, libpthreadstubs, xorg, openjpeg -, libxml2, pkgconfig, cmake, lcms2 +{ fetchurl, stdenv, cairo, freetype, fontconfig, zlib +, libjpeg, pixman, curl, libpthreadstubs, libXau, libXdmcp, openjpeg +, libxml2, pkgconfig, cmake, lcms +, gtkSupport ? false, glib ? null, gtk ? null , qt4Support ? false, qt4 ? null }: -let - version = "0.22.3"; - sha256 = "0ca4jci8xmbdz4fhahdcck0cqms6ax55yggi2ih3clgrpqf96sli"; +stdenv.mkDerivation rec { + name = "poppler-0.18.4"; - qtcairo_patches = - let qtcairo = fetchgit { # the version for poppler-0.22 - url = "git://github.com/giddie/poppler-qt4-cairo-backend.git"; - rev = "7a12c58e5cefc2b7a5179c53b387fca8963195c0"; - sha256 = "1jg2d5y62d0bv206nijb63x426zfb2awy70505nx22d0fx1v1p9k"; - }; in - [ "${qtcairo}/0001-Cairo-backend-added-to-Qt4-wrapper.patch" - "${qtcairo}/0002-Setting-default-Qt4-backend-to-Cairo.patch" - "${qtcairo}/0003-Forcing-subpixel-rendering-in-Cairo-backend.patch" ]; - - poppler_drv = nameSuff: merge: stdenv.mkDerivation (stdenv.lib.mergeAttrsByFuncDefaultsClean [ - rec { - name = "poppler-${nameSuff}-${version}"; - - src = fetchurl { - url = "${meta.homepage}/poppler-${version}.tar.gz"; - inherit sha256; - }; - - propagatedBuildInputs = with xorg; - [ zlib cairo freetype fontconfig libjpeg lcms2 curl - libpthreadstubs libxml2 - libXau libXdmcp libxcb libXrender libXext - openjpeg - ]; - - nativeBuildInputs = [ pkgconfig cmake ]; + src = fetchurl { + url = "${meta.homepage}${name}.tar.gz"; + sha256 = "0bnl05al7mjndp2h0355946j59nfw76f5v0x57d47q68rm412hik"; + }; - cmakeFlags = "-DENABLE_XPDF_HEADERS=ON -DENABLE_LIBCURL=ON -DENABLE_ZLIB=ON"; + propagatedBuildInputs = + [ zlib cairo freetype fontconfig libjpeg lcms pixman curl + libpthreadstubs libXau libXdmcp openjpeg libxml2 stdenv.gcc.libc + ] + ++ stdenv.lib.optionals gtkSupport [ glib gtk ] + ++ stdenv.lib.optional qt4Support qt4; - patches = [ ./datadir_env.patch ]; + nativeBuildInputs = [ pkgconfig cmake ]; - # XXX: The Poppler/Qt4 test suite refers to non-existent PDF files - # such as `../../../test/unittestcases/UseNone.pdf'. - #doCheck = !qt4Support; - checkTarget = "test"; + cmakeFlags = "-DENABLE_XPDF_HEADERS=ON -DENABLE_LIBCURL=ON -DENABLE_ZLIB=ON"; - enableParallelBuilding = true; + patches = [ ./datadir_env.patch ]; - meta = { - homepage = http://poppler.freedesktop.org/; - description = "A PDF rendering library"; + # XXX: The Poppler/Qt4 test suite refers to non-existent PDF files + # such as `../../../test/unittestcases/UseNone.pdf'. + #doCheck = !qt4Support; + checkTarget = "test"; - longDescription = '' - Poppler is a PDF rendering library based on the xpdf-3.0 code base. - ''; + enableParallelBuilding = true; - license = "GPLv2"; - }; - } merge ]); # poppler_drv + meta = { + homepage = http://poppler.freedesktop.org/; + description = "Poppler, a PDF rendering library"; -in rec { - /* We always use cairo in poppler, so we always depend on glib, - so we always build the glib wrapper (~350kB). - We also always build the cpp wrapper (<100kB). - ToDo: around half the size could be saved by splitting out headers and tools (1.5 + 0.5 MB). - */ + longDescription = '' + Poppler is a PDF rendering library based on the xpdf-3.0 code base. + ''; - poppler_glib = poppler_drv "glib" { }; + platforms = if qt4Support + then qt4.meta.platforms + else stdenv.lib.platforms.all; - poppler_qt4 = poppler_drv "qt4" { - propagatedBuildInputs = [ qt4 poppler_glib ]; - patches = qtcairo_patches; - postConfigure = "cd qt4"; + license = "GPLv2"; }; } diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index 5f66ad656940021a38b57a3fd408e93e9ebd167b..60d59030c1f3c04e410114379c03a55cb3a31e4d 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -20,7 +20,7 @@ let v = "4.8.4"; in # * move some plugins (e.g., SQL plugins) to dedicated derivations to avoid # false build-time dependencies -stdenv.mkDerivation ( rec { +stdenv.mkDerivation rec { name = "qt-${v}"; src = fetchurl { @@ -147,13 +147,3 @@ stdenv.mkDerivation ( rec { platforms = platforms.linux; }; } - # ToDo: this attribute is optional *only* to prevent rebuild on hydra - // stdenv.lib.optionalAttrs developerBuild { - # fix underspecified dependency in a generated makefile - postConfigure = '' - substituteInPlace tools/designer/src/lib/Makefile --replace \ - "moc_qtgradientviewdialog.cpp:" "moc_qtgradientviewdialog.cpp: .uic/release-shared/ui_qtgradientview.h" - ''; - } -) - diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix index 8854a41210b65af17ef21b2842a722b9cfb393d2..9e00b0d8bcf5edca50dd9e4b390fb4307ac9f34e 100644 --- a/pkgs/development/libraries/wayland/default.nix +++ b/pkgs/development/libraries/wayland/default.nix @@ -1,21 +1,23 @@ { stdenv, fetchurl, libffi, expat, pkgconfig, libxslt, docbook_xsl, doxygen }: -let version = "1.0.5"; in - stdenv.mkDerivation rec { - name = "wayland-${version}"; + name = "wayland-1.0.5"; src = fetchurl { url = "http://wayland.freedesktop.org/releases/${name}.tar.xz"; + sha256 = "130n7v5i7rfsrli2n8vdzfychlgd8v7by7sfgp8vfqdlss5km34w"; }; buildInputs = [ pkgconfig libffi expat libxslt docbook_xsl doxygen ]; meta = { - description = "Reference implementation of the wayland protocol"; - homepage = http://wayland.freedesktop.org/; - license = stdenv.lib.licenses.mit; + description = "The reference implementation of the Wayland protocol"; + + homepage = http://wayland.freedesktop.org; + + license = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/libraries/wildmidi/default.nix b/pkgs/development/libraries/wildmidi/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..85e5726f8636292f1f1f85eada32433b487ca713 --- /dev/null +++ b/pkgs/development/libraries/wildmidi/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, alsaLib, freepats }: + +stdenv.mkDerivation rec { + name = "wildmidi-0.2.3.5"; + + src = fetchurl { + url = "mirror://sourceforge/project/wildmidi/wildmidi/${name}.tar.gz"; + sha256 = "0m75753mn0rbwja180c2qk53s149wp4k35dijr2i6pa7sc12fr00"; + }; + + # NOTE: $out in configureFlags, like this: + # configureFlags = "--disable-werror --with-wildmidi-cfg=$out/etc/wildmidi.cfg"; + # is not expanded, so use this workaround: + preConfigure = '' + configureFlags="--disable-werror --with-wildmidi-cfg=$out/etc/wildmidi.cfg" + ''; + + buildInputs = [ alsaLib ]; + + postInstall = '' + mkdir "$out"/etc + echo "dir ${freepats}" > "$out"/etc/wildmidi.cfg + echo "source ${freepats}/freepats.cfg" >> "$out"/etc/wildmidi.cfg + ''; + + meta = with stdenv.lib; { + description = "Software MIDI player and library"; + longDescription = '' + WildMIDI is a simple software midi player which has a core softsynth + library that can be use with other applications. + ''; + homepage = http://wildmidi.sourceforge.net/; + # The library is LGPLv3, the wildmidi executable is GPLv3 + license = licenses.lgpl3; + platforms = platforms.linux; + maintainers = [maintainers.bjornfor]; + }; +} diff --git a/pkgs/development/libraries/wxGTK-2.8/default.nix b/pkgs/development/libraries/wxGTK-2.8/default.nix index e11de87415d0a73b9e9ab39940135ac0938b33ac..1090772695445f6fbbd75382f4afb702072add08 100644 --- a/pkgs/development/libraries/wxGTK-2.8/default.nix +++ b/pkgs/development/libraries/wxGTK-2.8/default.nix @@ -7,13 +7,12 @@ assert withMesa -> mesa != null; with stdenv.lib; -stdenv.mkDerivation rec { - version = "2.8.12.1"; - name = "wxGTK-${version}"; +stdenv.mkDerivation { + name = "wxGTK-2.8.12"; src = fetchurl { - url = "mirror://sourceforge/wxpython/wxPython-src-${version}.tar.bz2"; - sha256 = "1l1w4i113csv3bd5r8ybyj0qpxdq83lj6jrc5p7cc10mkwyiagqz"; + url = mirror://sourceforge/wxwindows/wxGTK-2.8.12.tar.gz; + sha256 = "1gjs9vfga60mk4j4ngiwsk9h6c7j22pw26m3asxr1jwvqbr8kkqk"; }; buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst_plugins_base GConf ] @@ -30,12 +29,11 @@ stdenv.mkDerivation rec { "--enable-mediactrl" ] ++ optional withMesa "--with-opengl"; - # These variables are used by configure to find some dependencies. + # This variable is used by configure to find some dependencies. SEARCH_INCLUDE = "${libXinerama}/include ${libSM}/include ${libXxf86vm}/include"; - SEARCH_LIB = - "${libXinerama}/lib ${libSM}/lib ${libXxf86vm}/lib " - + optionalString withMesa "${mesa}/lib "; + + SEARCH_LIB = optionalString withMesa "${mesa}/lib"; # Work around a bug in configure. NIX_CFLAGS_COMPILE = "-DHAVE_X11_XLIB_H=1"; diff --git a/pkgs/development/libraries/x264/default.nix b/pkgs/development/libraries/x264/default.nix index a5e045d27d6d26c5bb2ddfe480944acbcf2a7cd8..9f53d36bb63c182f451ddbee4953636ce9f6d83b 100644 --- a/pkgs/development/libraries/x264/default.nix +++ b/pkgs/development/libraries/x264/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, yasm}: stdenv.mkDerivation rec { - version = "snapshot-20120129-2245-stable"; + version = "snapshot-20130424-2245-stable"; name = "x264-${version}"; src = fetchurl { url = "ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-${version}.tar.bz2"; - sha256 = "1i63xsa46a5l0ys3mqbcqr4gr5kpaf9fs05cbf0782iir5k07pcr"; + sha256 = "0vzyqsgrm9k3hzka2p8ib92jl0ha8d4267r2rb3pr9gmpjaj9azk"; }; patchPhase = '' @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ yasm ]; - meta = { + meta = { description = "library for encoding H264/AVC video streams"; homepage = http://www.videolan.org/developers/x264.html; license = "GPL"; diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix new file mode 100644 index 0000000000000000000000000000000000000000..b5b8f8408aa5e063cb4f60c291db2633dd1f72d6 --- /dev/null +++ b/pkgs/development/python-modules/pygobject/3.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, python, pkgconfig, glib, gobjectIntrospection, pycairo, cairo }: + +stdenv.mkDerivation rec { + name = "pygobject-3.0.4"; + + src = fetchurl { + url = "http://ftp.gnome.org/pub/GNOME/sources/pygobject/3.0/${name}.tar.xz"; + sha256 = "f457b1d7f6b8bfa727593c3696d2b405da66b4a8d34cd7d3362ebda1221f0661"; + }; + + configureFlags = "--disable-introspection"; + + buildInputs = [ python pkgconfig glib gobjectIntrospection pycairo cairo ]; + + meta = { + homepage = http://live.gnome.org/PyGObject; + description = "Python bindings for Glib"; + }; +} diff --git a/pkgs/development/tools/build-managers/buildbot-slave/default.nix b/pkgs/development/tools/build-managers/buildbot-slave/default.nix index da38bc0a13384e5119bfb4879d65626442afc450..b28c4d9296fa27308a3d6cb3f4549e779e139d04 100644 --- a/pkgs/development/tools/build-managers/buildbot-slave/default.nix +++ b/pkgs/development/tools/build-managers/buildbot-slave/default.nix @@ -31,7 +31,7 @@ buildPythonPackage (rec { cp docs/buildslave.1 "$out/share/man/man1" ''; - meta = { + meta = with stdenv.lib; { homepage = http://buildbot.net/; license = "GPLv2+"; @@ -60,5 +60,7 @@ buildPythonPackage (rec { encouraging them to be more careful about testing before checking in code. ''; + maintainers = with maintainers; [ bjornfor ]; + platforms = platforms.all; }; }) diff --git a/pkgs/development/tools/build-managers/buildbot/default.nix b/pkgs/development/tools/build-managers/buildbot/default.nix index 239a20510348ba0d26c150f989f1a32068180db1..8058c8dbd96f02e42cb6ec040f43d1a5f0aa0f9d 100644 --- a/pkgs/development/tools/build-managers/buildbot/default.nix +++ b/pkgs/development/tools/build-managers/buildbot/default.nix @@ -49,7 +49,7 @@ buildPythonPackage (rec { cp docs/buildbot.1 "$out/share/man/man1" ''; - meta = { + meta = with stdenv.lib; { homepage = http://buildbot.net/; license = "GPLv2+"; @@ -80,7 +80,7 @@ buildPythonPackage (rec { in code. ''; - maintainers = [ stdenv.lib.maintainers.ludo ]; - platforms = stdenv.lib.platforms.all; + maintainers = with maintainers; [ ludo bjornfor ]; + platforms = platforms.all; }; }) diff --git a/pkgs/development/tools/build-managers/ninja/default.nix b/pkgs/development/tools/build-managers/ninja/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..c4a8b83a7cf11e2cad6e4dc1fc91775089b5a173 --- /dev/null +++ b/pkgs/development/tools/build-managers/ninja/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchurl, unzip, python, asciidoc, re2c }: + +stdenv.mkDerivation rec { + name = "ninja-${version}"; + version = "1.2.0"; + + src = fetchurl { + name = "${name}.zip"; + url = "https://github.com/martine/ninja/archive/v${version}.zip"; + sha256 = "15ynh806ah37bqb57hcs3mj2g82900sncp6n3bssfggb4azgjlh3"; + }; + + buildInputs = [ python asciidoc unzip re2c ]; + + buildPhase = '' + python bootstrap.py + asciidoc doc/manual.asciidoc + ''; + + installPhase = '' + mkdir -p $out/bin + cp ninja $out/bin/ + + mkdir -p $out/share/doc/ninja + cp doc/manual.asciidoc $out/share/doc/ninja/ + cp doc/manual.html $out/share/doc/ninja/ + ''; + + meta = with stdenv.lib; { + description = "Small build system with a focus on speed"; + longDescription = '' + Ninja is a small build system with a focus on speed. It differs from + other build systems in two major respects: it is designed to have its + input files generated by a higher-level build system, and it is designed + to run builds as fast as possible. + ''; + homepage = http://martine.github.io/ninja/; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = [maintainers.bjornfor]; + }; +} diff --git a/pkgs/development/tools/documentation/haddock/2.10.0.nix b/pkgs/development/tools/documentation/haddock/2.10.0.nix index f65df4b5ad053d1c6cfc9b7209722c7f0d6fad77..cfda3b66704a883ac294e79170451b487d945757 100644 --- a/pkgs/development/tools/documentation/haddock/2.10.0.nix +++ b/pkgs/development/tools/documentation/haddock/2.10.0.nix @@ -15,9 +15,6 @@ cabal.mkDerivation (self: { description = "A documentation-generation tool for Haskell libraries"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/tools/documentation/haddock/2.11.0.nix b/pkgs/development/tools/documentation/haddock/2.11.0.nix index a294680607d2e2589b79fb3a08644c8957fb941c..968efe2260b0e08cf5cd6638a9c38dc4dbaa9af9 100644 --- a/pkgs/development/tools/documentation/haddock/2.11.0.nix +++ b/pkgs/development/tools/documentation/haddock/2.11.0.nix @@ -15,9 +15,6 @@ cabal.mkDerivation (self: { description = "A documentation-generation tool for Haskell libraries"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/tools/documentation/haddock/2.12.0.nix b/pkgs/development/tools/documentation/haddock/2.12.0.nix index a618b546f00c458f1f00983c87e10c950218e292..12907a64d2143dbde8feef98fb6555149343d951 100644 --- a/pkgs/development/tools/documentation/haddock/2.12.0.nix +++ b/pkgs/development/tools/documentation/haddock/2.12.0.nix @@ -15,9 +15,6 @@ cabal.mkDerivation (self: { description = "A documentation-generation tool for Haskell libraries"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/tools/documentation/haddock/2.13.2.nix b/pkgs/development/tools/documentation/haddock/2.13.2.nix index a5a63f6c90aa26c69f178d490052ff56f9b38661..95890f5bd43f718c1215a4e17362a83a4872a60d 100644 --- a/pkgs/development/tools/documentation/haddock/2.13.2.nix +++ b/pkgs/development/tools/documentation/haddock/2.13.2.nix @@ -15,9 +15,6 @@ cabal.mkDerivation (self: { description = "A documentation-generation tool for Haskell libraries"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/tools/documentation/haddock/2.4.2.nix b/pkgs/development/tools/documentation/haddock/2.4.2.nix index 88c6e045e5317caf0d227b1671863375a3bbd95c..811ffd2855da80a2f396986941edf843c659ed03 100644 --- a/pkgs/development/tools/documentation/haddock/2.4.2.nix +++ b/pkgs/development/tools/documentation/haddock/2.4.2.nix @@ -14,9 +14,6 @@ cabal.mkDerivation (self: { description = "A documentation-generation tool for Haskell libraries"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/tools/documentation/haddock/2.9.4.nix b/pkgs/development/tools/documentation/haddock/2.9.4.nix index c9e7b810866aeb6c101e0fef9490d7dab4133ba6..8a57dd851c2dc24e4ff4166e9f365e3cd0413a33 100644 --- a/pkgs/development/tools/documentation/haddock/2.9.4.nix +++ b/pkgs/development/tools/documentation/haddock/2.9.4.nix @@ -16,9 +16,6 @@ cabal.mkDerivation (self: { description = "A documentation-generation tool for Haskell libraries"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/tools/haskell/BNFC-meta/default.nix b/pkgs/development/tools/haskell/BNFC-meta/default.nix index 94758e3eff4a9e493bccd8e91ef26424c9d7a0da..d39544342b3a8a56255d78f629bcebec70a53e46 100644 --- a/pkgs/development/tools/haskell/BNFC-meta/default.nix +++ b/pkgs/development/tools/haskell/BNFC-meta/default.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Deriving Parsers and Quasi-Quoters from BNF Grammars"; license = self.stdenv.lib.licenses.gpl2; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/tools/haskell/HaRe/default.nix b/pkgs/development/tools/haskell/HaRe/default.nix index cd36d5f58e9cc998f011072c51682ba83284d0d6..88f5d0baee67942f3ee0e62c3483b46e7a402db5 100644 --- a/pkgs/development/tools/haskell/HaRe/default.nix +++ b/pkgs/development/tools/haskell/HaRe/default.nix @@ -12,9 +12,6 @@ cabal.mkDerivation (self: { description = "the Haskell Refactorer"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/tools/haskell/SourceGraph/default.nix b/pkgs/development/tools/haskell/SourceGraph/default.nix index 78cb968ff0506ae1db4de843de1488f1ba5870cf..17d19106481628354d05069c69591100341c55f2 100644 --- a/pkgs/development/tools/haskell/SourceGraph/default.nix +++ b/pkgs/development/tools/haskell/SourceGraph/default.nix @@ -16,9 +16,6 @@ cabal.mkDerivation (self: { description = "Static code analysis using graph-theoretic techniques"; license = "GPL"; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/tools/haskell/alex-meta/default.nix b/pkgs/development/tools/haskell/alex-meta/default.nix index 4487715cdc5168079043100f0b15713c5c366dfc..5bb298e739ad4abb517c356afd7c502729190fff 100644 --- a/pkgs/development/tools/haskell/alex-meta/default.nix +++ b/pkgs/development/tools/haskell/alex-meta/default.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Quasi-quoter for Alex lexers"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/tools/haskell/cabal-ghci/default.nix b/pkgs/development/tools/haskell/cabal-ghci/default.nix index c48a6d6a61dbfa4af735e01de46312b70e0fc2c6..4676850fd938b444032be44a289072f99fc65e74 100644 --- a/pkgs/development/tools/haskell/cabal-ghci/default.nix +++ b/pkgs/development/tools/haskell/cabal-ghci/default.nix @@ -12,9 +12,6 @@ cabal.mkDerivation (self: { description = "Set up ghci with options taken from a .cabal file"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/tools/haskell/cabal2ghci/default.nix b/pkgs/development/tools/haskell/cabal2ghci/default.nix index 3ec96e3fb2ae30b4cdac94b9ea4b97b82b112968..881328d875b6b24ccf078689f8439a04bda96b0d 100644 --- a/pkgs/development/tools/haskell/cabal2ghci/default.nix +++ b/pkgs/development/tools/haskell/cabal2ghci/default.nix @@ -16,6 +16,5 @@ cabal.mkDerivation (self: { description = "A tool to generate .ghci file from .cabal"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix index ae7ded65655ac2d353180e5f0f7f93630cc26b64..d213c5392a8f75cf6ad9e6ef44a9d1fd107ed772 100644 --- a/pkgs/development/tools/haskell/cabal2nix/default.nix +++ b/pkgs/development/tools/haskell/cabal2nix/default.nix @@ -14,9 +14,6 @@ cabal.mkDerivation (self: { description = "Convert Cabal files into Nix build instructions"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/tools/haskell/happy-meta/default.nix b/pkgs/development/tools/haskell/happy-meta/default.nix index f00708bb55f13a60ea489e778234aadb637fa2f3..a3d885c60084b0a7399a084670854e0796d0723c 100644 --- a/pkgs/development/tools/haskell/happy-meta/default.nix +++ b/pkgs/development/tools/haskell/happy-meta/default.nix @@ -9,9 +9,6 @@ cabal.mkDerivation (self: { description = "Quasi-quoter for Happy parsers"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/tools/haskell/haskdogs/default.nix b/pkgs/development/tools/haskell/haskdogs/default.nix index 2e158abaf898078394c2d30e3b5bb93e6fd8ac1d..c05368c3980825a8164b86057acbb47e433435e9 100644 --- a/pkgs/development/tools/haskell/haskdogs/default.nix +++ b/pkgs/development/tools/haskell/haskdogs/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "haskdogs"; - version = "0.3"; - sha256 = "0aji59sazlhn5yardgrsdpf85fvb0mwn4bpslcjxr7mnmpa7j0kz"; + version = "0.3.2"; + sha256 = "0vl3c66ki9j9ncs2rapdn80kbfk0l3y97qwfraqlnjycdl10sm6r"; isLibrary = false; isExecutable = true; buildDepends = [ Cabal filepath HSH ]; @@ -12,9 +12,6 @@ cabal.mkDerivation (self: { description = "Generate ctags file for haskell project directory and it's deps"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/tools/haskell/hasktags/default.nix b/pkgs/development/tools/haskell/hasktags/default.nix index d3c373ae4df76c3a4e6131bb4528746fd42cae6b..f1e1f639e80d5dea523639aafa5833bdecbe9477 100644 --- a/pkgs/development/tools/haskell/hasktags/default.nix +++ b/pkgs/development/tools/haskell/hasktags/default.nix @@ -11,9 +11,6 @@ cabal.mkDerivation (self: { description = "Produces ctags \"tags\" and etags \"TAGS\" files for Haskell programs"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/tools/haskell/hlint/default.nix b/pkgs/development/tools/haskell/hlint/default.nix index 44f95543c850fe2c79bb28efb7e9e8c8843aba6f..7b3953b0716802024a94b469af90641bab378a77 100644 --- a/pkgs/development/tools/haskell/hlint/default.nix +++ b/pkgs/development/tools/haskell/hlint/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hlint"; - version = "1.8.44"; - sha256 = "075m8q933yqzq85m07j9m22f1gh38vjnr04wvpw4h4dl552ivzp6"; + version = "1.8.45"; + sha256 = "14j77bjmdsxz5z0ka6mhnr2j29kpr5a39kbdq8ziga668wihdrz9"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -16,9 +16,6 @@ cabal.mkDerivation (self: { description = "Source code suggestions"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/tools/haskell/hslogger/default.nix b/pkgs/development/tools/haskell/hslogger/default.nix index efbf48322b349fc9b0f537f4fd5662d94df8a79d..4443637def47aa188bec4406795340145a768ca9 100644 --- a/pkgs/development/tools/haskell/hslogger/default.nix +++ b/pkgs/development/tools/haskell/hslogger/default.nix @@ -12,9 +12,6 @@ cabal.mkDerivation (self: { description = "Versatile logging framework"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/tools/haskell/jailbreak-cabal/default.nix b/pkgs/development/tools/haskell/jailbreak-cabal/default.nix index 29c78329f957c6e88278e9b57f0fc57e69a9c9bf..ea61fd9b6ed448a8dd3d4894134e47d059f43c0a 100644 --- a/pkgs/development/tools/haskell/jailbreak-cabal/default.nix +++ b/pkgs/development/tools/haskell/jailbreak-cabal/default.nix @@ -12,6 +12,5 @@ cabal.mkDerivation (self: { description = "Strip version restrictions from build dependencies in Cabal files"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/tools/haskell/packunused/default.nix b/pkgs/development/tools/haskell/packunused/default.nix index 41b77e22b46cce4b8660e619782c8163a74a6c00..814c2774cb2721a133e6d5d38dface235437899e 100644 --- a/pkgs/development/tools/haskell/packunused/default.nix +++ b/pkgs/development/tools/haskell/packunused/default.nix @@ -12,6 +12,5 @@ cabal.mkDerivation (self: { description = "Tool for detecting redundant Cabal package dependencies"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/tools/haskell/splot/default.nix b/pkgs/development/tools/haskell/splot/default.nix index 8bcd07dc2afb86ddd716a97b1b70219d3b523a12..4bd47b8decd4aa49ad0ae10c35847ca0126c4e97 100644 --- a/pkgs/development/tools/haskell/splot/default.nix +++ b/pkgs/development/tools/haskell/splot/default.nix @@ -17,6 +17,5 @@ cabal.mkDerivation (self: { description = "A tool for visualizing the lifecycle of many concurrent multi-staged processes"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/tools/haskell/threadscope/default.nix b/pkgs/development/tools/haskell/threadscope/default.nix index f2b3d9d17cf48557d7a5b6fb7aa55142ddd6de28..4928c40e129198013f8c50b23a7c7983882aac1d 100644 --- a/pkgs/development/tools/haskell/threadscope/default.nix +++ b/pkgs/development/tools/haskell/threadscope/default.nix @@ -17,9 +17,6 @@ cabal.mkDerivation (self: { description = "A graphical tool for profiling parallel Haskell programs"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/tools/haskell/timeplot/default.nix b/pkgs/development/tools/haskell/timeplot/default.nix index 9025d5d97aa0599baf96b80e7e3ae5c7995d2d96..d95c8cea03f3a4c391d82656d7a717c27c9d223c 100644 --- a/pkgs/development/tools/haskell/timeplot/default.nix +++ b/pkgs/development/tools/haskell/timeplot/default.nix @@ -19,6 +19,5 @@ cabal.mkDerivation (self: { description = "A tool for visualizing time series from log files"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/tools/haskell/uuagc/bootstrap.nix b/pkgs/development/tools/haskell/uuagc/bootstrap.nix index 749fbb6978d9b5523f727373d2a653521f3b1bc2..d24d22f350adc4fd0f9ad95817b9723baa75ecb2 100644 --- a/pkgs/development/tools/haskell/uuagc/bootstrap.nix +++ b/pkgs/development/tools/haskell/uuagc/bootstrap.nix @@ -12,9 +12,6 @@ cabal.mkDerivation (self: { description = "Attribute Grammar System of Universiteit Utrecht"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/tools/haskell/uuagc/cabal.nix b/pkgs/development/tools/haskell/uuagc/cabal.nix index 6de37716579b9c71e1f2568464355809465c6081..ea981ad423b0729590967c365df222ea38e51bf2 100644 --- a/pkgs/development/tools/haskell/uuagc/cabal.nix +++ b/pkgs/development/tools/haskell/uuagc/cabal.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Cabal plugin for the Universiteit Utrecht Attribute Grammar System"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/tools/haskell/uuagc/default.nix b/pkgs/development/tools/haskell/uuagc/default.nix index 0cf3904f6d4fe4b4a1d5abef8fbf185f0209097f..69c956ef1de51aae6f7fa215a702cfdf001fb029 100644 --- a/pkgs/development/tools/haskell/uuagc/default.nix +++ b/pkgs/development/tools/haskell/uuagc/default.nix @@ -12,9 +12,6 @@ cabal.mkDerivation (self: { description = "Attribute Grammar System of Universiteit Utrecht"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/tools/jq/default.nix b/pkgs/development/tools/jq/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..f0c32fc0e9eca1196c64a3b325eb40b3251aae2a --- /dev/null +++ b/pkgs/development/tools/jq/default.nix @@ -0,0 +1,28 @@ +{stdenv, fetchurl}: +let + s = # Generated upstream information + rec { + baseName="jq"; + version="1.3"; + name="${baseName}-${version}"; + hash="1mzy9cj3d19y1m56mwk6slls543gnlhz8302hmnxkhdzdb1j6gv2"; + url="http://stedolan.github.io/jq/download/source/jq-1.3.tar.gz"; + sha256="1mzy9cj3d19y1m56mwk6slls543gnlhz8302hmnxkhdzdb1j6gv2"; + }; + buildInputs = [ + ]; +in +stdenv.mkDerivation { + inherit (s) name version; + inherit buildInputs; + src = fetchurl { + inherit (s) url sha256; + }; + meta = { + inherit (s) version; + description = ''A lightweight and flexible command-line JSON processor''; + license = stdenv.lib.licenses.mit ; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/tools/jq/default.upstream b/pkgs/development/tools/jq/default.upstream new file mode 100644 index 0000000000000000000000000000000000000000..1ad914d717e0f1b1bb7ad70ecc414cdf34a8f788 --- /dev/null +++ b/pkgs/development/tools/jq/default.upstream @@ -0,0 +1 @@ +url http://stedolan.github.io/jq/download/ diff --git a/pkgs/development/tools/misc/cpphs/default.nix b/pkgs/development/tools/misc/cpphs/default.nix index 3406c708851e58736f8849738690c8fee6b35eec..2e419f67eb050e1ff1a2aa3c48624fce3ce93b35 100644 --- a/pkgs/development/tools/misc/cpphs/default.nix +++ b/pkgs/development/tools/misc/cpphs/default.nix @@ -11,9 +11,6 @@ cabal.mkDerivation (self: { description = "A liberalised re-implementation of cpp, the C pre-processor"; license = "LGPL"; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/tools/misc/intltool/default.nix b/pkgs/development/tools/misc/intltool/default.nix index b2a400a61891a3ca56b6b631ec1d4f8377d26010..0ca8b6eb0714449cd1e7dccd623aaa4da202df2f 100644 --- a/pkgs/development/tools/misc/intltool/default.nix +++ b/pkgs/development/tools/misc/intltool/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, perlXMLParser, gettext }: +{stdenv, fetchurl, perl, perlXMLParser}: let s = # Generated upstream information rec { @@ -12,15 +12,12 @@ let propagatedBuildInputs = [perl perlXMLParser]; buildInputs = []; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { inherit (s) name version; src = fetchurl { inherit (s) url sha256; }; - inherit buildInputs; - - # not needed by intltool itself but (probably) needed for its usage - propagatedBuildInputs = propagatedBuildInputs ++ [ gettext ]; + inherit propagatedBuildInputs buildInputs; meta = { description = "Translation helper tool"; diff --git a/pkgs/development/tools/misc/intltool/default.upstream b/pkgs/development/tools/misc/intltool/default.upstream index 323bf21f45a1645212abf42912d2846646818307..4a2965b036af6d21f1198d537f646af608938162 100644 --- a/pkgs/development/tools/misc/intltool/default.upstream +++ b/pkgs/development/tools/misc/intltool/default.upstream @@ -1,2 +1,2 @@ -attribute_name intltool +attribute_name intltool_standalone url https://launchpad.net/intltool/+download diff --git a/pkgs/development/tools/misc/openocd/default.nix b/pkgs/development/tools/misc/openocd/default.nix index 5c0b1a3b101eb30a1bcf045ef6409b4825872863..c87bd9d5535436f2f092b2d34564ba8d87805782 100644 --- a/pkgs/development/tools/misc/openocd/default.nix +++ b/pkgs/development/tools/misc/openocd/default.nix @@ -1,12 +1,12 @@ -{stdenv, fetchurl, libftdi}: +{stdenv, fetchurl, libftdi, libusb1 }: stdenv.mkDerivation rec { name = "openocd-${version}"; - version = "0.6.1"; + version = "0.7.0"; src = fetchurl { url = "http://downloads.sourceforge.net/project/openocd/openocd/${version}/openocd-${version}.tar.bz2"; - sha256 = "0argjhff9x4ilgycics61kfgkvb6kkkhhhmj3fxcyydd8mscri7l"; + sha256 = "0qwfyd821sy5p0agz0ybgn5nd7vplipw4mhm485ldj1hcmw7n8sj"; }; configureFlags = [ "--enable-ft2232_libftdi" @@ -15,10 +15,10 @@ stdenv.mkDerivation rec { "--enable-ulink" "--enable-stlink" ]; - buildInputs = [ libftdi ]; + buildInputs = [ libftdi libusb1 ]; meta = { - homepage = http://openocd.berlios.de; + homepage = http://openocd.sourceforge.net/; description = "OpenOCD, an on-chip debugger"; longDescription = @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; license = "GPLv2+"; - maintainers = with stdenv.lib.maintainers; [viric]; + maintainers = with stdenv.lib.maintainers; [ viric bjornfor ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/development/tools/misc/premake/default.nix b/pkgs/development/tools/misc/premake/default.nix index 07896dd100f6769322dfa1ab7da6bf544f1185af..8dce23aa9593eedda5dace9d34004f854eeb9b26 100644 --- a/pkgs/development/tools/misc/premake/default.nix +++ b/pkgs/development/tools/misc/premake/default.nix @@ -22,9 +22,11 @@ stdenv.mkDerivation { install -Dm755 bin/release/premake4 $out/bin/premake4 ''; - meta = { + meta = with stdenv.lib; { homepage = http://industriousone.com/premake; description = "A simple build configuration and project generation tool using lua"; license = stdenv.lib.licenses.bsd3; + platforms = platforms.linux; + maintainers = [maintainers.bjornfor]; }; } diff --git a/pkgs/development/tools/misc/stlink/default.nix b/pkgs/development/tools/misc/stlink/default.nix index fe7b0ba315038282bfc78f187b0adf0212cf0919..675f8f7f2af6d4e91bdbd3bfb30d89b240bb2ecf 100644 --- a/pkgs/development/tools/misc/stlink/default.nix +++ b/pkgs/development/tools/misc/stlink/default.nix @@ -18,8 +18,10 @@ stdenv.mkDerivation { buildInputs = [ autoconf automake libtool pkgconfig libusb1 ]; preConfigure = "./autogen.sh"; - meta = { + meta = with stdenv.lib; { description = "In-circuit debug and programming for ST-Link devices"; - license = stdenv.lib.licenses.bsd3; + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = [maintainers.bjornfor]; }; } diff --git a/pkgs/development/tools/misc/tcptrack/default.nix b/pkgs/development/tools/misc/tcptrack/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..43ff8df70d278d7591b8a7fc2384dc907b5af1da --- /dev/null +++ b/pkgs/development/tools/misc/tcptrack/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, ncurses, libpcap }: + +stdenv.mkDerivation rec { + name = "tcptrack-${version}"; + version = "1.4.2"; + + src = fetchurl { + # TODO: find better URL + url = http://pkgs.fedoraproject.org/repo/pkgs/tcptrack/tcptrack-1.4.2.tar.gz/dacf71a6b5310caf1203a2171b598610/tcptrack-1.4.2.tar.gz; + sha256 = "0jbh20kjaqdiasy5s9dk53dv4vpnbh31kqcmhwz9vi3qqzhv21v6"; + }; + + buildInputs = [ ncurses libpcap ]; + + meta = with stdenv.lib; { + description = "libpcap based program for live TCP connection monitoring"; + homepage = http://www.rhythm.cx/~steve/devel/tcptrack/; # dead link + license = licenses.lgpl21; + platforms = platforms.linux; + maintainers = [maintainers.bjornfor]; + }; +} diff --git a/pkgs/development/tools/neoload/default.nix b/pkgs/development/tools/neoload/default.nix index 25f66e9cd7eacd2cd071fd0ce61d342524e22d18..85d2c7a47934170ec9df8be1fa5786553dec356e 100644 --- a/pkgs/development/tools/neoload/default.nix +++ b/pkgs/development/tools/neoload/default.nix @@ -31,15 +31,15 @@ let dotInstall4j = writeTextFile { name = "dot-install4j"; text = '' ''; }; in stdenv.mkDerivation rec { - name = "neoload-4.1.1"; + name = "neoload-4.1.2"; src = fetchurl ( if stdenv.system == "x86_64-linux" then - { url = http://www.neotys.com/documents/download/neoload/v4.1/neoload_4_1_1_linux_x64.sh; - sha256 = "1gik80pvrj95jcpvqk16alvldf2zc604zn3xz3nszgmpv9dgmjk6"; } + { url = http://www.neotys.com/documents/download/neoload/v4.1/neoload_4_1_2_linux_x64.sh; + sha256 = "10r1dg2a37lhimy9r9sax01ljp09cas9irfygc7qa0g15hll1s84"; } else - { url = http://www.neotys.com/documents/download/neoload/v4.1/neoload_4_1_1_linux_x86.sh; - sha256 = "1m42xqy2gsk4khcaps287b4bsamn14grcy8wdz07hk8wvcfncd3d"; } ); + { url = http://www.neotys.com/documents/download/neoload/v4.1/neoload_4_1_2_linux_x86.sh; + sha256 = "00b2qf5jx9na4n6c7fv7v7r59w1iwm8sfmz1gb5ljqa1s7sa777a"; } ); buildInputs = [ makeWrapper ]; phases = [ "installPhase" ]; diff --git a/pkgs/development/tools/parsing/Ebnf2ps/default.nix b/pkgs/development/tools/parsing/Ebnf2ps/default.nix index f1964e815f6706663716621a2f23f4b484df328b..82d998c2fcbc1adfa23dc65331a8ca6e9ee7498c 100644 --- a/pkgs/development/tools/parsing/Ebnf2ps/default.nix +++ b/pkgs/development/tools/parsing/Ebnf2ps/default.nix @@ -12,9 +12,6 @@ cabal.mkDerivation (self: { description = "Peter's Syntax Diagram Drawing Tool"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/tools/parsing/alex/2.3.1.nix b/pkgs/development/tools/parsing/alex/2.3.1.nix index 92db61e08a201e4e7ee33867d7c55729cf8f779c..7dc17cd4153a4a11f0e53be2a9a3479ceb50bcda 100644 --- a/pkgs/development/tools/parsing/alex/2.3.1.nix +++ b/pkgs/development/tools/parsing/alex/2.3.1.nix @@ -13,9 +13,6 @@ cabal.mkDerivation (self: { description = "Alex is a tool for generating lexical analysers in Haskell"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/tools/parsing/alex/2.3.2.nix b/pkgs/development/tools/parsing/alex/2.3.2.nix index 2ec395d463f2929dd2fc48adf737c1b60e2c9a0b..5d10dbd69951c1b43d36fc3bcf546992ab0c01da 100644 --- a/pkgs/development/tools/parsing/alex/2.3.2.nix +++ b/pkgs/development/tools/parsing/alex/2.3.2.nix @@ -13,9 +13,6 @@ cabal.mkDerivation (self: { description = "Alex is a tool for generating lexical analysers in Haskell"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/tools/parsing/alex/2.3.3.nix b/pkgs/development/tools/parsing/alex/2.3.3.nix index 920c5fd9cc280db5924565696b1a273c1022c900..bbe413d478ff90356b2867bf89248f6d30cbd3bd 100644 --- a/pkgs/development/tools/parsing/alex/2.3.3.nix +++ b/pkgs/development/tools/parsing/alex/2.3.3.nix @@ -13,9 +13,6 @@ cabal.mkDerivation (self: { description = "Alex is a tool for generating lexical analysers in Haskell"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/tools/parsing/alex/2.3.5.nix b/pkgs/development/tools/parsing/alex/2.3.5.nix index 3635b24878777acd4983e994f45ab0a063ce6355..3fb843e69557d2ae15a3cdf4dfd63a8e724ba4f9 100644 --- a/pkgs/development/tools/parsing/alex/2.3.5.nix +++ b/pkgs/development/tools/parsing/alex/2.3.5.nix @@ -13,9 +13,6 @@ cabal.mkDerivation (self: { description = "Alex is a tool for generating lexical analysers in Haskell"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/tools/parsing/alex/3.0.1.nix b/pkgs/development/tools/parsing/alex/3.0.1.nix index a32de50e61ebd8f38132b978fdced16212439455..cdcaead86356e9ae45281075d70cb982882e2780 100644 --- a/pkgs/development/tools/parsing/alex/3.0.1.nix +++ b/pkgs/development/tools/parsing/alex/3.0.1.nix @@ -14,9 +14,6 @@ cabal.mkDerivation (self: { description = "Alex is a tool for generating lexical analysers in Haskell"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/tools/parsing/alex/3.0.2.nix b/pkgs/development/tools/parsing/alex/3.0.2.nix index 85087bfc9a47f261c9b5d6ccc8f920c2301b6502..9011db12c7dd2e3bd8fdda52c45cc096ddab18af 100644 --- a/pkgs/development/tools/parsing/alex/3.0.2.nix +++ b/pkgs/development/tools/parsing/alex/3.0.2.nix @@ -14,9 +14,6 @@ cabal.mkDerivation (self: { description = "Alex is a tool for generating lexical analysers in Haskell"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/tools/parsing/happy/1.18.10.nix b/pkgs/development/tools/parsing/happy/1.18.10.nix index 52c4775267c206137d954a4463a8a81150d6d37b..d342d3381c82f22abb0bc9a2c9609646c0b2d31f 100644 --- a/pkgs/development/tools/parsing/happy/1.18.10.nix +++ b/pkgs/development/tools/parsing/happy/1.18.10.nix @@ -13,9 +13,6 @@ cabal.mkDerivation (self: { description = "Happy is a parser generator for Haskell"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/tools/parsing/happy/1.18.4.nix b/pkgs/development/tools/parsing/happy/1.18.4.nix index cc5c60a3d43b225b22a03f0a2c939c77ad675d2b..401c4d1475ce0d2d3ce76b173d8180339a065c0d 100644 --- a/pkgs/development/tools/parsing/happy/1.18.4.nix +++ b/pkgs/development/tools/parsing/happy/1.18.4.nix @@ -13,9 +13,6 @@ cabal.mkDerivation (self: { description = "Happy is a parser generator for Haskell"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/tools/parsing/happy/1.18.5.nix b/pkgs/development/tools/parsing/happy/1.18.5.nix index 41532651c9950c18a8dfc7d7e70d79e6093fa024..d64d8983e9cba25673439bfb4938ef1c90f0495f 100644 --- a/pkgs/development/tools/parsing/happy/1.18.5.nix +++ b/pkgs/development/tools/parsing/happy/1.18.5.nix @@ -13,9 +13,6 @@ cabal.mkDerivation (self: { description = "Happy is a parser generator for Haskell"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/tools/parsing/happy/1.18.6.nix b/pkgs/development/tools/parsing/happy/1.18.6.nix index 60b8d253659e96895be41f9f77601c82fcba14e3..fdc483fe571461ec9c9bbbb2e69486144857eabc 100644 --- a/pkgs/development/tools/parsing/happy/1.18.6.nix +++ b/pkgs/development/tools/parsing/happy/1.18.6.nix @@ -13,9 +13,6 @@ cabal.mkDerivation (self: { description = "Happy is a parser generator for Haskell"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/tools/parsing/happy/1.18.8.nix b/pkgs/development/tools/parsing/happy/1.18.8.nix index b1ba0b165dd778f33dfc462e8118e78f8a2a58df..decc992809a27e57ee79427472221b6ad18fadad 100644 --- a/pkgs/development/tools/parsing/happy/1.18.8.nix +++ b/pkgs/development/tools/parsing/happy/1.18.8.nix @@ -13,9 +13,6 @@ cabal.mkDerivation (self: { description = "Happy is a parser generator for Haskell"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/tools/parsing/happy/1.18.9.nix b/pkgs/development/tools/parsing/happy/1.18.9.nix index cb47eaa8bdb2e9b4d11e1e19ce6fcb092b48ae1e..b1f752ae35f520567e8801ec6f2ae0bedd931b70 100644 --- a/pkgs/development/tools/parsing/happy/1.18.9.nix +++ b/pkgs/development/tools/parsing/happy/1.18.9.nix @@ -13,9 +13,6 @@ cabal.mkDerivation (self: { description = "Happy is a parser generator for Haskell"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/games/LambdaHack/default.nix b/pkgs/games/LambdaHack/default.nix index 5e6596d19ddf1288a1968262089c4b0830437db6..48c4809e5cd98d418ebf355ca0dfbd44566bc49b 100644 --- a/pkgs/games/LambdaHack/default.nix +++ b/pkgs/games/LambdaHack/default.nix @@ -16,9 +16,6 @@ cabal.mkDerivation (self: { description = "A roguelike game engine in early and active development"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/games/MazesOfMonad/default.nix b/pkgs/games/MazesOfMonad/default.nix index 92c7a17d7d960bcb58443efb8219000d543d5388..0e2abf6d7c77d839a647fee18c6b8f0cabad1643 100644 --- a/pkgs/games/MazesOfMonad/default.nix +++ b/pkgs/games/MazesOfMonad/default.nix @@ -11,9 +11,6 @@ cabal.mkDerivation (self: { description = "Console-based Role Playing Game"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/games/sgt-puzzles/default.nix b/pkgs/games/sgt-puzzles/default.nix index 8aaf1f0865c4dd427f737849085e08a335a244b6..b8043525719aaa466706ced2ed79d75971c67905 100644 --- a/pkgs/games/sgt-puzzles/default.nix +++ b/pkgs/games/sgt-puzzles/default.nix @@ -10,8 +10,8 @@ in rec { src = fetchsvn { url = svn://svn.tartarus.org/sgt/puzzles; - rev = "9773"; - sha256 = "1m0mmxbcj0zi44dlmhk4h30d9hdy8g9f59r7k7906pgnnyf49611"; + rev = "9689"; + sha256 = "33285a971fee67324f8867de22582931135d8b8ee4cc2c41c46c3ba81eb99cb7"; } + "/"; inherit buildInputs; @@ -27,7 +27,7 @@ rec { setVars = a.noDepEntry '' export NIX_LDFLAGS="$NIX_LDFLAGS -lX11" - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-error" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-error=variadic-macros" ''; /* doConfigure should be removed if not needed */ diff --git a/pkgs/games/uqm/3dovideo.nix b/pkgs/games/uqm/3dovideo.nix new file mode 100644 index 0000000000000000000000000000000000000000..4aab9aed42c318aabcce858ccc7479b8c5670a42 --- /dev/null +++ b/pkgs/games/uqm/3dovideo.nix @@ -0,0 +1,64 @@ +{ stdenv, requireFile, writeText, fetchgit, haskellPackages }: + +with stdenv.lib; + +let + makeSpin = num: let + padded = (optionalString (lessThan num 10) "0") + toString num; + in "slides.spins.${padded} = 3DOVID:" + + "addons/3dovideo/spins/ship${padded}.duk:" + + "addons/3dovideo/spins/spin.aif:" + + "addons/3dovideo/spins/ship${padded}.aif:89"; + + videoRMP = writeText "3dovideo.rmp" ('' + slides.ending = 3DOVID:addons/3dovideo/ending/victory.duk + slides.intro = 3DOVID:addons/3dovideo/intro/intro.duk + '' + concatMapStrings makeSpin (range 0 24)); + + helper = with haskellPackages; cabal.mkDerivation (self: { + pname = "uqm3donix"; + version = "0.1.0.0"; + + src = fetchgit { + url = "git://github.com/aszlig/uqm3donix.git"; + rev = "97fc4fd736dcf9fe03e6e5a2c347c5bdc71c8366"; + sha256 = "09ws6j21mxkcjx444fxkf8a3q17jj6i7h2i9pf5ky52f6xds1h0j"; + }; + + isLibrary = false; + isExecutable = true; + + buildDepends = [ binary filepath tar ]; + + meta = { + description = "Extract video files from a Star Control II 3DO image"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; + }); + +in stdenv.mkDerivation { + name = "uqm-3dovideo"; + + src = requireFile rec { + name = "videos.tar"; + sha256 = "044h0cl69r0kc43vk4n0akk0prwzb7inq324h5yfqb38sd4zkds1"; + message = '' + In order to get the intro and ending sequences from the 3DO version, you + need to have the original 3DO Star Control II CD. Create an image from the + CD and use uqm3donix* to extract a tarball with the videos from it. The + reason for this is because the 3DO uses its own proprietary disk format. + + Save the file as videos.tar and use "nix-prefetch-url file://${name}" to + add it to the Nix store. + + [*] ${helper}/bin/uqm3donix CDIMAGE ${name} + ''; + }; + + buildCommand = '' + mkdir -vp "$out" + tar xf "$src" -C "$out" --strip-components=3 + cp "${videoRMP}" "$out/3dovideo.rmp" + ''; +} diff --git a/pkgs/games/uqm/default.nix b/pkgs/games/uqm/default.nix index a9fe9d596c78a57880b15f3c01e19394bbb7cbdd..1f82c75f9cf05cea3b258df0d20c521a56fd8b0c 100644 --- a/pkgs/games/uqm/default.nix +++ b/pkgs/games/uqm/default.nix @@ -1,9 +1,18 @@ -{stdenv, fetchurl +{ stdenv, fetchurl , pkgconfig, mesa , SDL, SDL_image, libpng, zlib, libvorbis, libogg, libmikmod, unzip +, use3DOVideos ? false, requireFile ? null, writeText ? null +, fetchgit ? null, haskellPackages ? null }: -stdenv.mkDerivation rec { +assert use3DOVideos -> requireFile != null && writeText != null + && fetchgit != null && haskellPackages != null; + +let + videos = import ./3dovideo.nix { + inherit stdenv requireFile writeText fetchgit haskellPackages; + }; +in stdenv.mkDerivation rec { name = "uqm-${version}"; version = "0.7.0"; @@ -41,7 +50,9 @@ stdenv.mkDerivation rec { cp $content uqm-${version}/content/packages/uqm-0.7.0-content.uqm cp $music uqm-${version}/content/addons/uqm-0.7.0-3domusic.uqm cp $voice uqm-${version}/content/addons/uqm-0.7.0-voice.uqm - ''; + '' + stdenv.lib.optionalString use3DOVideos '' + ln -s "${videos}" "uqm-${version}/content/addons/3dovideo" + ''; /* uqm has a 'unique' build system with a root script incidentally called * 'build.sh'. */ @@ -52,16 +63,16 @@ stdenv.mkDerivation rec { echo "INPUT_install_libdir_VALUE='$out/lib'" >> config.state echo "INPUT_install_sharedir_VALUE='$out/share'" >> config.state PREFIX=$out ./build.sh uqm config - ''; + ''; buildPhase = '' ./build.sh uqm - ''; + ''; installPhase = '' ./build.sh uqm install sed -i $out/bin/uqm -e "s%/usr/local/games/%$out%g" - ''; + ''; meta = { description = "Remake of Star Control II"; diff --git a/pkgs/lib/customisation.nix b/pkgs/lib/customisation.nix index a35b44e9f6ee506526cc509ae5beb239ef96879b..bfa61169efb1e05ac38d663901a48e0cd7bfbdb0 100644 --- a/pkgs/lib/customisation.nix +++ b/pkgs/lib/customisation.nix @@ -33,23 +33,20 @@ rec { overrideDerivation = drv: f: let - # Filter out special attributes. - drop = [ "meta" "passthru" "outPath" "drvPath" "crossDrv" "nativeDrv" "type" "override" "deepOverride" "origArgs" "drvAttrs" "outputName" "all" "out" ] - # also drop functions such as .merge .override etc - ++ lib.filter (n: isFunction (getAttr n drv)) (attrNames drv); - attrs = removeAttrs drv drop; - newDrv = derivation (attrs // (f drv)); - in newDrv // - { meta = if drv ? meta then drv.meta else {}; + newDrv = derivation (drv.drvAttrs // (f drv)); + in addPassthru newDrv ( + { meta = drv.meta or {}; passthru = if drv ? passthru then drv.passthru else {}; } // + (drv.passthru or {}) + // (if (drv ? crossDrv && drv ? nativeDrv) then { crossDrv = overrideDerivation drv.crossDrv f; nativeDrv = overrideDerivation drv.nativeDrv f; } - else { }); + else { })); # usage: (you can use override multiple times) diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix index 6d026efa005a584e1db75a428a9d6210b09ae3d6..b2310d62ecb36f042a8c9de925e30fd40df83c6c 100644 --- a/pkgs/lib/maintainers.nix +++ b/pkgs/lib/maintainers.nix @@ -13,6 +13,7 @@ aszlig = "aszlig "; bbenoist = "Baptist BENOIST "; bjg = "Brian Gough "; + bjornfor = "Bjørn Forsman "; bluescreen303 = "Mathijs Kwik "; chaoflow = "Florian Friesdorf "; coconnor = "Corey O'Connor "; @@ -26,7 +27,6 @@ ludo = "Ludovic Courtès "; marcweber = "Marc Weber "; mornfall = "Petr Ročkai "; - the-kenny = "Moritz Ulrich "; neznalek = "Vladimír Čunát "; orbitz = "Malcolm Matalka "; page = "Carles Pagès "; @@ -43,6 +43,7 @@ simons = "Peter Simons "; smironov = "Sergey Mironov "; thammers = "Tobias Hammerschmidt "; + the-kenny = "Moritz Ulrich "; urkud = "Yury G. Kudryashov "; viric = "Lluís Batlle i Rossell "; winden = "Antonio Vargas Gonzalez "; diff --git a/pkgs/lib/misc.nix b/pkgs/lib/misc.nix index 19e5081009de834897c1cec27eba01ee8a902e5b..0f4c0d0de95331748f2e1ffbb8a7dcd0fe4988ca 100644 --- a/pkgs/lib/misc.nix +++ b/pkgs/lib/misc.nix @@ -315,8 +315,6 @@ rec { ) ]; mergeAttrsByFuncDefaults = foldl mergeAttrByFunc { inherit mergeAttrBy; }; - mergeAttrsByFuncDefaultsClean = list: removeAttrs (mergeAttrsByFuncDefaults list) ["mergeAttrBy"]; - # merge attrs based on version key into mkDerivation args, see mergeAttrBy to learn about smart merge defaults # # This function is best explained by an example: @@ -358,8 +356,7 @@ rec { # sane defaults (same name as attr name so that inherit can be used) mergeAttrBy = # { buildInputs = concatList; [...]; passthru = mergeAttr; [..]; } - listToAttrs (map (n : nameValuePair n lib.concat) - [ "nativeBuildInputs" "buildInputs" "propagatedBuildInputs" "configureFlags" "prePhases" "postAll" "patches" ]) + listToAttrs (map (n : nameValuePair n lib.concat) [ "nativeBuildInputs" "buildInputs" "propagatedBuildInputs" "configureFlags" "prePhases" "postAll" ]) // listToAttrs (map (n : nameValuePair n lib.mergeAttrs) [ "passthru" "meta" "cfg" "flags" ]) // listToAttrs (map (n : nameValuePair n (a: b: "${a}\n${b}") ) [ "preConfigure" "postInstall" ]) ; diff --git a/pkgs/lib/strings.nix b/pkgs/lib/strings.nix index ed668e2b9270d643066f38840a46372c7168a592..6c4adfaa1a717d337273acfa5645912ab1c7cc83 100644 --- a/pkgs/lib/strings.nix +++ b/pkgs/lib/strings.nix @@ -109,13 +109,6 @@ rec { stringAsChars subst s; - # Case conversion utilities - lowerChars = stringToCharacters "abcdefghijklmnopqrstuvwxyz"; - upperChars = stringToCharacters "ABCDEFGHIJKLMNOPQRSTUVWXYZ"; - toLower = replaceChars upperChars lowerChars; - toUpper = replaceChars lowerChars upperChars; - - # Compares strings not requiring context equality # Obviously, a workaround but works on all Nix versions eqStrings = a: b: (a+(substring 0 0 b)) == ((substring 0 0 a)+b); diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index ad25b4180b5bbee0c81ec11c5e675c20fb29987b..6cc13aa3013a054cf5589df0ecab31ef773f2cd9 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { }; buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb1 ] - ++ stdenv.lib.optionals stdenv.isLinux [ pam dbus.libs acl ] ; + ++ stdenv.lib.optionals stdenv.isLinux [ pam dbus acl ] ; propagatedBuildInputs = [ openssl ]; diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix index b6013b5eb4d5a9a18db9aa8e9b61bd60e3f611a7..11402ca740f06ed8d1a706c249ebb888cb321e05 100644 --- a/pkgs/misc/emulators/wine/default.nix +++ b/pkgs/misc/emulators/wine/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, xlibs, flex, bison, mesa, alsaLib , ncurses, libpng, libjpeg, lcms, freetype, fontconfig, fontforge -, libxml2, libxslt, openssl, gnutls, cups, libdrm +, libxml2, libxslt, openssl, gnutls, cups }: assert stdenv.isLinux; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { # them to the RPATH so that the user doesn't have to set them in # LD_LIBRARY_PATH. NIX_LDFLAGS = map (path: "-rpath ${path}/lib ") [ - freetype fontconfig stdenv.gcc.gcc mesa libdrm + freetype fontconfig stdenv.gcc.gcc mesa mesa.libdrm xlibs.libXinerama xlibs.libXrender xlibs.libXrandr xlibs.libXcursor xlibs.libXcomposite libpng libjpeg openssl gnutls cups diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index cf2c40f785e0a7d190ffcba51fff10be72d3ea6d..ac171b2ff814dccd9276038e7cb2346db09e47cd 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -1,5 +1,4 @@ -{ stdenv, fetchurl, libjpeg, libpng, libtiff, zlib, pkgconfig, fontconfig, openssl -, lcms2, freetype, libpaper, jbig2dec, expat +{ stdenv, fetchurl, libjpeg, libpng, libtiff, zlib, pkgconfig, fontconfig, openssl, lcms, freetype , x11Support, x11 ? null , cupsSupport ? false, cups ? null , gnuFork ? true @@ -9,7 +8,7 @@ assert x11Support -> x11 != null; assert cupsSupport -> cups != null; let - meta_common = { + meta = { homepage = "http://www.gnu.org/software/ghostscript/"; description = "GNU Ghostscript, a PostScript interpreter"; @@ -35,28 +34,25 @@ let sha256 = "0zqa6ggbkdqiszsywgrra4ij0sddlmrfa50bx2mh568qid4ga0a2"; }; - meta = meta_common; + inherit meta; patches = [ ./purity.patch ]; }; - mainlineSrc = rec { - name = "ghostscript-9.06"; + mainlineSrc = { + name = "ghostscript-9.05"; src = fetchurl { - url = "http://downloads.ghostscript.com/public/${name}.tar.bz2"; - sha256 = "014f10rxn4ihvcr1frby4szd1jvkrwvmdhnbivpp55c9fssx3b05"; + url = "http://downloads.ghostscript.com/public/ghostscript-9.05.tar.bz2"; + sha256 = "1b6fi76x6pn9dmr9k9lh8kimn968dmh91k824fmm59d5ycm22h8g"; }; - meta = meta_common // { + meta = meta // { homepage = "http://www.ghostscript.com/"; description = "GPL Ghostscript, a PostScript interpreter"; }; preConfigure = '' - rm -R libpng jpeg lcms{,2} tiff freetype jbig2dec expat jasper openjpeg - - substituteInPlace base/unix-aux.mak --replace "INCLUDE=/usr/include" "INCLUDE=/no-such-path" - sed "s@if ( test -f \$(INCLUDE)[^ ]* )@if ( true )@" -i base/unix-aux.mak + rm -R libpng jpeg lcms tiff freetype ''; - patches = []; + patches = [ ./purity-9.05.patch ]; }; variant = if gnuFork then gnuForkSrc else mainlineSrc; @@ -68,8 +64,8 @@ stdenv.mkDerivation rec { fonts = [ (fetchurl { - url = "mirror://sourceforge/gs-fonts/ghostscript-fonts-std-8.11.tar.gz"; - sha256 = "00f4l10xd826kak51wsmaz69szzm2wp8a41jasr4jblz25bg7dhf"; + url = "mirror://gnu/ghostscript/gnu-gs-fonts-std-6.0.tar.gz"; + sha256 = "1lxr1y52r26qjif8kdqkfhsb5llakdcx3f5b9ppdyn59bb83ivsc"; }) (fetchurl { url = "mirror://gnu/ghostscript/gnu-gs-fonts-other-6.0.tar.gz"; @@ -78,13 +74,9 @@ stdenv.mkDerivation rec { # ... add other fonts here ]; - buildInputs = [ - libjpeg libpng libtiff zlib pkgconfig fontconfig openssl lcms2 - libpaper jbig2dec expat - ] ++ stdenv.lib.optionals x11Support [x11 freetype] - ++ stdenv.lib.optional cupsSupport cups - # [] # maybe sometimes jpeg2000 support - ; + buildInputs = [libjpeg libpng libtiff zlib pkgconfig fontconfig openssl lcms] + ++ stdenv.lib.optionals x11Support [x11 freetype] + ++ stdenv.lib.optional cupsSupport cups; CFLAGS = "-fPIC"; NIX_LDFLAGS = @@ -100,7 +92,7 @@ stdenv.mkDerivation rec { makeFlagsArray=(CUPSSERVERBIN=$out/lib/cups CUPSSERVERROOT=$out/etc/cups CUPSDATA=$out/share/cups) '' + stdenv.lib.optionalString (variant ? preConfigure) variant.preConfigure; - configureFlags = [ "--with-system-libtiff" ] ++ + configureFlags = (if x11Support then [ "--with-x" ] else [ "--without-x" ]) ++ (if cupsSupport then [ "--enable-cups" "--with-install-cups" ] else [ "--disable-cups" ]); @@ -108,7 +100,6 @@ stdenv.mkDerivation rec { installTargets="install soinstall"; - # ToDo: web says the fonts should be already included postInstall = '' for i in $fonts; do (cd $out/share/ghostscript && tar xvfz $i) diff --git a/pkgs/misc/ghostscript/purity-9.05.patch b/pkgs/misc/ghostscript/purity-9.05.patch new file mode 100644 index 0000000000000000000000000000000000000000..cae9df7110ba550ede3c61fb609c5bd5df6a0166 --- /dev/null +++ b/pkgs/misc/ghostscript/purity-9.05.patch @@ -0,0 +1,27 @@ +diff --git a/base/unix-aux.mak b/base/unix-aux.mak +index 18745bc..0a67942 100644 +--- a/base/unix-aux.mak ++++ b/base/unix-aux.mak +@@ -111,15 +111,15 @@ $(MKROMFS_XE): $(MKROMFS_XE)_$(SHARE_ZLIB) $(MAKEDIRS) + # The "else true;" is required because Ultrix's implementation of sh -e + # terminates execution of a command if any error occurs, even if the command + # traps the error with ||. +-INCLUDE=/usr/include ++INCLUDE=/no-such-path + $(gconfig__h): $(UNIX_AUX_MAK) $(ECHOGS_XE) + $(ECHOGS_XE) -w $(gconfig__h) -x 2f2a -s This file was generated automatically by unix-aux.mak. -s -x 2a2f +- if ( test -f $(INCLUDE)/dirent.h ); then $(ECHOGS_XE) -a $(gconfig__h) -x 23 define HAVE_DIRENT_H; else true; fi +- if ( test -f $(INCLUDE)/ndir.h ); then $(ECHOGS_XE) -a $(gconfig__h) -x 23 define HAVE_NDIR_H; else true; fi +- if ( test -f $(INCLUDE)/sys/dir.h ); then $(ECHOGS_XE) -a $(gconfig__h) -x 23 define HAVE_SYS_DIR_H; else true; fi +- if ( test -f $(INCLUDE)/sys/ndir.h ); then $(ECHOGS_XE) -a $(gconfig__h) -x 23 define HAVE_SYS_NDIR_H; else true; fi +- if ( test -f $(INCLUDE)/sys/time.h ); then $(ECHOGS_XE) -a $(gconfig__h) -x 23 ifndef HAVE_SYS_TIME_H ; \ ++ if ( true ); then $(ECHOGS_XE) -a $(gconfig__h) -x 23 define HAVE_DIRENT_H; else true; fi ++ if ( true ); then $(ECHOGS_XE) -a $(gconfig__h) -x 23 define HAVE_NDIR_H; else true; fi ++ if ( true ); then $(ECHOGS_XE) -a $(gconfig__h) -x 23 define HAVE_SYS_DIR_H; else true; fi ++ if ( true ); then $(ECHOGS_XE) -a $(gconfig__h) -x 23 define HAVE_SYS_NDIR_H; else true; fi ++ if ( true ); then $(ECHOGS_XE) -a $(gconfig__h) -x 23 ifndef HAVE_SYS_TIME_H ; \ + $(ECHOGS_XE) -a $(gconfig__h) -x 23 define HAVE_SYS_TIME_H ; \ + $(ECHOGS_XE) -a $(gconfig__h) -x 23 endif; else true; fi +- if ( test -f $(INCLUDE)/sys/times.h ); then $(ECHOGS_XE) -a $(gconfig__h) -x 23 define HAVE_SYS_TIMES_H; else true; fi ++ if ( true ); then $(ECHOGS_XE) -a $(gconfig__h) -x 23 define HAVE_SYS_TIMES_H; else true; fi + if ( test -f $(JSRCDIR)/jmemsys.h); then true; else $(ECHOGS_XE) -a $(gconfig__h) -x 23 define DONT_HAVE_JMEMSYS_H; fi diff --git a/pkgs/misc/lilypond/default.nix b/pkgs/misc/lilypond/default.nix index 65575af4c3920853163448e8e2b9416d3a6b1ac6..6d5d87faad6e0b37a39a0df962206969d6f54062 100644 --- a/pkgs/misc/lilypond/default.nix +++ b/pkgs/misc/lilypond/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, ghostscript, texinfo, imagemagick, texi2html, guile , python, gettext, flex, perl, bison, pkgconfig, texLive, dblatex , fontconfig, freetype, pango, fontforge, help2man, zip, netpbm, groff -, fetchsvn }: +, fetchsvn, makeWrapper }: stdenv.mkDerivation rec{ - majorVersion="2.14"; + majorVersion="2.16"; minorVersion="2"; version="${majorVersion}.${minorVersion}"; name = "lilypond-${version}"; @@ -16,21 +16,23 @@ stdenv.mkDerivation rec{ src = fetchurl { url = "http://download.linuxaudio.org/lilypond/sources/v${majorVersion}/lilypond-${version}.tar.gz"; - # 2.15.42 - # sha256 = "0cm2fq1cr9d24w5xkz6ik6qnby516dfahz4cw47xx8mb5qsa4drd"; - sha256 = "15i6k3fjc29wvchayn31khxhpppzd4g6ivbk7l43fakj8lw6nfi4"; + sha256 = "1jx11bk3rk3w7bnh0829yy280627ywsvwg6fhdm0fqwkiz7jchqz"; }; preConfigure='' sed -e "s@mem=mf2pt1@mem=$PWD/mf/mf2pt1@" -i scripts/build/mf2pt1.pl ''; + postInstall = '' + for f in $out/bin/*; do wrapProgram $f --set GUILE_AUTO_COMPILE 0; done + ''; + configureFlags = [ "--disable-documentation" "--with-ncsb-dir=${urwfonts}"]; buildInputs = [ ghostscript texinfo imagemagick texi2html guile dblatex zip netpbm python gettext flex perl bison pkgconfig texLive fontconfig freetype pango - fontforge help2man groff + fontforge help2man groff makeWrapper ]; meta = { diff --git a/pkgs/misc/my-env/default.nix b/pkgs/misc/my-env/default.nix index e89a8ebb230d0efa4ff302519335baa80c6af9c2..ac2dc7f8cda50fbfb944137f8c86b1914e575f7f 100644 --- a/pkgs/misc/my-env/default.nix +++ b/pkgs/misc/my-env/default.nix @@ -135,6 +135,7 @@ mkDerivation { ${extraCmds} nix_cleanup() { + : ${cleanupCmds} } diff --git a/pkgs/misc/themes/gnome-themes-standard/default.nix b/pkgs/misc/themes/gnome-themes-standard/default.nix deleted file mode 100644 index f52b94138a48c64836c6bdc7e19d3aa007238cf8..0000000000000000000000000000000000000000 --- a/pkgs/misc/themes/gnome-themes-standard/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ stdenv, fetchurl, intltool, gtk3, librsvg, pkgconfig, pango, atk, gtk2, gdk_pixbuf }: -stdenv.mkDerivation { - name = "gnome-themes-standard"; - src = fetchurl { - url = "http://ftp.gnome.org/pub/GNOME/sources/gnome-themes-standard/3.7/gnome-themes-standard-3.7.92.tar.xz"; - sha256 = "0a1ed83c07f57b5b45b8f3817ca0ca14feecb56de505243c086fb306c88da8de"; - }; - - buildInputs = [ intltool gtk3 librsvg pkgconfig pango atk gtk2 gdk_pixbuf ]; - - preConfigure = '' - cat ${gdk_pixbuf}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache ${librsvg}/lib/gdk-pixbuf/loaders.cache > loaders.cache - export GDK_PIXBUF_MODULE_FILE=`readlink -e loaders.cache` - ''; -} \ No newline at end of file diff --git a/pkgs/os-specific/linux/apparmor/capability.patch b/pkgs/os-specific/linux/apparmor/capability.patch new file mode 100644 index 0000000000000000000000000000000000000000..c8f2b511d9579fc5b5c3b62bddb3dceb90017933 --- /dev/null +++ b/pkgs/os-specific/linux/apparmor/capability.patch @@ -0,0 +1,16 @@ +Description: allow parser to build even when not on Linux. +Author: Kees Cook + +Index: apparmor-debian/common/Make.rules +=================================================================== +--- apparmor-debian.orig/common/Make.rules 2012-05-05 14:41:25.967259523 -0700 ++++ apparmor-debian/common/Make.rules 2012-05-05 14:41:28.451291053 -0700 +@@ -160,7 +160,7 @@ + CAPABILITIES=$(shell echo "\#include " | cpp -dM | LC_ALL=C sed -n -e '/CAP_EMPTY_SET/d' -e 's/^\#define[ \t]\+CAP_\([A-Z0-9_]\+\)[ \t]\+\([0-9xa-f]\+\)\(.*\)$$/CAP_\1/p' | sort) + + .PHONY: list_capabilities +-list_capabilities: /usr/include/linux/capability.h ++list_capabilities: + @echo "$(CAPABILITIES)" + + # ===================== diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix index 8a7d2b9e4581345f1c675b696f9455c4bb0ea059..da71eb8c7095a9a2ecfdada287bdd993288a7a45 100644 --- a/pkgs/os-specific/linux/apparmor/default.nix +++ b/pkgs/os-specific/linux/apparmor/default.nix @@ -1,34 +1,44 @@ { stdenv, fetchurl , autoconf, automake, libtool, makeWrapper -, perl, bison, flex, glibc, gettext, which, rpm, tetex, LocaleGettext, bash, pam, TermReadKey, RpcXML, swig}: +, perl, bison, flex, glibc, gettext, which, rpm, tetex, LocaleGettext +, bash, pam, TermReadKey, RpcXML, swig, python}: stdenv.mkDerivation rec { name = "apparmor-${version}"; - version = "2.6.1"; + version = "2.8.1"; src = fetchurl { - url = "http://launchpad.net/apparmor/2.6/2.6.1/+download/${name}.tar.gz"; - sha256 = "1x7225xgzyc5agbn41xsip236anr1kmaw70xc94pag82q7c1bc4w"; + url = "http://launchpad.net/apparmor/2.8/${version}/+download/${name}.tar.gz"; + sha256 = "1r0a5k14jbiik28m5gql0f3dbxl252jya7i120rrsbzqqnvw6nw7"; }; - buildInputs = [ autoconf automake libtool perl bison flex gettext which rpm tetex LocaleGettext pam TermReadKey RpcXML swig makeWrapper ]; + buildInputs = [ + autoconf automake libtool perl bison flex gettext which rpm tetex + LocaleGettext pam TermReadKey RpcXML swig makeWrapper python ]; prePatch = '' substituteInPlace libraries/libapparmor/src/Makefile.in --replace "/usr/include" "${glibc}/include" substituteInPlace libraries/libapparmor/src/Makefile.am --replace "/usr/include" "${glibc}/include" substituteInPlace common/Make.rules --replace "/usr/bin/pod2man" "${perl}/bin/pod2man" substituteInPlace common/Make.rules --replace "/usr/bin/pod2html" "${perl}/bin/pod2html" + substituteInPlace common/Make.rules --replace "cpp -dM" "cpp -dM -I${glibc}/include" substituteInPlace parser/Makefile --replace "/usr/bin/bison" "${bison}/bin/bison" substituteInPlace parser/Makefile --replace "/usr/bin/flex" "${flex}/bin/flex" substituteInPlace parser/Makefile --replace "/usr/include/bits/socket.h" "${glibc}/include/bits/socket.h" substituteInPlace parser/Makefile --replace "/usr/include/linux/capability.h" "${glibc}/include/linux/capability.h" + #substituteInPlace parser/utils/vim/Makefile --replace "/usr/include/linux/capability.h" "${glibc}/include/linux/capability.h" + + # for some reason pdf documentation doesn't build + substituteInPlace parser/Makefile --replace "manpages htmlmanpages pdf" "manpages htmlmanpages" substituteInPlace parser/tst/gen-xtrans.pl --replace "/usr/bin/perl" "${perl}/bin/perl" substituteInPlace parser/tst/Makefile --replace "/usr/bin/prove" "${perl}/bin/prove" substituteInPlace parser/tst/Makefile --replace "./caching.sh" "${bash}/bin/bash ./caching.sh" ''; + patches = ./capability.patch; + buildPhase ='' PERL5LIB=$PERL5LIB:$out/lib/perl5/site_perl:$out/lib @@ -41,7 +51,7 @@ stdenv.mkDerivation rec { ensureDir $out/lib/perl5/site_perl/ cp swig/perl/LibAppArmor.pm $out/lib/perl5/site_perl/ cp swig/perl/LibAppArmor.bs $out/lib/perl5/site_perl/ -# this is automatically copied elsewhere.... + # this is automatically copied elsewhere.... cd ../../utils make @@ -60,27 +70,18 @@ stdenv.mkDerivation rec { make install DESTDIR=$out cd ../../profiles -LD_LIBRARY_PATH=$out/lib make -#LD_LIBRARY_PATH=$out/lib make check # depends on the parser having been built first + LD_LIBRARY_PATH=$out/lib make + #LD_LIBRARY_PATH=$out/lib make check # depends on the parser having been built first make install DESTDIR=$out + cd .. + cp -r kernel-patches $out ''; installPhase = '' for i in $out/bin/*; do wrapProgram $i --prefix PERL5LIB : "$PERL5LIB:$out/lib/perl5/5.10.1/i686-linux-thread-multi/" done ''; - passthru = { - linux_2_6_37_patch = { - name= "apparmor"; - features.apparmor = true; - patch = [ - "${src}/kernel-patches/2.6.37/0001-AppArmor-compatibility-patch-for-v5-network-controll.patch" - "${src}/kernel-patches/2.6.37/0002-AppArmor-compatibility-patch-for-v5-interface.patch" - "${src}/kernel-patches/2.6.37/0003-AppArmor-Allow-dfa-backward-compatibility-with-broke.patch" - ]; - }; - }; meta = with stdenv.lib; { homepage = http://apparmor.net/; diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix index f6173fcf5f53626db3d68234970576bf01b21d78..6d921d553384bf41cd422c3ad4a41007f711faeb 100644 --- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix @@ -6,26 +6,25 @@ { stdenv, fetchurl, buildEnv, dpkg }: let - version = "0.36"; - + version = "0.38"; packages = [ - { name = "linux-nonfree"; sha256 = "668d262dfcf18ffef2fe2a0b853b81bf5855f49fd2133203cbda097b1507c953"; } - { name = "atheros"; sha256 = "27cbd2099ce28c742f42833b09a61bdc7fb5b2ebcf5b35a52e750160ea1001b6"; } - { name = "bnx2"; sha256 = "32730fdeb0fb15a36e0ca046bde69e1a6fece8561af57afc7d9f1cf978fd25ab"; } - { name = "bnx2x"; sha256 = "22f23f4abb4aa2dac22718f12cf3bbd3fd2d63870b13e81c8401e6f841a719e8"; } - { name = "brcm80211"; sha256 = "17055c4199cc7e2aaa7d1d76dd5e718d24dbebb84020bb2d95ffab03bcfc7e8a"; } - { name = "intelwimax"; sha256 = "cc1b894990d3074e93b3f79b2b617614aab554b5e832d34993b5a16f64bdb84a"; } - { name = "ipw2x00"; sha256 = "2ef0810e2e037f7d536b24cc35527c456ff13b7aa5fd2df607b7035227553c9d"; } - { name = "ivtv"; sha256 = "7bf30e142679d53ad376002f29026bbe28de51e1cb71bcc3ec5c5f5f119a7118"; } - { name = "iwlwifi"; sha256 = "46ce0915583674ec10bfde3840b66ff450237edf604804ff51b9872fe767c1bb"; } - { name = "libertas"; sha256 = "c5d370d244f1c3a42f0a0280ed0cab067dbf36fa2926d387c9d10cf4ccd1b000"; } - { name = "linux"; sha256 = "e19bedc2cacf2cd7a1fc38e25820effe9e58fdc56608e9f7c320c85b80cba6ea"; } - { name = "myricom"; sha256 = "038bd618c00e852206a8a1443ba47ea644c04052bd8f10af9392c716ebf16b3c"; } - { name = "netxen"; sha256 = "29e3c1707dab6439f391318a223e5d4b6508d493c8d8bad799aef4f35b4704e7"; } - { name = "qlogic"; sha256 = "cc43c6016f2b7661d39e1d678ac0e8ca70081be8a0c76c2ec4d2e71493afa7d8"; } - { name = "ralink"; sha256 = "4db8dc6b98821c59f008c8bf7464317443b031cebf6d7e56c06f0824e69e3922"; } - { name = "realtek"; sha256 = "c39e65e5a589325ceb365d11b9ea10b0244134b7e5b3b05fd91fe6ad66b2f093"; } + { name = "ipw2x00"; sha256 = "1bdial90l1928sfw3j1fz5cbsav8lz9riv38d02bawq9rzvb5dx0"; } + { name = "bnx2x"; sha256 = "1a8jwwa6yldj2pgnsghhdkb8c0s64wzg0vx8y3cj11lhbh2ag2i7"; } + { name = "linux-nonfree"; sha256 = "0dr91sswvkh0lk80d6byxjavkqcsickqf8xqhdd82j9mm7bjg7ld"; } + { name = "intelwimax"; sha256 = "1156c7a301lk2a4d699dmvwzh4k3rfbxl4fx4raafy8a15lbw8mn"; } + { name = "iwlwifi"; sha256 = "1q6gl2x4lj83hn8acamlj7s4j8vjd02798a6i52f4r7x0042f58a"; } + { name = "bnx2"; sha256 = "0rpsrmywh97azqmsx4qgxyqcvdn5414m9cg92pd7h9xfmm38nscd"; } + { name = "qlogic"; sha256 = "02438jzzybicg0bvl2jc3qnn0r4f1pfpyxbf70cmas9sfxb7s3az"; } + { name = "libertas"; sha256 = "0b8n1igx6hpxlav73xs8r6qs2v95r9hx4lqqzy0h5iy7md9xs9y4"; } + { name = "ivtv"; sha256 = "1vb1jbxdggy2vj1xlncfzyynpra1y62bb3n30ybafjnx88p6f2hi"; } + { name = "linux"; sha256 = "0ijd49rf7cg0lniqm9sqz2g4i9jmc9vyz6wv9jlwrvnbl8hhy5vy"; } + { name = "netxen"; sha256 = "19d5d3ibhb22p4mh22lnl441v8xyb1pyfi5h36vsjpccivzkgd2f"; } + { name = "myricom"; sha256 = "0vq2rvc71j96q684r1bh0528xnrxa1xzh2sdhqfrgip9ihdsp3ml"; } + { name = "atheros"; sha256 = "04zy5j48b83garmnfxiqgmm3yv1pfpbldxp69zm24pfxcwyvx3hm"; } + { name = "brcm80211"; sha256 = "0kgw6q18i46npmjxv4ymww8dr7nn140xrrqjrbnfhzgha3y2yylg"; } + { name = "ralink"; sha256 = "0kbzbc4vpn6mvvkm4q7mfqg0bsj6akfpypxk98s7kbidmyj577q2"; } + { name = "realtek"; sha256 = "1ac9vlrzprp0j2mdmp1zi47wg2i76vmi288sm3vwlvp4s6ymm077"; } ]; fetchPackage = @@ -61,7 +60,7 @@ in stdenv.mkDerivation { meta = { description = "Binary firmware collection packaged by Debian"; homepage = "http://packages.debian.org/sid/firmware-linux-nonfree"; - license = "unfree-redistributable-firmware"; + license = stdenv.lib.licenses.unfreeRedistributable; priority = 10; # low priority so that other packages can override this big package }; } diff --git a/pkgs/os-specific/linux/kernel/linux-3.0.nix b/pkgs/os-specific/linux/kernel/linux-3.0.nix index 0ec7138915fc606881d2a467b0ed8be8e36e615e..1f9bffae6d29598dc1b2cc6321f1c32dcdc83156 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.0.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.0.nix @@ -231,7 +231,7 @@ in import ./generic.nix ( rec { - version = "3.0.77"; + version = "3.0.78"; preConfigure = '' substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' "" @@ -239,7 +239,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "15v4csqxf5mzz8rgrrrhv5x6ggi16ahfyha63cgvsnjzg643ix78"; + sha256 = "0jgarhjllxygxsj2kph61pf9jvlab4pnp7n4kb9l0lfj3y0crx04"; }; config = configWithPlatform stdenv.platform; diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix index ef62fae3f5287ebfcf98c6d79b256ffaef56133f..b3c478c5086ac1ccdc2f85602eb31fe24d359e85 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix @@ -240,7 +240,7 @@ in import ./generic.nix ( rec { - version = "3.2.44"; + version = "3.2.45"; modDirVersion = version; @@ -250,7 +250,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.0/linux-${version}.tar.xz"; - sha256 = "1rlv4j0y75ymj74vwdd2m0z3jzn5lxk1g4cliqmambhycg5jxlb0"; + sha256 = "0mhq64rvzf5bll7xxffajjl7p38szbc13jsr6zh34x3qfzf3abhr"; }; config = configWithPlatform stdenv.platform; diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix index 142a0395673617dad021daad062c0988679c12f1..aba9ded036647fd4665acb0910c14f86ac75a77f 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -163,6 +163,7 @@ let AIC79XX_DEBUG_ENABLE n AIC7XXX_DEBUG_ENABLE n AIC94XX_DEBUG n + AUDIT_LOGINUID_IMMUTABLE y B43_PCMCIA y BLK_DEV_CMD640_ENHANCED y # CMD640 enhanced support BLK_DEV_IDEACPI y # IDE ACPI support @@ -245,7 +246,7 @@ in import ./generic.nix ( rec { - version = "3.4.44"; + version = "3.4.45"; testing = false; preConfigure = '' @@ -254,7 +255,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "08nc81dmc00gp04br8fpxj9ixgg90qlc0pmlh589vva02srcxn0m"; + sha256 = "13qli7s5i3zq76xsww05s89gm6mkvpf1fjxbka0fddzvmwzw9jav"; }; config = configWithPlatform stdenv.platform; diff --git a/pkgs/os-specific/linux/kernel/linux-3.7.nix b/pkgs/os-specific/linux/kernel/linux-3.7.nix index ac49774b8185c7b507c3f4b4923834ee90c9481a..8f77334901dd052903f92676b9ab6cd43b2ef9c3 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.7.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.7.nix @@ -164,6 +164,7 @@ let AIC79XX_DEBUG_ENABLE n AIC7XXX_DEBUG_ENABLE n AIC94XX_DEBUG n + AUDIT_LOGINUID_IMMUTABLE y B43_PCMCIA y BLK_DEV_CMD640_ENHANCED y # CMD640 enhanced support BLK_DEV_IDEACPI y # IDE ACPI support @@ -214,8 +215,8 @@ let # Linux Containers RT_GROUP_SCHED? y CGROUP_DEVICE? y - CGROUP_MEM_RES_CTLR? y - CGROUP_MEM_RES_CTLR_SWAP? y + MEMCG? y + MEMCG_SWAP? y DEVPTS_MULTIPLE_INSTANCES? y # Enable staging drivers. These are somewhat experimental, but diff --git a/pkgs/os-specific/linux/kernel/linux-3.8.nix b/pkgs/os-specific/linux/kernel/linux-3.8.nix index 1f39fac8ec949c4b1c233d0545e747d6ffdf3756..6681438edd5929b0cd98e979699bb50ca867e6c5 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.8.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.8.nix @@ -164,6 +164,7 @@ let AIC79XX_DEBUG_ENABLE n AIC7XXX_DEBUG_ENABLE n AIC94XX_DEBUG n + AUDIT_LOGINUID_IMMUTABLE y B43_PCMCIA y BLK_DEV_CMD640_ENHANCED y # CMD640 enhanced support BLK_DEV_IDEACPI y # IDE ACPI support @@ -214,8 +215,8 @@ let # Linux Containers RT_GROUP_SCHED? y CGROUP_DEVICE? y - CGROUP_MEM_RES_CTLR? y - CGROUP_MEM_RES_CTLR_SWAP? y + MEMCG? y + MEMCG_SWAP? y DEVPTS_MULTIPLE_INSTANCES? y # Enable staging drivers. These are somewhat experimental, but @@ -237,6 +238,9 @@ let DEVTMPFS y # Media support + MEDIA_SUPPORT y + MEDIA_DIGITAL_TV_SUPPORT y + MEDIA_CAMERA_SUPPORT? y MEDIA_RC_SUPPORT? y MEDIA_USB_SUPPORT y @@ -252,7 +256,7 @@ in import ./generic.nix ( rec { - version = "3.8.12"; + version = "3.8.13"; testing = false; preConfigure = '' @@ -261,7 +265,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "1vhimxcxl6scifbg6pgdljx093bldgsqi19980447pbp4zn2zzmv"; + sha256 = "0pznsj89020fjl8dhcyf7r5bh95b27727gs0ri9has4i2z63blbw"; }; config = configWithPlatform stdenv.platform; diff --git a/pkgs/os-specific/linux/kernel/linux-3.9.nix b/pkgs/os-specific/linux/kernel/linux-3.9.nix index b4873b099eaea2dd9dc25731fa35538c1fa93469..cd5156c3e50d0c4e19f53d55abbf4688e3ea17eb 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.9.nix @@ -164,6 +164,7 @@ let AIC79XX_DEBUG_ENABLE n AIC7XXX_DEBUG_ENABLE n AIC94XX_DEBUG n + AUDIT_LOGINUID_IMMUTABLE y B43_PCMCIA y BLK_DEV_CMD640_ENHANCED y # CMD640 enhanced support BLK_DEV_IDEACPI y # IDE ACPI support @@ -214,8 +215,8 @@ let # Linux Containers RT_GROUP_SCHED? y CGROUP_DEVICE? y - CGROUP_MEM_RES_CTLR? y - CGROUP_MEM_RES_CTLR_SWAP? y + MEMCG? y + MEMCG_SWAP? y DEVPTS_MULTIPLE_INSTANCES? y # Enable staging drivers. These are somewhat experimental, but @@ -252,7 +253,7 @@ in import ./generic.nix ( rec { - version = "3.9.1"; + version = "3.9.3"; testing = false; preConfigure = '' @@ -261,7 +262,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "0ax06wb00lk3rf5xxw907l0m9s4pypnnjvp0qgnc7il0jnvcsd0c"; + sha256 = "0hc82w3rg1ykpkq7na44vqa4b9zymvpl05kc7a3lpgmd1j3n3sw9"; }; config = configWithPlatform stdenv.platform; diff --git a/pkgs/os-specific/linux/kernel/linux-rpi-3.6.nix b/pkgs/os-specific/linux/kernel/linux-rpi-3.6.nix index b425f2792b4bda98603a7f23213e89535a9d7356..cf88544abd5a9443c1f218e41c80fd0885953788 100644 --- a/pkgs/os-specific/linux/kernel/linux-rpi-3.6.nix +++ b/pkgs/os-specific/linux/kernel/linux-rpi-3.6.nix @@ -36,6 +36,8 @@ import ./generic.nix ( #features.needsCifsUtils = true; #features.canDisableNetfilterConntrackHelpers = true; #features.netfilterRPFilter = true; + + extraMeta.platforms = []; } // removeAttrs args ["extraConfig"] diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 0c5109c9834a33fb17d2f38c0547e7c8b95b00b5..73146d8b67d2813c9bb2b2c35de8a3655f386555 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchgit }: +{ stdenv, fetchurl, fetchgit, apparmor }: let @@ -36,10 +36,25 @@ let ''; }; + makeAppArmorPatch = {apparmor, version}: + stdenv.mkDerivation { + name = "apparmor-${version}.patch"; + phases = ["installPhase"]; + installPhase = '' + cat ${apparmor}/kernel-patches/${version}/* > $out + ''; + }; in rec { + apparmor_3_2 = rec { + version = "3.2"; + name = "apparmor-${version}"; + patch = makeAppArmorPatch { inherit apparmor version; }; + features.apparmor = true; + }; + sec_perm_2_6_24 = { name = "sec_perm-2.6.24"; patch = ./sec_perm-2.6.24.patch; diff --git a/pkgs/os-specific/linux/netatop/default.nix b/pkgs/os-specific/linux/netatop/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..4ca8235f3aeab582eb65e74385d572de2b0b5838 --- /dev/null +++ b/pkgs/os-specific/linux/netatop/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, kernelDev, zlib }: + +stdenv.mkDerivation { + name = "netatop-${kernelDev.version}-0.2"; + + src = fetchurl { + url = http://www.atoptool.nl/download/netatop-0.2.tar.gz; + sha256 = "0ya4qys2qpw080sbgixyx1kawdx1c3smnxwmqcchn0hg9hhndvc0"; + }; + + buildInputs = [ zlib ]; + + preConfigure = '' + patchShebangs mkversion + sed -i -e 's,^KERNDIR.*,KERNDIR=${kernelDev}/lib/modules/${kernelDev.modDirVersion}/build,' \ + */Makefile + sed -i -e 's,/lib/modules.*extra,'$out'/lib/modules/${kernelDev.modDirVersion}/extra,' \ + -e s,/usr,$out, \ + -e /init.d/d \ + -e /depmod/d \ + Makefile + ''; + + preInstall = '' + ensureDir $out/bin $out/share/man/man{4,8} + ensureDir $out/lib/modules/${kernelDev.modDirVersion}/extra + ''; + + meta = { + description = "Network monitoring module for atop"; + homepage = http://www.atoptool.nl/downloadnetatop.php; + license = "GPL2"; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [viric]; + }; +} diff --git a/pkgs/os-specific/linux/nss_ldap/crashes.patch b/pkgs/os-specific/linux/nss_ldap/crashes.patch new file mode 100644 index 0000000000000000000000000000000000000000..48250141e82af99dcf2b61377a7040d1e0273ba5 --- /dev/null +++ b/pkgs/os-specific/linux/nss_ldap/crashes.patch @@ -0,0 +1,104 @@ +https://bugzilla.redhat.com/show_bug.cgi?id=488857 + + +Distinguish between contexts that are somewhat persistent and one-offs +which are used to fulfill part of a larger request. + +diff -up nss_ldap-253/ldap-grp.c nss_ldap-253/ldap-grp.c +--- nss_ldap-253/ldap-grp.c 2009-05-08 13:30:43.000000000 -0400 ++++ nss_ldap-253/ldap-grp.c 2009-05-08 13:34:41.000000000 -0400 +@@ -857,7 +857,7 @@ ng_chase (const char *dn, ldap_initgroup + LA_STRING (a) = dn; + LA_TYPE (a) = LA_TYPE_STRING; + +- if (_nss_ldap_ent_context_init_locked (&ctx) == NULL) ++ if (_nss_ldap_ent_context_init_internal_locked (&ctx) == NULL) + { + return NSS_UNAVAIL; + } +@@ -930,7 +930,7 @@ ng_chase_backlink (const char ** members + LA_STRING_LIST (a) = filteredMembersOf; + LA_TYPE (a) = LA_TYPE_STRING_LIST_OR; + +- if (_nss_ldap_ent_context_init_locked (&ctx) == NULL) ++ if (_nss_ldap_ent_context_init_internal_locked (&ctx) == NULL) + { + free (filteredMembersOf); + return NSS_UNAVAIL; +diff -up nss_ldap-253/ldap-netgrp.c nss_ldap-253/ldap-netgrp.c +--- nss_ldap-253/ldap-netgrp.c 2009-05-08 13:31:35.000000000 -0400 ++++ nss_ldap-253/ldap-netgrp.c 2009-05-08 13:33:14.000000000 -0400 +@@ -691,7 +691,7 @@ do_innetgr_nested (ldap_innetgr_args_t * + LA_TYPE (a) = LA_TYPE_STRING; + LA_STRING (a) = nested; /* memberNisNetgroup */ + +- if (_nss_ldap_ent_context_init_locked (&ctx) == NULL) ++ if (_nss_ldap_ent_context_init_internal_locked (&ctx) == NULL) + { + debug ("<== do_innetgr_nested: failed to initialize context"); + return NSS_UNAVAIL; +diff -up nss_ldap-253/ldap-nss.c nss_ldap-253/ldap-nss.c +--- nss_ldap-253/ldap-nss.c 2009-05-08 13:27:17.000000000 -0400 ++++ nss_ldap-253/ldap-nss.c 2009-05-08 14:05:51.000000000 -0400 +@@ -1961,6 +1961,7 @@ _nss_ldap_ent_context_init_locked (ent_c + debug ("<== _nss_ldap_ent_context_init_locked"); + return NULL; + } ++ ctx->ec_internal = 0; + *pctx = ctx; + } + else +@@ -1990,6 +1991,15 @@ _nss_ldap_ent_context_init_locked (ent_c + + return ctx; + } ++ent_context_t * ++_nss_ldap_ent_context_init_internal_locked (ent_context_t ** pctx) ++{ ++ ent_context_t *ctx; ++ ctx = _nss_ldap_ent_context_init_locked (pctx); ++ if (ctx != NULL) ++ ctx->ec_internal = 1; ++ return ctx; ++} + + /* + * Clears a given context; we require the caller +@@ -2031,7 +2041,8 @@ _nss_ldap_ent_context_release (ent_conte + + LS_INIT (ctx->ec_state); + +- if (_nss_ldap_test_config_flag (NSS_LDAP_FLAGS_CONNECT_POLICY_ONESHOT)) ++ if (!ctx->ec_internal && ++ _nss_ldap_test_config_flag (NSS_LDAP_FLAGS_CONNECT_POLICY_ONESHOT)) + { + do_close (); + } +diff -up nss_ldap-253/ldap-nss.h nss_ldap-253/ldap-nss.h +--- nss_ldap-253/ldap-nss.h 2009-05-08 13:35:47.000000000 -0400 ++++ nss_ldap-253/ldap-nss.h 2009-05-08 13:52:25.000000000 -0400 +@@ -560,6 +560,8 @@ struct ent_context + ldap_state_t ec_state; /* eg. for services */ + int ec_msgid; /* message ID */ + LDAPMessage *ec_res; /* result chain */ ++ int ec_internal; /* this context is just a part of a larger ++ * query for information */ + ldap_service_search_descriptor_t *ec_sd; /* current sd */ + struct berval *ec_cookie; /* cookie for paged searches */ + }; +@@ -744,6 +746,15 @@ ent_context_t *_nss_ldap_ent_context_ini + ent_context_t *_nss_ldap_ent_context_init_locked (ent_context_t **); + + /* ++ * _nss_ldap_ent_context_init_internal_locked() has the same ++ * behaviour, except it marks the context as one that's being ++ * used to fetch additional data used in answering a request, i.e. ++ * that this isn't the "main" context ++ */ ++ ++ent_context_t *_nss_ldap_ent_context_init_internal_locked (ent_context_t **); ++ ++/* + * _nss_ldap_ent_context_release() is used to manually free a context + */ + void _nss_ldap_ent_context_release (ent_context_t *); diff --git a/pkgs/os-specific/linux/nss_ldap/default.nix b/pkgs/os-specific/linux/nss_ldap/default.nix index 7c8b526b4c3785f23eee9593b2699b6be38392d7..cc0382b58f4ec1dc985f4c4769fee9240a832018 100644 --- a/pkgs/os-specific/linux/nss_ldap/default.nix +++ b/pkgs/os-specific/linux/nss_ldap/default.nix @@ -1,13 +1,24 @@ -{stdenv, fetchurl, openldap}: +{stdenv, fetchurl, openldap, perl}: stdenv.mkDerivation { - name = "nss_ldap-260"; + name = "nss_ldap-265"; src = fetchurl { - url = http://www.padl.com/download/nss_ldap-260.tar.gz; - sha256 = "0kn022js39mqmy7g5ba911q46223vk7vcf51x28rbl86lp32zv4v"; + url = http://www.padl.com/download/nss_ldap-265.tar.gz; + sha256 = "1a16q9p97d2blrj0h6vl1xr7dg7i4s8x8namipr79mshby84vdbp"; }; + preConfigure = '' + patchShebangs ./vers_string + sed -i s,vers_string,./vers_string, Makefile* + ''; + + patches = [ ./crashes.patch ]; + + postPatch = '' + patch -p0 < ${./nss_ldap-265-glibc-2.16.patch} + ''; + preInstall = '' installFlagsArray=(INST_UID=$(id -u) INST_GID=$(id -g) LIBC_VERS=2.5 NSS_VERS=2 NSS_LDAP_PATH_CONF=$out/etc/ldap.conf) substituteInPlace Makefile \ @@ -16,5 +27,5 @@ stdenv.mkDerivation { mkdir -p $out/etc ''; - buildInputs = [openldap]; + buildInputs = [ openldap perl ]; } diff --git a/pkgs/os-specific/linux/nss_ldap/nss_ldap-265-glibc-2.16.patch b/pkgs/os-specific/linux/nss_ldap/nss_ldap-265-glibc-2.16.patch new file mode 100644 index 0000000000000000000000000000000000000000..8b0b9289327adcb172c803bf6b157ea4230cb928 --- /dev/null +++ b/pkgs/os-specific/linux/nss_ldap/nss_ldap-265-glibc-2.16.patch @@ -0,0 +1,139 @@ +https://github.com/archlinuxarm/PKGBUILDs/issues/296 + +Fixes the bug causing a segfault on nscd and sshd: +symbol lookup error: /usr/lib/libnss_ldap.so.2: undefined symbol: __libc_lock_lock + +--- ldap-nss.c.orig 2012-10-17 12:32:03.908730283 +0000 ++++ ldap-nss.c 2012-10-17 12:38:10.906767283 +0000 +@@ -148,7 +148,7 @@ + */ + static ldap_session_t __session = { NULL, NULL, 0, LS_UNINITIALIZED }; + +-#if defined(HAVE_PTHREAD_ATFORK) || defined(HAVE_LIBC_LOCK_H) || defined(HAVE_BITS_LIBC_LOCK_H) ++#if defined(HAVE_PTHREAD_ATFORK) || defined(HAVE___LIBC_ONCE) + static pthread_once_t __once = PTHREAD_ONCE_INIT; + #endif + +@@ -168,7 +168,7 @@ + static int __ssl_initialized = 0; + #endif /* HAVE_LDAPSSL_CLIENT_INIT */ + +-#if defined(HAVE_PTHREAD_ATFORK) || defined(HAVE_LIBC_LOCK_H) || defined(HAVE_BITS_LIBC_LOCK_H) ++#if defined(HAVE_PTHREAD_ATFORK) || defined(HAVE___LIBC_ONCE) + /* + * Prepare for fork(); lock mutex. + */ +@@ -519,7 +519,7 @@ + } + #endif /* HAVE_NSSWITCH_H */ + +-#if defined(HAVE_PTHREAD_ATFORK) || defined(HAVE_LIBC_LOCK_H) || defined(HAVE_BITS_LIBC_LOCK_H) ++#if defined(HAVE_PTHREAD_ATFORK) || defined(HAVE___LIBC_ONCE) + static void + do_atfork_prepare (void) + { +@@ -553,7 +553,7 @@ + #ifdef HAVE_PTHREAD_ATFORK + (void) pthread_atfork (do_atfork_prepare, do_atfork_parent, + do_atfork_child); +-#elif defined(HAVE_LIBC_LOCK_H) || defined(HAVE_BITS_LIBC_LOCK_H) ++#elif defined(HAVE___LIBC_ATFORK) + (void) __libc_atfork (do_atfork_prepare, do_atfork_parent, do_atfork_child); + #endif + +@@ -1119,7 +1119,7 @@ + } + + #ifndef HAVE_PTHREAD_ATFORK +-#if defined(HAVE_LIBC_LOCK_H) || defined(HAVE_BITS_LIBC_LOCK_H) ++#if defined(HAVE___LIBC_ONCE) + /* + * This bogosity is necessary because Linux uses different + * PIDs for different threads (like IRIX, which we don't +@@ -1151,7 +1151,7 @@ + pid = -1; /* linked against libpthreads, don't care */ + #else + pid = getpid (); +-#endif /* HAVE_LIBC_LOCK_H || HAVE_BITS_LIBC_LOCK_H */ ++#endif /* HAVE___LIBC_ONCE */ + #endif /* HAVE_PTHREAD_ATFORK */ + + euid = geteuid (); +@@ -1161,7 +1161,7 @@ + syslog (LOG_DEBUG, + "nss_ldap: __session.ls_state=%d, __session.ls_conn=%p, __euid=%i, euid=%i", + __session.ls_state, __session.ls_conn, __euid, euid); +-#elif defined(HAVE_LIBC_LOCK_H) || defined(HAVE_BITS_LIBC_LOCK_H) ++#elif defined(HAVE___LIBC_ONCE) + syslog (LOG_DEBUG, + "nss_ldap: libpthreads=%s, __session.ls_state=%d, __session.ls_conn=%p, __pid=%i, pid=%i, __euid=%i, euid=%i", + ((__pthread_once == NULL || __pthread_atfork == NULL) ? "FALSE" : "TRUE"), +@@ -1185,11 +1185,11 @@ + } + else + #ifndef HAVE_PTHREAD_ATFORK +-#if defined(HAVE_LIBC_LOCK_H) || defined(HAVE_BITS_LIBC_LOCK_H) ++#if defined(HAVE___LIBC_ONCE) + if ((__pthread_once == NULL || __pthread_atfork == NULL) && __pid != pid) + #else + if (__pid != pid) +-#endif /* HAVE_LIBC_LOCK_H || HAVE_BITS_LIBC_LOCK_H */ ++#endif /* HAVE___LIBC_ONCE */ + { + do_close_no_unbind (); + } +@@ -1250,9 +1250,9 @@ + debug ("<== do_init (pthread_once failed)"); + return NSS_UNAVAIL; + } +-#elif defined(HAVE_PTHREAD_ATFORK) && ( defined(HAVE_LIBC_LOCK_H) || defined(HAVE_BITS_LIBC_LOCK_H) ) ++#elif defined(HAVE_PTHREAD_ATFORK) && defined(HAVE___LIBC_ONCE) + __libc_once (__once, do_atfork_setup); +-#elif defined(HAVE_LIBC_LOCK_H) || defined(HAVE_BITS_LIBC_LOCK_H) ++#elif defined(HAVE___LIBC_ONCE) + /* + * Only install the pthread_atfork() handlers i + * we are linked against libpthreads. Otherwise, +--- ldap-nss.h.orig 2012-10-17 12:33:05.681379283 +0000 ++++ ldap-nss.h 2012-10-17 12:34:06.337050753 +0000 +@@ -671,7 +671,7 @@ + #define NSS_LDAP_LOCK(m) mutex_lock(&m) + #define NSS_LDAP_UNLOCK(m) mutex_unlock(&m) + #define NSS_LDAP_DEFINE_LOCK(m) static mutex_t m = DEFAULTMUTEX +-#elif defined(HAVE_LIBC_LOCK_H) || defined(HAVE_BITS_LIBC_LOCK_H) ++#elif defined(HAVE___LIBC_LOCK_LOCK) && defined(HAVE___LIBC_LOCK_UNLOCK) + #define NSS_LDAP_LOCK(m) __libc_lock_lock(m) + #define NSS_LDAP_UNLOCK(m) __libc_lock_unlock(m) + #define NSS_LDAP_DEFINE_LOCK(m) static pthread_mutex_t m = PTHREAD_MUTEX_INITIALIZER +--- ldap-nss.c.orig 2012-10-17 12:58:20.270783283 +0000 ++++ ldap-nss.c 2012-10-17 12:58:43.699267283 +0000 +@@ -156,7 +156,7 @@ + static FILE *__debugfile; + #endif /* LBER_OPT_LOG_PRINT_FILE */ + +-#ifndef HAVE_PTHREAD_ATFORK ++#if !defined(HAVE_PTHREAD_ATFORK) || !defined(HAVE___LIBC_ONCE) + /* + * Process ID that opened the session. + */ +--- configure.in.orig 2012-10-17 12:59:31.707235283 +0000 ++++ configure.in 2012-10-17 13:00:15.854289283 +0000 +@@ -255,6 +255,7 @@ + AC_CHECK_FUNCS(pthread_once) + AC_CHECK_FUNCS(ether_aton) + AC_CHECK_FUNCS(ether_ntoa) ++AC_CHECK_FUNCS(__libc_once __libc_atfork __libc_lock_lock __libc_lock_unlock) + + AC_MSG_CHECKING(for struct ether_addr) + AC_TRY_COMPILE([#include +--- ldap-nss.c.orig 2012-10-17 13:02:01.418010283 +0000 ++++ ldap-nss.c 2012-10-17 13:03:25.017240283 +0000 +@@ -1102,7 +1102,7 @@ + do_init (void) + { + ldap_config_t *cfg; +-#ifndef HAVE_PTHREAD_ATFORK ++#if !defined(HAVE_PTHREAD_ATFORK) || !defined(HAVE___LIBC_ONCE) + pid_t pid; + #endif + uid_t euid; diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index c0ba9d885543e1301cea2f28a874607bf3875cd8..c1e60a79082a1cf2df5a5dd9050f5bb66fd02f7c 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -4,7 +4,9 @@ dontPatchELF=1 # must keep libXv, $out in RPATH unpackFile() { - sh $src -x + skip=$(sed 's/^skip=//; t; d' $src) + tail -n +$skip $src | xz -d | tar xvf - + sourceRoot=. } diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 660676865b076b4d85b6d11eda0e93f14f7b7016..809ae316516c513d8eedbe4ed7b5be05fb153644 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -8,7 +8,7 @@ with stdenv.lib; -let versionNumber = "313.30"; in +let versionNumber = "319.17"; in stdenv.mkDerivation { name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernelDev.version}"}"; @@ -21,12 +21,12 @@ stdenv.mkDerivation { if stdenv.system == "i686-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run"; - sha256 = "1ba9mphvynni44dv3mwx9a9819drmrc4n82f4i58xjhvkfbi03qa"; + sha256 = "1ja5hc74dff8nhsccqhd5km732a8mafdv7xvzj39asw2r3ma37bp"; } else if stdenv.system == "x86_64-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run"; - sha256 = "1ggd3raxax99xnbphf945f0ggj5kq30jnknhyqy2fha9is1jbnjp"; + sha256 = "0a6yir07x38b0z51pi7kqgsaidhsib781rd53bpkkkk33yzviaqj"; } else throw "nvidia-x11 does not support platform ${stdenv.system}"; diff --git a/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix b/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix index eae62c9e1973bf7cfbe78d4773be3b251a2f30d7..694bc4a8f084d8c480f02bce385909a46622ee11 100644 --- a/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix +++ b/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pam, openssl, perl }: stdenv.mkDerivation rec { - name = "pam_ssh_agent_auth-0.9.4"; + name = "pam_ssh_agent_auth-0.9.5"; src = fetchurl { url = "mirror://sourceforge/pamsshagentauth/${name}.tar.bz2"; - sha256 = "1a8cv223f30mvkxnyh9hk6kya0ynkwwkc5nhlz3rcqhxfw0fcva9"; + sha256 = "1aihfyj17nvqhf0d5i0dg2lsly3r24xjyx0sfqpf60s0libkp4y0"; }; patches = @@ -21,5 +21,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://pamsshagentauth.sourceforge.net/; description = "PAM module for authentication through the SSH agent"; + maintainers = [ stdenv.lib.maintainers.eelco ]; + platforms = stdenv.lib.maintainers.linux; }; } diff --git a/pkgs/os-specific/linux/qemu-kvm/default.nix b/pkgs/os-specific/linux/qemu-kvm/default.nix index 2f93769d280141981a5cf123f2f7a44f95adc454..eeaeacd46601bd0542cac0c6fa948f25ac7da96d 100644 --- a/pkgs/os-specific/linux/qemu-kvm/default.nix +++ b/pkgs/os-specific/linux/qemu-kvm/default.nix @@ -21,10 +21,7 @@ stdenv.mkDerivation rec { patches = [ ./fix-librt-check.patch ./fix-usb-passthrough.patch ]; - postPatch = '' - patchShebangs . - sed '/qtest_add_func.*check_time/d' -i tests/rtc-test.c - '' # disable tests that meddle with system time, they seem to work bad, maybe due to newer glib + postPatch = "patchShebangs .;" + stdenv.lib.optionalString spiceSupport '' for i in configure spice-qemu-char.c ui/spice-input.c ui/spice-core.c ui/qemu-spice.h; do substituteInPlace $i --replace '#include ' '#include ' diff --git a/pkgs/os-specific/linux/sysklogd/systemd.patch b/pkgs/os-specific/linux/sysklogd/systemd.patch index ecdf2b57ebf21f584ab914ae324770cc4a389997..0a7fb166bd75c7583de59212fda62d1b8d1604aa 100644 --- a/pkgs/os-specific/linux/sysklogd/systemd.patch +++ b/pkgs/os-specific/linux/sysklogd/systemd.patch @@ -1,9 +1,8 @@ Based on http://ftp.free.org/mirrors/rsync.frugalware.org/frugalware-testing/source/apps-extra/sysklogd/sysklogd-1.5-systemd.diff -diff --git a/Makefile b/Makefile -index 9a114b8..aef1fd6 100644 ---- a/Makefile -+++ b/Makefile +diff -ruN -x '*~' sysklogd-1.5-old/Makefile sysklogd-1.5/Makefile +--- sysklogd-1.5-old/Makefile 2007-05-30 17:28:48.000000000 +0200 ++++ sysklogd-1.5/Makefile 2013-05-09 16:01:14.428638113 +0200 @@ -20,7 +20,7 @@ CC= gcc #SKFLAGS= -g -DSYSV -Wall @@ -13,7 +12,7 @@ index 9a114b8..aef1fd6 100644 # -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE # -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE # $(shell getconf LFS_SKFLAGS) -@@ -79,8 +79,8 @@ test: syslog_tst ksym oops.ko tsyslogd +@@ -79,8 +79,8 @@ install: install_man install_exec @@ -24,7 +23,7 @@ index 9a114b8..aef1fd6 100644 klogd: klogd.o syslog.o pidfile.o ksym.o ksym_mod.o ${CC} ${LDFLAGS} -o klogd klogd.o syslog.o pidfile.o ksym.o \ -@@ -101,6 +101,9 @@ syslogd.o: syslogd.c version.h +@@ -101,6 +101,9 @@ syslog.o: syslog.c ${CC} ${SKFLAGS} ${SYSLOG_FLAGS} -c syslog.c @@ -34,11 +33,9 @@ index 9a114b8..aef1fd6 100644 klogd.o: klogd.c klogd.h version.h ${CC} ${SKFLAGS} ${KLOGD_FLAGS} $(DEB) -c klogd.c -diff --git a/sd-daemon.c b/sd-daemon.c -new file mode 100644 -index 0000000..6d1eebf ---- /dev/null -+++ b/sd-daemon.c +diff -ruN -x '*~' sysklogd-1.5-old/sd-daemon.c sysklogd-1.5/sd-daemon.c +--- sysklogd-1.5-old/sd-daemon.c 1970-01-01 01:00:00.000000000 +0100 ++++ sysklogd-1.5/sd-daemon.c 2013-05-09 16:01:14.429638107 +0200 @@ -0,0 +1,436 @@ +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ + @@ -476,11 +473,9 @@ index 0000000..6d1eebf + return a.st_dev != b.st_dev; +#endif +} -diff --git a/sd-daemon.h b/sd-daemon.h -new file mode 100644 -index 0000000..d0a0a94 ---- /dev/null -+++ b/sd-daemon.h +diff -ruN -x '*~' sysklogd-1.5-old/sd-daemon.h sysklogd-1.5/sd-daemon.h +--- sysklogd-1.5-old/sd-daemon.h 1970-01-01 01:00:00.000000000 +0100 ++++ sysklogd-1.5/sd-daemon.h 2013-05-09 16:01:14.429638107 +0200 @@ -0,0 +1,265 @@ +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ + @@ -747,11 +742,10 @@ index 0000000..d0a0a94 +#endif + +#endif -diff --git a/syslogd.c b/syslogd.c -index acfd8f1..9bfa8c7 100644 ---- a/syslogd.c -+++ b/syslogd.c -@@ -551,6 +551,7 @@ static char sccsid[] = "@(#)syslogd.c 5.27 (Berkeley) 10/10/88"; +diff -ruN -x '*~' sysklogd-1.5-old/syslogd.c sysklogd-1.5/syslogd.c +--- sysklogd-1.5-old/syslogd.c 2007-07-04 21:04:01.000000000 +0200 ++++ sysklogd-1.5/syslogd.c 2013-05-09 16:04:32.106602589 +0200 +@@ -551,6 +551,7 @@ #if defined(__linux__) #include @@ -759,7 +753,7 @@ index acfd8f1..9bfa8c7 100644 #endif #ifndef UTMP_FILE -@@ -965,8 +966,11 @@ int main(argc, argv) +@@ -965,8 +966,11 @@ } signal (SIGTERM, SIG_DFL); num_fds = getdtablesize(); @@ -773,7 +767,7 @@ index acfd8f1..9bfa8c7 100644 untty(); } else -@@ -1253,6 +1257,60 @@ static int create_unix_socket(const char *path) +@@ -1253,6 +1257,60 @@ if (path[0] == '\0') return -1; @@ -834,17 +828,18 @@ index acfd8f1..9bfa8c7 100644 (void) unlink(path); memset(&sunx, 0, sizeof(sunx)); -@@ -2254,7 +2311,12 @@ void die(sig) +@@ -2254,9 +2312,11 @@ if (InetInuse) close(inetm); /* Clean-up files. */ - for (i = 0; i < nfunix; i++) +- if (funixn[i] && funix[i] != -1) +- (void)unlink(funixn[i]); + i = 0; +#if defined(__linux__) + if (sd_listen_fds(0) > 0) + i = 1; +#endif -+ for (; i < nfunix; i++) - if (funixn[i] && funix[i] != -1) - (void)unlink(funixn[i]); #ifndef TESTING + (void) remove_pid(PidFile); + #endif diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 8c681f893edd82271ac4104221188d25b586a3c2..2482f808cac876e096eeb8da5e29879932caa1da 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -3,9 +3,10 @@ , glib, kbd, libxslt, coreutils, libgcrypt, sysvtools, docbook_xsl }: +assert stdenv.gcc.libc or null != null; + stdenv.mkDerivation rec { - version = "203"; - name = "systemd-${version}"; + name = "systemd-203"; src = fetchurl { url = "http://www.freedesktop.org/software/systemd/${name}.tar.xz"; @@ -24,8 +25,8 @@ stdenv.mkDerivation rec { ./0009-Start-ctrl-alt-del.target-irreversibly.patch ] ++ stdenv.lib.optional stdenv.isArm ./libc-bug-accept4-arm.patch; - buildInputs = assert stdenv.gcc.libc or null != null; # assertion here, so it doesn't trigger on passthru.headers - [ pkgconfig intltool gperf libcap dbus.libs kmod xz pam acl + buildInputs = + [ pkgconfig intltool gperf libcap dbus kmod xz pam acl /* cryptsetup */ libuuid m4 glib libxslt libgcrypt docbook_xsl ]; @@ -124,19 +125,6 @@ stdenv.mkDerivation rec { # runtime; otherwise we can't and we need to reboot. passthru.interfaceVersion = 2; - passthru.headers = stdenv.mkDerivation { - name = "systemd-headers-${version}"; - inherit src; - - phases = [ "unpackPhase" "installPhase" ]; - - # some are needed by dbus.libs, which is needed for systemd :-) - installPhase = '' - mkdir -p "$out/include/systemd" - mv src/systemd/*.h "$out/include/systemd" - ''; - }; - meta = { homepage = "http://www.freedesktop.org/wiki/Software/systemd"; description = "A system and service manager for Linux"; diff --git a/pkgs/os-specific/linux/systemd/fix-tests-1.patch b/pkgs/os-specific/linux/systemd/fix-tests-1.patch deleted file mode 100644 index 14bb0fa27081d7ff68fe944b2e9125cd9f710b97..0000000000000000000000000000000000000000 --- a/pkgs/os-specific/linux/systemd/fix-tests-1.patch +++ /dev/null @@ -1,68 +0,0 @@ -Signed-off-by: Ramkumar Ramachandra ---- - Ramkumar Ramachandra wrote: - > $ ./test-id128 - > random: a08ea8ed34594d4bbd953dd182ec86f9 - > Assertion 'sd_id128_get_machine(&id) == 0' failed at - > src/test/test-id128.c:41, function main(). Aborting. - > [1] 8017 abort (core dumped) ./test-id128 - - Okay, this test fails because I don't have a /etc/machine-id -- I - thought systemd is supposed to create it? However, from the logic in - src/core/machine-id-setup.c, it looks like although open() is called - with O_CREAT on /etc/machine-id, systemd barfs if the file isn't - present. How about changing this? - - src/core/machine-id-setup.c | 12 +++++------- - src/test/test-id128.c | 6 ++++-- - 2 files changed, 9 insertions(+), 9 deletions(-) - -diff --git a/src/core/machine-id-setup.c b/src/core/machine-id-setup.c -index 7f4c23b..3f21d58 100644 ---- a/src/core/machine-id-setup.c -+++ b/src/core/machine-id-setup.c -@@ -168,12 +168,8 @@ int machine_id_setup(void) { - writable = true; - else { - fd = open("/etc/machine-id", O_RDONLY|O_CLOEXEC|O_NOCTTY); -- if (fd < 0) { -- umask(m); -- log_error("Cannot open /etc/machine-id: %m"); -- return -errno; -- } -- -+ if (fd < 0) -+ goto generate; - writable = false; - } - -@@ -192,7 +188,9 @@ int machine_id_setup(void) { - } - } - -- /* Hmm, so, the id currently stored is not useful, then let's -+generate: -+ /* Hmm, so, either /etc/machine-id doesn't exist, the id -+ * currently stored is not useful, then let's - * generate one */ - - r = generate(id); -diff --git a/src/test/test-id128.c b/src/test/test-id128.c -index bfd743e..60902d0 100644 ---- a/src/test/test-id128.c -+++ b/src/test/test-id128.c -@@ -38,8 +38,10 @@ int main(int argc, char *argv[]) { - assert_se(sd_id128_from_string(t, &id2) == 0); - assert_se(sd_id128_equal(id, id2)); - -- assert_se(sd_id128_get_machine(&id) == 0); -- printf("machine: %s\n", sd_id128_to_string(id, t)); -+ if (sd_id128_get_machine(&id) < 0) -+ printf("machine: run systemd-machine-id-setup first\n"); -+ else -+ printf("machine: %s\n", sd_id128_to_string(id, t)); - - assert_se(sd_id128_get_boot(&id) == 0); - printf("boot: %s\n", sd_id128_to_string(id, t)); --- -1.7.8.1.362.g5d6df.dirty diff --git a/pkgs/os-specific/linux/systemd/no-global-install.patch b/pkgs/os-specific/linux/systemd/no-global-install.patch deleted file mode 100644 index 6567251d57a122bf62cc7298c0663f2cd5e89229..0000000000000000000000000000000000000000 --- a/pkgs/os-specific/linux/systemd/no-global-install.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -index 05bf582..aa16a7c 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -2568,11 +2568,6 @@ endif - # "adm" and "wheel". - libsystemd-journal-install-hook: - libname=libsystemd-journal.so && $(move-to-rootlibdir) -- $(MKDIR_P) $(DESTDIR)/var/log/journal -- -chown 0:0 $(DESTDIR)/var/log/journal -- -chmod 755 $(DESTDIR)/var/log/journal -- -setfacl -nm g:adm:rx,d:g:adm:rx $(DESTDIR)/var/log/journal/ -- -setfacl -nm g:wheel:rx,d:g:wheel:rx $(DESTDIR)/var/log/journal/ - - libsystemd-journal-uninstall-hook: - rm -f $(DESTDIR)$(rootlibdir)/libsystemd-journal.so* -@@ -3676,9 +3671,6 @@ if HAVE_SYSV_COMPAT - sysvinit_DATA = \ - docs/sysvinit/README - --varlog_DATA = \ -- docs/var-log/README -- - docs/sysvinit/README: docs/sysvinit/README.in - $(SED_PROCESS) - diff --git a/pkgs/os-specific/linux/sysvinit/default.nix b/pkgs/os-specific/linux/sysvinit/default.nix index 99aebd11667c54ee1283fafd5b592369331b3bf3..7b4ecbb027e137cd5c19474615e1be0005b7f0c9 100644 --- a/pkgs/os-specific/linux/sysvinit/default.nix +++ b/pkgs/os-specific/linux/sysvinit/default.nix @@ -26,10 +26,12 @@ stdenv.mkDerivation { substituteInPlace src/Makefile --replace /usr / ''; - postInstall = stdenv.lib.optionalString withoutInitTools + postInstall = '' + mv $out/sbin/killall5 $out/bin + ln -sf killall5 $out/bin/pidof + '' + + stdenv.lib.optionalString withoutInitTools '' - mv $out/sbin/killall5 $out/bin - ln -sf killall5 $out/bin/pidof shopt -s extglob rm -rf $out/sbin/!(sulogin) rm -rf $out/include diff --git a/pkgs/os-specific/linux/xf86-input-wacom/default.nix b/pkgs/os-specific/linux/xf86-input-wacom/default.nix index 4350694c13a6f1622576ccf47a272716fdec26c4..63e4fb1ca7384ed998f2884a71490373520450f2 100644 --- a/pkgs/os-specific/linux/xf86-input-wacom/default.nix +++ b/pkgs/os-specific/linux/xf86-input-wacom/default.nix @@ -3,11 +3,11 @@ , ncurses, pkgconfig, randrproto, xorgserver, xproto, udev, libXinerama, pixman }: stdenv.mkDerivation rec { - name = "xf86-input-wacom-0.20.0"; + name = "xf86-input-wacom-0.19.0"; src = fetchurl { url = "mirror://sourceforge/linuxwacom/${name}.tar.bz2"; - sha256 = "1408zjqsakcyx6v81qwh4q7m49cc6vcaad54jaw8ycw4i832jvjq"; + sha256 = "1lkvhirjysx0d2154jrwqc2i8jrqdjrlzjv7grbnm2cg5vpg7n53"; }; buildInputs = [ inputproto libX11 libXext libXi libXrandr libXrender diff --git a/pkgs/servers/dict/dictd-wiktionary.nix b/pkgs/servers/dict/dictd-wiktionary.nix new file mode 100644 index 0000000000000000000000000000000000000000..48aaf187605e0a30bd2173ce4827538317c80b73 --- /dev/null +++ b/pkgs/servers/dict/dictd-wiktionary.nix @@ -0,0 +1,32 @@ +{stdenv, fetchurl, python, dict, glibcLocales, writeScript}: + +stdenv.mkDerivation rec { + version = "20121021"; + name = "dict-db-wiktionary-${version}"; + data = fetchurl { + url = "http://dumps.wikimedia.org/enwiktionary/${version}/enwiktionary-${version}-pages-articles.xml.bz2"; + sha256 = "1i4xwdpc2bx58495iy62iz0kn50c3qmnh4qribi82f2rd4qkfjd2"; + }; + + convert = ./wiktionary2dict.py; + buildInputs = [python dict glibcLocales]; + + builder = writeScript "wiktionary-builder.sh" '' + source $stdenv/setup + + ensureDir $out/share/dictd/ + cd $out/share/dictd + + export LOCALE_ARCHIVE=${glibcLocales}/lib/locale/locale-archive + python -O ${convert} ${data} + dictzip wiktionary-en.dict + echo en_US.UTF-8 > locale + ''; + + meta = { + description = "DICT version of English Wiktionary"; + homepage = http://en.wiktionary.org/; + maintainers = [ stdenv.lib.maintainers.mornfall ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/servers/dict/dictd-wordnet.nix b/pkgs/servers/dict/dictd-wordnet.nix new file mode 100644 index 0000000000000000000000000000000000000000..063868ddc6e89dc5e4ebac355e95f2f04e496d68 --- /dev/null +++ b/pkgs/servers/dict/dictd-wordnet.nix @@ -0,0 +1,36 @@ +{stdenv, fetchsvn, python, wordnet, writeScript}: + +stdenv.mkDerivation rec { + version = "542"; + name = "dict-db-wordnet-${version}"; + + buildInputs = [python wordnet]; + convert = ./wordnet_structures.py; + + builder = writeScript "builder.sh" '' + . ${stdenv}/setup + ensureDir $out/share/dictd/ + cd $out/share/dictd + + for i in ${wordnet}/dict/data.*; do + DATA="$DATA `echo $i | sed -e s,data,index,` $i"; + done + + python ${convert} $DATA + echo en_US.UTF-8 > locale + ''; + + meta = { + description = "dictd-compatible version of WordNet"; + + longDescription = + '' WordNet® is a large lexical database of English. This package makes + the wordnet data available to dictd and by extension for lookup with + the dict command. ''; + + homepage = http://wordnet.princeton.edu/; + + maintainers = [ stdenv.lib.maintainers.mornfall ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/servers/dict/wiktionary2dict.py b/pkgs/servers/dict/wiktionary2dict.py new file mode 100644 index 0000000000000000000000000000000000000000..8a0210e7254f9db16dae67cdd24ee9452ef24e89 --- /dev/null +++ b/pkgs/servers/dict/wiktionary2dict.py @@ -0,0 +1,778 @@ +# Adapted to produce DICT-compatible files by Petr Rockai in 2012 +# Based on code from wiktiondict by Greg Hewgill +import re +import sys +import codecs +import os +import textwrap +import time +import xml.sax + +class Text: + def __init__(self, s): + self.s = s + def process(self): + return s + +class TemplateCall: + def __init__(self): + pass + def process(self): + pass + +class Template: + def __init__(self): + self.parts = [] + def append(self, part): + self.parts.append(part) + def process(self): + return ''.join(x.process() for x in self.parts) + +class Whitespace: + def __init__(self, s): + self.s = s + +class OpenDouble: pass +class OpenTriple: pass +class CloseDouble: pass +class CloseTriple: pass + +class Equals: + def __str__(self): + return "=" + +class Delimiter: + def __init__(self, c): + self.c = c + def __str__(self): + return self.c + +def Tokenise(s): + s = unicode(s) + stack = [] + last = 0 + i = 0 + while i < len(s): + if s[i] == '{' and i+1 < len(s) and s[i+1] == '{': + if i > last: + yield s[last:i] + if i+2 < len(s) and s[i+2] == '{': + yield OpenTriple() + stack.append(3) + i += 3 + else: + yield OpenDouble() + stack.append(2) + i += 2 + last = i + elif s[i] == '}' and i+1 < len(s) and s[i+1] == '}': + if i > last: + yield s[last:i] + if len(stack) == 0: + yield "}}" + i += 2 + elif stack[-1] == 2: + yield CloseDouble() + i += 2 + stack.pop() + elif i+2 < len(s) and s[i+2] == '}': + yield CloseTriple() + i += 3 + stack.pop() + else: + raise SyntaxError() + last = i + elif s[i] == ':' or s[i] == '|': + if i > last: + yield s[last:i] + yield Delimiter(s[i]) + i += 1 + last = i + elif s[i] == '=': + if i > last: + yield s[last:i] + yield Equals() + i += 1 + last = i + #elif s[i] == ' ' or s[i] == '\t' or s[i] == '\n': + # if i > last: + # yield s[last:i] + # last = i + # m = re.match(r"\s+", s[i:]) + # assert m + # yield Whitespace(m.group(0)) + # i += len(m.group(0)) + # last = i + else: + i += 1 + if i > last: + yield s[last:i] + +def processSub(templates, tokens, args): + t = tokens.next() + if not isinstance(t, unicode): + raise SyntaxError + name = t + t = tokens.next() + default = None + if isinstance(t, Delimiter) and t.c == '|': + default = "" + while True: + t = tokens.next() + if isinstance(t, unicode): + default += t + elif isinstance(t, OpenDouble): + default += processTemplateCall(templates, tokens, args) + elif isinstance(t, OpenTriple): + default += processSub(templates, tokens, args) + elif isinstance(t, CloseTriple): + break + else: + print "Unexpected:", t + raise SyntaxError() + if name in args: + return args[name] + if default is not None: + return default + if name == "lang": + return "en" + return "{{{%s}}}" % name + +def processTemplateCall(templates, tokens, args): + template = tokens.next().strip().lower() + args = {} + a = 1 + t = tokens.next() + while True: + if isinstance(t, Delimiter): + name = unicode(a) + arg = "" + while True: + t = tokens.next() + if isinstance(t, unicode): + arg += t + elif isinstance(t, OpenDouble): + arg += processTemplateCall(templates, tokens, args) + elif isinstance(t, OpenTriple): + arg += processSub(templates, tokens, args) + elif isinstance(t, Delimiter) and t.c != '|': + arg += str(t) + else: + break + if isinstance(t, Equals): + name = arg.strip() + arg = "" + while True: + t = tokens.next() + if isinstance(t, (unicode, Equals)): + arg += unicode(t) + elif isinstance(t, OpenDouble): + arg += processTemplateCall(templates, tokens, args) + elif isinstance(t, OpenTriple): + arg += processSub(templates, tokens, args) + elif isinstance(t, Delimiter) and t.c != '|': + arg += str(t) + else: + break + arg = arg.strip() + else: + a += 1 + args[name] = arg + elif isinstance(t, CloseDouble): + break + else: + print "Unexpected:", t + raise SyntaxError + #print template, args + if template[0] == '#': + if template == "#if": + if args['1'].strip(): + return args['2'] + elif '3' in args: + return args['3'] + else: + return "" + elif template == "#ifeq": + if args['1'].strip() == args['2'].strip(): + return args['3'] + elif '4' in args: + return args['4'] + else: + return "" + elif template == "#ifexist": + return "" + elif template == "#switch": + sw = args['1'].strip() + if sw in args: + return args[sw] + else: + return "" + else: + print "Unknown ParserFunction:", template + sys.exit(1) + if template not in templates: + return "{{%s}}" % template + return process(templates, templates[template], args) + +def process(templates, s, args = {}): + s = re.compile(r"", re.DOTALL).sub("", s) + s = re.compile(r".*?", re.DOTALL).sub("", s) + assert "" not in s + #s = re.sub(r"(.*?)(.*?)(.*)", r"\1", s) + s = re.compile(r"(.*?)", re.DOTALL).sub(r"\1", s) + r = "" + #print list(Tokenise(s)) + tokens = Tokenise(s) + try: + while True: + t = tokens.next() + if isinstance(t, OpenDouble): + r += processTemplateCall(templates, tokens, args) + elif isinstance(t, OpenTriple): + r += processSub(templates, tokens, args) + else: + r += unicode(t) + except StopIteration: + pass + return r + +def test(): + templates = { + 'lb': "{{", + 'name-example': "I am a template example, my first name is '''{{{firstName}}}''' and my last name is '''{{{lastName}}}'''. You can reference my page at [[{{{lastName}}}, {{{firstName}}}]].", + 't': "start-{{{1|pqr}}}-end", + 't0': "start-{{{1}}}-end", + 't1': "start{{{1}}}endmoo", + 't2a1': "{{t2demo|a|{{{1}}}}}", + 't2a2': "{{t2demo|a|2={{{1}}}}}", + 't2demo': "start-{{{1}}}-middle-{{{2}}}-end", + 't5': "{{t2demo|{{{a}}}=b}}", + 't6': "t2demo|a", + } + def t(text, expected): + print "text:", text + s = process(templates, text) + if s != expected: + print "got:", s + print "expected:", expected + sys.exit(1) + t("{{Name-example}}", "I am a template example, my first name is '''{{{firstName}}}''' and my last name is '''{{{lastName}}}'''. You can reference my page at [[{{{lastName}}}, {{{firstName}}}]].") + t("{{Name-example | firstName=John | lastName=Smith }}", "I am a template example, my first name is '''John''' and my last name is '''Smith'''. You can reference my page at [[Smith, John]].") + t("{{t0|a}}", "start-a-end") + t("{{t0| }}", "start- -end") + t("{{t0|}}", "start--end") + t("{{t0}}", "start-{{{1}}}-end") + t("{{t0| }}", "start- -end") + t("{{t0|\n}}", "start-\n-end") + t("{{t0|1= }}", "start--end") + t("{{t0|1=\n}}", "start--end") + t("{{T}}", "start-pqr-end") + t("{{T|}}", "start--end") + t("{{T|abc}}", "start-abc-end") + t("{{T|abc|def}}", "start-abc-end") + t("{{T|1=abc|1=def}}", "start-def-end") + t("{{T|abc|1=def}}", "start-def-end") + t("{{T|1=abc|def}}", "start-def-end") + t("{{T|{{T}}}}", "start-start-pqr-end-end") + t("{{T|{{T|{{T}}}}}}", "start-start-start-pqr-end-end-end") + t("{{T|{{T|{{T|{{T}}}}}}}}", "start-start-start-start-pqr-end-end-end-end") + t("{{T|a{{t|b}}}}", "start-astart-b-end-end") + t("{{T|{{T|a=b}}}}", "start-start-pqr-end-end") + t("{{T|a=b}}", "start-pqr-end") + t("{{T|1=a=b}}", "start-a=b-end") + #t("{{t1|{{lb}}tc}}}}", "start{{tcend}}") + #t("{{t2a1|1=x=y}}", "start-a-middle-{{{2}}}-end") + #t("{{t2a2|1=x=y}}", "start-a-middle-x=y-end") + #t("{{t5|a=2=d}}", "start-{{{1}}}-middle-d=b-end") + #t("{{ {{t6}} }}", "{{ t2demo|a }}") + t("{{t|[[a|b]]}}", "start-b-end") + t("{{t|[[a|b]] }}", "start-b -end") + +Parts = { + # Standard POS headers + 'noun': "n.", + 'Noun': "n.", + 'Noun 1': "n.", + 'Noun 2': "n.", + 'Verb': "v.", + 'Adjective': "adj.", + 'Adverb': "adv.", + 'Pronoun': "pron.", + 'Conjunction': "conj.", + 'Interjection': "interj.", + 'Preposition': "prep.", + 'Proper noun': "n.p.", + 'Proper Noun': "n.p.", + 'Article': "art.", + + # Standard non-POS level 3 headers + '{{acronym}}': "acr.", + 'Acronym': "acr.", + '{{abbreviation}}': "abbr.", + '[[Abbreviation]]': "abbr.", + 'Abbreviation': "abbr.", + '[[initialism]]': "init.", + '{{initialism}}': "init.", + 'Initialism': "init.", + 'Contraction': "cont.", + 'Prefix': "prefix", + 'Suffix': "suffix", + 'Symbol': "sym.", + 'Letter': "letter", + 'Idiom': "idiom", + 'Idioms': "idiom", + 'Phrase': "phrase", + + # Debated POS level 3 headers + 'Number': "num.", + 'Numeral': "num.", + 'Cardinal number': "num.", + 'Ordinal number': "num.", + 'Cardinal numeral': "num.", + 'Ordinal numeral': "num.", + + # Other headers in use + 'Personal pronoun': "pers.pron.", + 'Adjective/Adverb': "adj./adv.", + 'Proper adjective': "prop.adj.", + 'Determiner': "det.", + 'Demonstrative determiner': "dem.det.", + 'Clitic': "clitic", + 'Infix': "infix", + 'Counter': "counter", + 'Kanji': None, + 'Kanji reading': None, + 'Hiragana letter': None, + 'Katakana letter': None, + 'Pinyin': None, + 'Han character': None, + 'Hanzi': None, + 'Hanja': None, + 'Proverb': "prov.", + 'Expression': None, + 'Adjectival noun': None, + 'Quasi-adjective': None, + 'Particle': "part.", + 'Infinitive particle': "part.", + 'Possessive adjective': "poss.adj.", + 'Verbal prefix': "v.p.", + 'Postposition': "post.", + 'Prepositional article': "prep.art.", + 'Phrasal verb': "phr.v.", + 'Participle': "participle", + 'Interrogative auxiliary verb': "int.aux.v.", + 'Pronominal adverb': "pron.adv.", + 'Adnominal': "adn.", + 'Abstract pronoun': "abs.pron.", + 'Conjunction particle': None, + 'Root': "root", + + # Non-standard, deprecated headers + 'Noun form': "n.", + 'Verb form': "v.", + 'Adjective form': "adj.form.", + 'Nominal phrase': "nom.phr.", + 'Noun phrase': "n. phrase", + 'Verb phrase': "v. phrase", + 'Transitive verb': "v.t.", + 'Intransitive verb': "v.i.", + 'Reflexive verb': "v.r.", + 'Cmavo': None, + 'Romaji': "rom.", + 'Hiragana': None, + 'Furigana': None, + 'Compounds': None, + + # Other headers seen + 'Alternative forms': None, + 'Alternative spellings': None, + 'Anagrams': None, + 'Antonym': None, + 'Antonyms': None, + 'Conjugation': None, + 'Declension': None, + 'Declension and pronunciations': None, + 'Definite Article': "def.art.", + 'Definite article': "def.art.", + 'Demonstrative pronoun': "dem.pron.", + 'Derivation': None, + 'Derived expression': None, + 'Derived expressions': None, + 'Derived forms': None, + 'Derived phrases': None, + 'Derived terms': None, + 'Derived, Related terms': None, + 'Descendants': None, + #'Etymology': None, + #'Etymology 1': None, + #'Etymology 2': None, + #'Etymology 3': None, + #'Etymology 4': None, + #'Etymology 5': None, + 'Examples': None, + 'External links': None, + '[[Gismu]]': None, + 'Gismu': None, + 'Homonyms': None, + 'Homophones': None, + 'Hyphenation': None, + 'Indefinite article': "art.", + 'Indefinite pronoun': "ind.pron.", + 'Indefinite Pronoun': "ind.pron.", + 'Indetermined pronoun': "ind.pron.", + 'Interrogative conjunction': "int.conj.", + 'Interrogative determiner': "int.det.", + 'Interrogative particle': "int.part.", + 'Interrogative pronoun': "int.pron.", + 'Legal expression': "legal", + 'Mass noun': "n.", + 'Miscellaneous': None, + 'Mutations': None, + 'Noun and verb': "n/v.", + 'Other language': None, + 'Pinyin syllable': None, + 'Possessive determiner': "poss.det.", + 'Possessive pronoun': "poss.pron.", + 'Prepositional phrase': "prep.phr.", + 'Prepositional Pronoun': "prep.pron.", + 'Pronunciation': None, + 'Pronunciation 1': None, + 'Pronunciation 2': None, + 'Quotations': None, + 'References': None, + 'Reflexive pronoun': "refl.pron.", + 'Related expressions': None, + 'Related terms': None, + 'Related words': None, + 'Relative pronoun': "rel.pron.", + 'Saying': "saying", + 'See also': None, + 'Shorthand': None, + '[http://en.wikipedia.org/wiki/Shorthand Shorthand]': None, + 'Sister projects': None, + 'Spelling note': None, + 'Synonyms': None, + 'Translation': None, + 'Translations': None, + 'Translations to be checked': None, + 'Transliteration': None, + 'Trivia': None, + 'Usage': None, + 'Usage in English': None, + 'Usage notes': None, + 'Verbal noun': "v.n.", +} +PartsUsed = {} +for p in Parts.keys(): + PartsUsed[p] = 0 + +def encode(s): + r = e(s) + assert r[1] == len(s) + return r[0] + +def dowikilink(m): + a = m.group(1).split("|") + if len(a) > 1: + link = a[1] + else: + link = a[0] + if ':' in link: + link = "" + return link + +seentemplates = {} +def dotemplate(m): + aa = m.group(1).split("|") + args = {} + n = 0 + for a in aa: + am = re.match(r"(.*?)(=(.*))?", a) + if am: + args[am.group(1)] = am.group(3) + else: + n += 1 + args[n] = am.group(1) + + #if aa[0] in seentemplates: + # seentemplates[aa[0]] += 1 + #else: + # seentemplates[aa[0]] = 1 + # print len(seentemplates), aa[0] + #print aa[0] + + #if aa[0] not in Templates: + # return "(unknown template %s)" % aa[0] + #body = Templates[aa[0]] + #body = re.sub(r".*?", "", body) + #assert "" not in body + ##body = re.sub(r"(.*?)(.*?)(.*)", r"\1", body) + #body = re.sub(r"(.*?)", r"\1", body) + #def dotemplatearg(m): + # ta = m.group(1).split("|") + # if ta[0] in args: + # return args[ta[0]] + # elif len(ta) > 1: + # return ta[1] + # else: + # return "{{{%s}}}" % ta[0] + #body = re.sub(r"{{{(.*?)}}}", dotemplatearg, body) + #return dewiki(body) + +def doparserfunction(m): + a = m.group(2).split("|") + if m.group(1) == "ifeq": + if a[0] == a[1]: + return a[2] + elif len(a) >= 4: + return a[3] + return "" + +def dewiki(body, indent = 0): + # process in this order: + # {{{ }}} + # <> <> + # [[ ]] + # {{ }} + # ''' ''' + # '' '' + #body = wikimediatemplate.process(Templates, body) + body = re.sub(r"\[\[(.*?)\]\]", dowikilink, body) + #body = re.sub(r"{{(.*?)}}", dotemplate, body) + #body = re.sub(r"{{#(.*?):(.*?)}}", doparserfunction, body) + body = re.sub(r"'''(.*?)'''", r"\1", body) + body = re.sub(r"''(.*?)''", r"\1", body) + lines = body.split("\n") + n = 0 + i = 0 + while i < len(lines): + if len(lines[i]) > 0 and lines[i][0] == "#": + if len(lines[i]) > 1 and lines[i][1] == '*': + wlines = textwrap.wrap(lines[i][2:].strip(), + initial_indent = " * ", + subsequent_indent = " ") + elif len(lines[i]) > 1 and lines[i][1] == ':': + wlines = textwrap.wrap(lines[i][2:].strip(), + initial_indent = " ", + subsequent_indent = " ") + else: + n += 1 + wlines = textwrap.wrap(str(n) + ". " + lines[i][1:].strip(), + subsequent_indent = " ") + elif len(lines[i]) > 0 and lines[i][0] == "*": + n = 0 + wlines = textwrap.wrap(lines[i][1:].strip(), + initial_indent = "* ", + subsequent_indent = " ") + else: + n = 0 + wlines = textwrap.wrap(lines[i].strip()) + if len(wlines) == 0: + wlines = [''] + lines[i:i+1] = wlines + i += len(wlines) + return ''.join(" "*(indent-1)+x+"\n" for x in lines) + +class WikiSection: + def __init__(self, heading, body): + self.heading = heading + self.body = body + #self.lines = re.split("\n+", body.strip()) + #if len(self.lines) == 1 and len(self.lines[0]) == 0: + # self.lines = [] + self.children = [] + def __str__(self): + return "<%s:%i:%s>" % (self.heading, len(self.body or ""), ','.join([str(x) for x in self.children])) + def add(self, section): + self.children.append(section) + +def parse(word, text): + headings = list(re.finditer("^(=+)\s*(.*?)\s*=+\n", text, re.MULTILINE)) + #print [x.group(1) for x in headings] + doc = WikiSection(word, "") + stack = [doc] + for i, m in enumerate(headings): + depth = len(m.group(1)) + if depth < len(stack): + stack = stack[:depth] + else: + while depth > len(stack): + s = WikiSection(None, "") + stack[-1].add(s) + stack.append(s) + if i+1 < len(headings): + s = WikiSection(m.group(2), text[m.end(0):headings[i+1].start(0)].strip()) + else: + s = WikiSection(m.group(2), text[m.end(0):].strip()) + assert len(stack) == depth + stack[-1].add(s) + stack.append(s) + #while doc.heading is None and len(doc.lines) == 0 and len(doc.children) == 1: + # doc = doc.children[0] + return doc + +def formatFull(word, doc): + def f(depth, section): + if section.heading: + r = " "*(depth-1) + section.heading + "\n\n" + else: + r = "" + if section.body: + r += dewiki(section.body, depth+1)+"\n" + #r += "".join(" "*depth + x + "\n" for x in dewiki(section.body)) + #if len(section.lines) > 0: + # r += "\n" + for c in section.children: + r += f(depth+1, c) + return r + s = f(0, doc) + s += "Ref: http://en.wiktionary.org/wiki/%s\n" % word + return s + +def formatNormal(word, doc): + def f(depth, posdepth, section): + r = "" + if depth == posdepth: + if not section.heading or section.heading.startswith("Etymology"): + posdepth += 1 + elif section.heading in Parts: + #p = Parts[section.heading] + #if p: + # r += " "*(depth-1) + word + " (" + p + ")\n\n" + r += " "*(depth-1) + section.heading + "\n\n" + else: + print >>errors, "Unknown part: (%s) %s" % (word, section.heading) + return "" + elif depth > posdepth: + return "" + elif section.heading: + r += " "*(depth-1) + section.heading + "\n\n" + if section.body: + r += dewiki(section.body, depth+1)+"\n" + #r += "".join(" "*depth + x + "\n" for x in dewiki(section.lines)) + #if len(section.lines) > 0: + # r += "\n" + for c in section.children: + r += f(depth+1, posdepth, c) + return r + s = f(0, 3, doc) + s += "Ref: http://en.wiktionary.org/wiki/%s\n" % word + return s + +def formatBrief(word, doc): + def f(depth, posdepth, section): + if depth == posdepth: + h = section.heading + if not section.heading or section.heading.startswith("Etymology"): + posdepth += 1 + elif section.heading in Parts: + #h = Parts[section.heading] + #if h: + # h = "%s (%s)" % (word, h) + pass + stack.append([h, False]) + elif depth > 0: + stack.append([section.heading, False]) + else: + stack.append(["%h " + section.heading, False]) + r = "" + #if section.heading: + # r += " "*(depth-1) + section.heading + "\n" + body = ''.join(x+"\n" for x in section.body.split("\n") if len(x) > 0 and x[0] == '#') + if len(body) > 0: + for i in range(len(stack)): + if not stack[i][1]: + if stack[i][0]: + r += " "*(i-1) + stack[i][0] + "\n" + stack[i][1] = True + r += dewiki(body, depth+1) + for c in section.children: + r += f(depth+1, posdepth, c) + stack.pop() + return r + stack = [] + s = f(0, 3, doc) + s += "Ref: http://en.wiktionary.org/wiki/%s\n" % word + return s + +class WikiHandler(xml.sax.ContentHandler): + def __init__(self): + self.element = None + self.page = None + self.text = "" + self.long = {} + def startElement(self, name, attrs): + #print "start", name, attrs + self.element = name + def endElement(self, name): + #print "end", name + if self.element == "text": + if self.page: + if self.page in self.long: + print self.page, len(self.text) + print + self.doPage(self.page, self.text) + self.page = None + self.text = "" + self.element = None + def characters(self, content): + #print "characters", content + if self.element == "title": + if self.checkPage(content): + self.page = content + elif self.element == "text": + if self.page: + self.text += content + if len(self.text) > 100000 and self.page not in self.long: + self.long[self.page] = 1 + def checkPage(self, page): + return False + def doPage(self, page, text): + pass + +class TemplateHandler(WikiHandler): + def checkPage(self, page): + return page.startswith("Template:") + def doPage(self, page, text): + Templates[page[page.find(':')+1:].lower()] = text + +class WordHandler(WikiHandler): + def checkPage(self, page): + return ':' not in page + def doPage(self, page, text): + m = re.match(r"#redirect\s*\[\[(.*?)\]\]", text, re.IGNORECASE) + if m: + out.write(" See <%s>" % page) + return + doc = parse(page, text) + out.write(formatBrief(page, doc)) + #print formatBrief(page, doc) + +fn = sys.argv[1] +info = """ This file was converted from the original database on: + %s + + The original data is available from: + http://en.wiktionary.org + The version from which this file was generated was: + %s + + Wiktionary is available under the GNU Free Documentation License. +""" % (time.ctime(), os.path.basename(fn)) + +errors = codecs.open("mkdict.err", "w", "utf_8") +e = codecs.getencoder("utf_8") + +Templates = {} +f = os.popen("bunzip2 -c %s" % fn, "r") +xml.sax.parse(f, TemplateHandler()) +f.close() + +f = os.popen("bunzip2 -c %s" % fn, "r") +out = codecs.getwriter("utf_8")( + os.popen("dictfmt -p wiktionary-en --locale en_US.UTF-8 --columns 0 -u http://en.wiktionary.org", "w")) + +out.write(("%%h English Wiktionary\n%s" % info).encode('utf-8')) +xml.sax.parse(f, WordHandler()) +f.close() +out.close() diff --git a/pkgs/servers/dict/wordnet_structures.py b/pkgs/servers/dict/wordnet_structures.py new file mode 100644 index 0000000000000000000000000000000000000000..6a88427c5da1ccbe463e7e2d1dd99c69e6553cd8 --- /dev/null +++ b/pkgs/servers/dict/wordnet_structures.py @@ -0,0 +1,319 @@ +#!/usr/bin/env python +#Copyright 2007 Sebastian Hagen +# This file is part of wordnet_tools. + +# wordnet_tools is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 +# as published by the Free Software Foundation + +# wordnet_tools is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with wordnet_tools; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +# This program requires python >= 2.4. + +# This program converts wordnet index/data file pairs into dict index/data +# files usable by dictd. +# This is basically a reimplementation of the wnfilter program by Rik Faith, +# which unfortunately doesn't work correctly for wordnet files in the newer +# formats. This version of wordnet_structures whould parse wordnet 2.1 files +# correctly, and create output very similar to what wnfilter would have +# written. + +import datetime +from textwrap import TextWrapper + +CAT_ADJECTIVE = 0 +CAT_ADVERB = 1 +CAT_NOUN = 2 +CAT_VERB = 3 + +category_map = { + 'n': CAT_NOUN, + 'v': CAT_VERB, + 'a': CAT_ADJECTIVE, + 's': CAT_ADJECTIVE, + 'r': CAT_ADVERB +} + + +class WordIndex: + def __init__(self, lemma, category, ptrs, synsets, tagsense_count): + self.lemma = lemma + self.category = category + self.ptrs = ptrs + self.synsets = synsets + self.tagsense_count = tagsense_count + + @classmethod + def build_from_line(cls, line_data, synset_map): + line_split = line_data.split() + lemma = line_split[0] + category = category_map[line_split[1]] + synset_count = int(line_split[2],10) + ptr_count = int(line_split[3],10) + ptrs = [line_split[i] for i in range(3, 3+ptr_count)] + tagsense_count = int(line_split[5 + ptr_count],10) + synsets = [synset_map[int(line_split[i],10)] for i in range(6 + ptr_count, 6 + ptr_count + synset_count)] + return cls(lemma, category, ptrs, synsets, tagsense_count) + + @classmethod + def build_from_file(cls, f, synset_map, rv_base=None): + if (rv_base is None): + rv = {} + else: + rv = rv_base + + for line in f: + if (line.startswith(' ')): + continue + wi = cls.build_from_line(line, synset_map) + word = wi.lemma.lower() + if not (word in rv): + rv[word] = [] + rv[word].append(wi) + return rv + + def __repr__(self): + return '%s%s' % (self.__class__.__name__, (self.lemma, self.category, self.ptrs, self.synsets, self.tagsense_count)) + + +class WordIndexDictFormatter(WordIndex): + category_map_rev = { + CAT_NOUN: 'n', + CAT_VERB: 'v', + CAT_ADJECTIVE: 'adj', + CAT_ADVERB: 'adv' + } + linesep = '\n' + LINE_WIDTH_MAX = 68 + prefix_fmtf_line_first = '%5s 1: ' + prefix_fmtn_line_first = ' ' + prefix_fmtf_line_nonfirst = '%5d: ' + prefix_fmtn_line_nonfirst = ' ' + + def dict_str(self): + tw = TextWrapper(width=self.LINE_WIDTH_MAX, + initial_indent=(self.prefix_fmtf_line_first % self.category_map_rev[self.category]), + subsequent_indent=self.prefix_fmtn_line_first) + + lines = (tw.wrap(self.synsets[0].dict_str())) + i = 2 + for synset in self.synsets[1:]: + tw = TextWrapper(width=self.LINE_WIDTH_MAX, + initial_indent=(self.prefix_fmtf_line_nonfirst % i), + subsequent_indent=self.prefix_fmtn_line_nonfirst) + lines.extend(tw.wrap(synset.dict_str())) + i += 1 + return self.linesep.join(lines) + + +class Synset: + def __init__(self, offset, ss_type, words, ptrs, gloss, frames=()): + self.offset = offset + self.type = ss_type + self.words = words + self.ptrs = ptrs + self.gloss = gloss + self.frames = frames + self.comments = [] + + @classmethod + def build_from_line(cls, line_data): + line_split = line_data.split() + synset_offset = int(line_split[0],10) + ss_type = category_map[line_split[2]] + word_count = int(line_split[3],16) + words = [line_split[i] for i in range(4, 4 + word_count*2,2)] + ptr_count = int(line_split[4 + word_count*2],10) + ptrs = [(line_split[i], line_split[i+1], line_split[i+2], line_split[i+3]) for i in range(5 + word_count*2,4 + word_count*2 + ptr_count*4,4)] + + tok = line_split[5 + word_count*2 + ptr_count*4] + base = 6 + word_count*2 + ptr_count*4 + if (tok != '|'): + frame_count = int(tok, 10) + frames = [(int(line_split[i+1],10), int(line_split[i+2],16)) for i in range(base, base + frame_count*3, 3)] + base += frame_count*3 + 1 + else: + frames = [] + + line_split2 = line_data.split(None, base) + if (len(line_split2) < base): + gloss = None + else: + gloss = line_split2[-1] + + return cls(synset_offset, ss_type, words, ptrs, gloss, frames) + + @classmethod + def build_from_file(cls, f): + rv = {} + comments = [] + + for line in f: + if (line.startswith(' ')): + line_s = line.lstrip().rstrip('\n') + line_elements = line_s.split(None,1) + try: + int(line_elements[0]) + except ValueError: + continue + if (len(line_elements) == 1): + line_elements.append('') + comments.append(line_elements[1]) + continue + synset = cls.build_from_line(line.rstrip()) + rv[synset.offset] = synset + + return (rv, comments) + + def dict_str(self): + rv = self.gloss + if (len(self.words) > 1): + rv += ' [syn: %s]' % (', '.join([('{%s}' % word) for word in self.words])) + return rv + + def __repr__(self): + return '%s%s' % (self.__class__.__name__, (self.offset, self.type, self.words, self.ptrs, self.gloss, self.frames)) + + +class WordnetDict: + db_info_fmt = '''This file was converted from the original database on: + %(conversion_datetime)s + +The original data is available from: + %(wn_url)s + +The original data was distributed with the notice shown below. No +additional restrictions are claimed. Please redistribute this changed +version under the same conditions and restriction that apply to the +original version.\n\n +%(wn_license)s''' + + datetime_fmt = '%Y-%m-%dT%H:%M:%S' + base64_map = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/' + + def __init__(self, wn_url, desc_short, desc_long): + self.word_data = {} + self.wn_url = wn_url + self.desc_short = desc_short + self.desc_long = desc_long + self.wn_license = None + + def wn_dict_add(self, file_index, file_data): + file_data.seek(0) + file_index.seek(0) + (synsets, license_lines) = Synset.build_from_file(file_data) + WordIndexDictFormatter.build_from_file(file_index, synsets, self.word_data) + if (license_lines): + self.wn_license = '\n'.join(license_lines) + '\n' + + @classmethod + def base64_encode(cls, i): + """Encode a non-negative integer into a dictd compatible base64 string""" + if (i < 0): + raise ValueError('Value %r for i is negative' % (i,)) + r = 63 + e = 1 + while (r < i): + e += 1 + r = 64**e - 1 + + rv = '' + while (e > 0): + e -= 1 + d = (i / 64**e) + rv += cls.base64_map[d] + i = i % (64**e) + return rv + + @classmethod + def dict_entry_write(cls, file_index, file_data, key, entry, linesep='\n'): + """Write a single dict entry for to index and data files""" + entry_start = file_data.tell() + file_data.write(entry) + entry_len = len(entry) + file_index.write('%s\t%s\t%s%s' % (key, cls.base64_encode(entry_start), + cls.base64_encode(entry_len), linesep)) + + def dict_generate(self, file_index, file_data): + file_index.seek(0) + file_data.seek(0) + # The dictd file format is fairly iffy on the subject of special + # headwords: either dictd is buggy, or the manpage doesn't tell the whole + # story about the format. + # The upshot is that order of these entries in the index *matters*. + # Putting them at the beginning and in alphabetic order is afaict ok. + # Some other orders completely and quietly break the ability to look + # those headwords up. + # -- problem encountered with 1.10.2, at 2007-08-05. + file_data.write('\n') + wn_url = self.wn_url + conversion_datetime = datetime.datetime.now().strftime(self.datetime_fmt) + wn_license = self.wn_license + self.dict_entry_write(file_index, file_data, '00-database-info', '00-database-info\n%s\n' % (self.db_info_fmt % vars())) + self.dict_entry_write(file_index, file_data, '00-database-long', '00-database-long\n%s\n' % self.desc_long) + self.dict_entry_write(file_index, file_data, '00-database-short', '00-database-short\n%s\n' % self.desc_short) + self.dict_entry_write(file_index, file_data, '00-database-url', '00-database-url\n%s\n' % self.wn_url) + + + words = self.word_data.keys() + words.sort() + for word in words: + for wi in self.word_data[word]: + word_cs = word + # Use case-sensitivity information of first entry of first synset that + # matches this word case-insensitively + for synset in wi.synsets: + for ss_word in synset.words: + if (ss_word.lower() == word_cs.lower()): + word_cs = ss_word + break + else: + continue + break + else: + continue + break + + outstr = '' + for wi in self.word_data[word]: + outstr += wi.dict_str() + '\n' + + outstr = '%s%s%s' % (word_cs, wi.linesep, outstr) + self.dict_entry_write(file_index, file_data, word_cs, outstr, wi.linesep) + + file_index.truncate() + file_data.truncate() + + +if (__name__ == '__main__'): + import optparse + op = optparse.OptionParser(usage='usage: %prog [options] ( )+') + op.add_option('-i', '--outindex', dest='oi', default='wn.index', help='filename of index file to write to') + op.add_option('-d', '--outdata', dest='od', default='wn.dict', help='filename of data file to write to') + op.add_option('--wn_url', dest='wn_url', default='ftp://ftp.cogsci.princeton.edu/pub/wordnet/2.0', help='URL for wordnet sources') + op.add_option('--db_desc_short', dest='desc_short', default=' WordNet (r) 2.1 (2005)', help='short dict DB description') + op.add_option('--db_desc_long', dest='desc_long', default=' WordNet (r): A Lexical Database for English from the\n Cognitive Science Laboratory at Princeton University', help='long dict DB description') + + (options, args) = op.parse_args() + + wnd = WordnetDict(wn_url=options.wn_url, desc_short=options.desc_short, desc_long=options.desc_long) + + for i in range(0,len(args),2): + print 'Opening index file %r...' % args[i] + file_index = file(args[i]) + print 'Opening data file %r...' % args[i+1] + file_data = file(args[i+1]) + print 'Parsing index file and data file...' + wnd.wn_dict_add(file_index, file_data) + + print 'All input files parsed. Writing output to index file %r and data file %r.' % (options.oi, options.od) + + wnd.dict_generate(file(options.oi, 'w'),file(options.od, 'w')) + print 'All done.' diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix index 463840fcf4ca3c49840ba074309d00f5473751e9..f967a7aaa2a83366b8a6795805f1927716319d36 100644 --- a/pkgs/servers/http/lighttpd/default.nix +++ b/pkgs/servers/http/lighttpd/default.nix @@ -16,9 +16,11 @@ stdenv.mkDerivation { sed -i "s:/usr/bin/file:${file}/bin/file:g" configure ''; - meta = { + meta = with stdenv.lib; { description = "Lightweight high-performance web server"; homepage = http://www.lighttpd.net/; license = "BSD"; + platforms = platforms.linux; + maintainers = [maintainers.bjornfor]; }; } diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..8329a9a05c95161b8fbac190b8b2a9676432fcdc --- /dev/null +++ b/pkgs/servers/monitoring/munin/default.nix @@ -0,0 +1,98 @@ +{ stdenv, fetchurl, makeWrapper, which, coreutils, rrdtool, perl, perlPackages +, python, ruby, openjdk }: + +# TODO: split into server/node derivations + +# FIXME: munin tries to write log files and web graphs to its installation path. + +stdenv.mkDerivation rec { + version = "2.0.14"; + name = "munin-${version}"; + + src = fetchurl { + url = "https://github.com/munin-monitoring/munin/archive/${version}.tar.gz"; + sha256 = "1d71gvmkrck42z1h1dfk9napbhn7apfmlnp7r62fyylv0m7s2ylx"; + }; + + buildInputs = [ + makeWrapper + which + coreutils + rrdtool + perl + perlPackages.ModuleBuild + perlPackages.HTMLTemplate + perlPackages.NetSSLeay + perlPackages.NetServer + perlPackages.Log4Perl + perlPackages.IOSocketInet6 + perlPackages.Socket6 + perlPackages.URI + perlPackages.DBFile + perlPackages.DateManip + perlPackages.FileCopyRecursive + perlPackages.FCGI + perlPackages.NetSNMP + perlPackages.NetServer + perlPackages.ListMoreUtils + perlPackages.TimeHiRes + python + ruby + openjdk + ]; + + preBuild = '' + sed -i '/CHECKUSER/d' Makefile + sed -i '/CHOWN/d' Makefile + sed -i '/CHECKGROUP/d' Makefile + substituteInPlace "Makefile" \ + --replace "/usr/pwd" "pwd" + ''; + + # DESTDIR shouldn't be needed (and shouldn't have worked), but munin + # developers have forgotten to use PREFIX everywhere, so we use DESTDIR to + # ensure that everything is installed in $out. + makeFlags = '' + PREFIX=$(out) + DESTDIR=$(out) + PERLLIB=$(out)/lib/perl5/site_perl + PERL=${perl}/bin/perl + PYTHON=${python}/bin/python + RUBY=${ruby}/bin/ruby + JAVARUN=${openjdk}/bin/java + HOSTNAME=default + ''; + + postFixup = '' + if test -e $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 + + # TODO: toPerlLibPath can be added to + # pkgs/development/interpreters/perl5.16/setup-hook.sh (and the other perl + # versions) just like for python. NOTE: it causes massive rebuilds. + # $(toPerlLibPath $out perlPackages.Log4Perl ...) + + for file in "$out"/bin/munindoc "$out"/sbin/munin-* "$out"/lib/munin-* "$out"/www/cgi/*; do + # don't wrap .jar files + case "$file" in + *.jar) continue;; + esac + wrapProgram "$file" --set PERL5LIB $out/lib/perl5/site_perl:${perlPackages.Log4Perl}/lib/perl5/site_perl:${perlPackages.IOSocketInet6}/lib/perl5/site_perl:${perlPackages.Socket6}/lib/perl5/site_perl:${perlPackages.URI}/lib/perl5/site_perl:${perlPackages.DBFile}/lib/perl5/site_perl:${perlPackages.DateManip}/lib/perl5/site_perl:${perlPackages.HTMLTemplate}/lib/perl5/site_perl:${perlPackages.FileCopyRecursive}/lib/perl5/site_perl:${perlPackages.FCGI}/lib/perl5/site_perl:${perlPackages.NetSNMP}/lib/perl5/site_perl:${perlPackages.NetServer}/lib/perl5/site_perl:${perlPackages.ListMoreUtils}/lib/perl5/site_perl:${perlPackages.TimeHiRes}/lib/perl5/site_perl:${rrdtool}/lib/perl + done + ''; + + meta = with stdenv.lib; { + description = "Networked resource monitoring tool"; + longDescription = '' + Munin is a monitoring tool that surveys all your computers and remembers + what it saw. It presents all the information in graphs through a web + interface. Munin can help analyze resource trends and 'what just happened + to kill our performance?' problems. + ''; + homepage = http://munin-monitoring.org/; + license = licenses.gpl2; + maintainers = [ maintainers.iElectric maintainers.bjornfor ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix index d99cff6b667b49f72fce51d918edba180ef02f67..612db162e5c5362ad8b96ecf937d829244416432 100644 --- a/pkgs/servers/nosql/mongodb/default.nix +++ b/pkgs/servers/nosql/mongodb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, scons, which, v8}: +{ stdenv, fetchurl, scons, boost, v8, gperftools, pcre, snappy }: with stdenv.lib; @@ -9,33 +9,31 @@ let installerPatch = fetchurl { in stdenv.mkDerivation rec { - name = "mongodb-2.4.0"; + name = "mongodb-2.4.3"; src = fetchurl { - url = http://downloads.mongodb.org/src/mongodb-src-r2.4.0.tar.gz; - sha256 = "115wrw23naxpaiwh8ar6g40f2nsdbz1hdpkp88wbi5yc9m6drg41"; + url = http://downloads.mongodb.org/src/mongodb-src-r2.4.3.tar.gz; + sha256 = "1k653xmwphdk88z2byz5fglr8xcsm8nw13prls1rx16qnc6h1pb1"; }; - nativeBuildInputs = [ scons which ]; + nativeBuildInputs = [ scons boost v8 gperftools pcre snappy ]; patches = [ installerPatch ]; - enableParallelBuilding = true; - postPatch = '' - substituteInPlace SConstruct --replace "Environment( BUILD_DIR" "Environment( ENV = os.environ, BUILD_DIR" - substituteInPlace SConstruct --replace "#/../v8" "${v8}" \ - --replace "[\"${v8}/\"]" "[\"${v8}/lib\"]" + substituteInPlace SConstruct \ + --replace "Environment( BUILD_DIR" "Environment( ENV = os.environ, BUILD_DIR" \ + --replace 'CCFLAGS=["-Werror", "-pipe"]' 'CCFLAGS=["-pipe"]' ''; buildPhase = '' - echo $PATH - scons all --cc=`which gcc` --cxx=`which g++` + export SCONSFLAGS="-j$NIX_BUILD_CORES" + scons all --use-system-all ''; installPhase = '' - scons install --cc=`which gcc` --cxx=`which g++` --full --prefix=$out - rm -rf $out/lib64 # exact same files as installed in $out/lib + mkdir -p $out/lib + scons install --use-system-all --full --prefix=$out ''; meta = { diff --git a/pkgs/servers/sql/mysql51/default.nix b/pkgs/servers/sql/mysql51/default.nix index c6392589bb6fdad83fee254aab25039391fa7321..b0f125faef7ab0c0683ae472a1bc0dc128759754 100644 --- a/pkgs/servers/sql/mysql51/default.nix +++ b/pkgs/servers/sql/mysql51/default.nix @@ -2,12 +2,12 @@ # Note: zlib is not required; MySQL can use an internal zlib. -stdenv.mkDerivation { - name = "mysql-5.1.54"; +stdenv.mkDerivation rec { + name = "mysql-5.1.69"; src = fetchurl { - url = https://downloads.mysql.com/archives/mysql-5.1/mysql-5.1.54.tar.gz; - sha256 = "07xbnwk7h1xya8s6dw34nrv7ampzag8l0l1szd2pc9zyqkzhydw4"; + url = "http://cdn.mysql.com/Downloads/MySQL-5.1/${name}.tar.gz"; + md5 = "06bbb6a11a2cbe042f80dbd333ff9f12"; }; buildInputs = [ncurses zlib perl openssl] ++ stdenv.lib.optional stdenv.isLinux ps; diff --git a/pkgs/servers/sql/mysql55/default.nix b/pkgs/servers/sql/mysql55/default.nix index 81514494c0783126af2d91ef50fa8af7f7169031..898acc1ba4930c5b2be33a4346c6438bd430f85f 100644 --- a/pkgs/servers/sql/mysql55/default.nix +++ b/pkgs/servers/sql/mysql55/default.nix @@ -4,25 +4,20 @@ stdenv.mkDerivation rec { name = "mysql-${version}"; - version = "5.5.28"; + version = "5.5.31"; src = fetchurl { - urls = [ - "mirror://sourceforge/mysql.mirror/${name}.tar.gz" - "http://mysql.linux.cz/Downloads/MySQL-5.5/${name}.tar.gz" - "http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${name}.tar.gz" - ]; - sha256 = "13y7bhjmx4daidvyqjz88yffbswb6rc1khkmiqm896fx3lglkcpr"; + url = "http://cdn.mysql.com/Downloads/MySQL-5.5/${name}.tar.gz"; + md5 = "bf402cbd52a9af33e5c25b2a4bbc56db"; }; buildInputs = [ cmake bison ncurses openssl readline zlib ] ++ stdenv.lib.optional stdenv.isDarwin perl; - enableParallelBuilding = true; cmakeFlags = "-DWITH_SSL=yes -DWITH_READLINE=yes -DWITH_EMBEDDED_SERVER=yes -DWITH_ZLIB=yes -DINSTALL_SCRIPTDIR=bin -DHAVE_IPV6=yes"; - + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; prePatch = '' diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index eddd231faa773a5cdcb224484a5a38205aae9f8f..6cb4907aa9680873e5f97aca39b29b3d272dc9ce 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -7,8 +7,6 @@ let xorg = rec { - inherit pixman; - applewmproto = (stdenv.mkDerivation ((if overrides ? applewmproto then overrides.applewmproto else x: x) { name = "applewmproto-1.4.2"; builder = ./builder.sh; @@ -883,7 +881,7 @@ let name = "libpthread-stubs-0.3"; builder = ./builder.sh; src = fetchurl { - url = http://xcb.freedesktop.org/dist/libpthread-stubs-0.3.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/libpthread-stubs-0.3.tar.bz2; sha256 = "16bjv3in19l84hbri41iayvvg4ls9gv1ma0x0qlbmwy67i7dbdim"; }; buildInputs = [pkgconfig ]; @@ -893,7 +891,7 @@ let name = "libxcb-1.9"; builder = ./builder.sh; src = fetchurl { - url = http://xcb.freedesktop.org/dist/libxcb-1.9.tar.bz2; + url = mirror://xorg/individual/xcb/libxcb-1.9.tar.bz2; sha256 = "15icn78x610dvvgnji6b3pyn8nd88lz68hq0w73pcadf78mycmw8"; }; buildInputs = [pkgconfig libxslt libpthreadstubs python libXau xcbproto libXdmcp ]; @@ -959,6 +957,16 @@ let buildInputs = [pkgconfig libfontenc freetype xproto zlib ]; })) // {inherit libfontenc freetype xproto zlib ;}; + pixman = (stdenv.mkDerivation ((if overrides ? pixman then overrides.pixman else x: x) { + name = "pixman-0.26.2"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/lib/pixman-0.26.2.tar.bz2; + sha256 = "0z34jb75wpbyj3gxn34icd8j81fk5d6s6qnwp2ncz7m8icf6afqr"; + }; + buildInputs = [pkgconfig libpng perl ]; + })) // {inherit libpng perl ;}; + printproto = (stdenv.mkDerivation ((if overrides ? printproto then overrides.printproto else x: x) { name = "printproto-1.0.5"; builder = ./builder.sh; @@ -1133,7 +1141,7 @@ let name = "xcb-proto-1.8"; builder = ./builder.sh; src = fetchurl { - url = http://xcb.freedesktop.org/dist/xcb-proto-1.8.tar.bz2; + url = mirror://xorg/individual/xcb/xcb-proto-1.8.tar.bz2; sha256 = "1c11652h9sjynw3scm1pn5z3a6ci888pq7hij8q5n8qrl33icg93"; }; buildInputs = [pkgconfig python ]; @@ -1143,7 +1151,7 @@ let name = "xcb-util-0.3.9"; builder = ./builder.sh; src = fetchurl { - url = http://xcb.freedesktop.org/dist/xcb-util-0.3.9.tar.bz2; + url = mirror://xorg/individual/xcb/xcb-util-0.3.9.tar.bz2; sha256 = "1i0qbhqkcdlbbsj7ifkyjsffl61whj24d3zlg5pxf3xj1af2a4f6"; }; buildInputs = [pkgconfig gperf m4 libxcb xproto ]; @@ -1153,7 +1161,7 @@ let name = "xcb-util-image-0.3.9"; builder = ./builder.sh; src = fetchurl { - url = http://xcb.freedesktop.org/dist/xcb-util-image-0.3.9.tar.bz2; + url = mirror://xorg/individual/xcb/xcb-util-image-0.3.9.tar.bz2; sha256 = "1pr1l1nkg197gyl9d0fpwmn72jqpxjfgn9y13q4gawg1m873qnnk"; }; buildInputs = [pkgconfig gperf m4 libxcb xcbutil xproto ]; @@ -1163,7 +1171,7 @@ let name = "xcb-util-keysyms-0.3.9"; builder = ./builder.sh; src = fetchurl { - url = http://xcb.freedesktop.org/dist/xcb-util-keysyms-0.3.9.tar.bz2; + url = mirror://xorg/individual/xcb/xcb-util-keysyms-0.3.9.tar.bz2; sha256 = "0vjwk7vrcfnlhiadv445c6skfxmdrg5v4qf81y8s2s5xagqarqbv"; }; buildInputs = [pkgconfig gperf m4 libxcb xproto ]; @@ -1183,7 +1191,7 @@ let name = "xcb-util-wm-0.3.9"; builder = ./builder.sh; src = fetchurl { - url = http://xcb.freedesktop.org/dist/xcb-util-wm-0.3.9.tar.bz2; + url = mirror://xorg/individual/xcb/xcb-util-wm-0.3.9.tar.bz2; sha256 = "0c30fj33gvwzwhyz1dhsfwni0ai16bxpvxb4l6c6s7vvj7drp3q3"; }; buildInputs = [pkgconfig gperf m4 libxcb xproto ]; @@ -1340,11 +1348,11 @@ let })) // {inherit inputproto udev xorgserver xproto ;}; xf86inputjoystick = (stdenv.mkDerivation ((if overrides ? xf86inputjoystick then overrides.xf86inputjoystick else x: x) { - name = "xf86-input-joystick-1.6.2"; + name = "xf86-input-joystick-1.6.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-joystick-1.6.2.tar.bz2; - sha256 = "038mfqairyyqvz02rk7v3i070sab1wr0k6fkxvyvxdgkfbnqcfzf"; + url = mirror://xorg/X11R7.7/src/everything/xf86-input-joystick-1.6.1.tar.bz2; + sha256 = "1xgpkdmfw4ahjlva97gs9sllzw8nlpa8mxj59g28fxhak67mvv8x"; }; buildInputs = [pkgconfig inputproto kbproto xorgserver xproto ]; })) // {inherit inputproto kbproto xorgserver xproto ;}; @@ -1380,11 +1388,11 @@ let })) // {inherit inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ;}; xf86inputvmmouse = (stdenv.mkDerivation ((if overrides ? xf86inputvmmouse then overrides.xf86inputvmmouse else x: x) { - name = "xf86-input-vmmouse-13.0.0"; + name = "xf86-input-vmmouse-12.9.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-vmmouse-13.0.0.tar.bz2; - sha256 = "0b31ap9wp7nwpnihz8m7bz3p0hhaipxxhl652nw4v380cq1vdkq4"; + url = mirror://xorg/individual/driver/xf86-input-vmmouse-12.9.0.tar.bz2; + sha256 = "1gwrna96f0p4gpjhin8yx01y5xvns2j15f7hw1jvqf7fpzv01kzv"; }; buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ]; })) // {inherit inputproto randrproto xorgserver xproto ;}; @@ -1393,7 +1401,7 @@ let name = "xf86-input-void-1.4.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-void-1.4.0.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/xf86-input-void-1.4.0.tar.bz2; sha256 = "01bmk324fq48wydvy1qrnxbw6qz0fjd0i80g0n4cqr1c4mjmif9a"; }; buildInputs = [pkgconfig xorgserver xproto ]; @@ -1410,31 +1418,31 @@ let })) // {inherit ;}; xf86videoark = (stdenv.mkDerivation ((if overrides ? xf86videoark then overrides.xf86videoark else x: x) { - name = "xf86-video-ark-0.7.5"; + name = "xf86-video-ark-0.7.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2; - sha256 = "07p5vdsj2ckxb6wh02s61akcv4qfg6s1d5ld3jn3lfaayd3f1466"; + url = mirror://xorg/X11R7.7/src/everything/xf86-video-ark-0.7.4.tar.bz2; + sha256 = "194zc35ivfh3vcxcilf9nbi88c2di8kbh84x535cljlpiajdnk5x"; }; - buildInputs = [pkgconfig fontsproto libpciaccess xextproto xorgserver xproto ]; - })) // {inherit fontsproto libpciaccess xextproto xorgserver xproto ;}; + buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ]; + })) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ;}; xf86videoast = (stdenv.mkDerivation ((if overrides ? xf86videoast then overrides.xf86videoast else x: x) { - name = "xf86-video-ast-0.97.0"; + name = "xf86-video-ast-0.93.10"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-ast-0.97.0.tar.bz2; - sha256 = "0xlfk64pa0vbg74m261fw8cn4vw6jw3nxm6wys9m4j3n2rwd9z18"; + url = mirror://xorg/X11R7.7/src/everything/xf86-video-ast-0.93.10.tar.bz2; + sha256 = "1q64z8qqa0ix3cymqiwk1s3sphd1fvvz30lvyxhgkgciygz6dm69"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videoati = (stdenv.mkDerivation ((if overrides ? xf86videoati then overrides.xf86videoati else x: x) { - name = "xf86-video-ati-7.1.0"; + name = "xf86-video-ati-6.14.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-ati-7.1.0.tar.bz2; - sha256 = "1k8hwszx1zj17z0657dna8q4k7x67adc163z44jiccyb3w2l9bn8"; + url = mirror://xorg/individual/driver/xf86-video-ati-6.14.4.tar.bz2; + sha256 = "11gg6xn65vym75769hzgzpkjsyhlkrw4zw3ncngriq7vz1g47zjg"; }; buildInputs = [pkgconfig fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; })) // {inherit fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; @@ -1450,11 +1458,11 @@ let })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videodummy = (stdenv.mkDerivation ((if overrides ? xf86videodummy then overrides.xf86videodummy else x: x) { - name = "xf86-video-dummy-0.3.6"; + name = "xf86-video-dummy-0.3.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-dummy-0.3.6.tar.bz2; - sha256 = "16773lxa74d9v2x758bx0byrmxssplqygnjn09q3klr605j5ncs4"; + url = mirror://xorg/X11R7.7/src/everything/xf86-video-dummy-0.3.5.tar.bz2; + sha256 = "0pyr50kqh7g84r4p0x09ay5kxax20dip9sh8h3cbd4xv8cswdbfm"; }; buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xf86dgaproto xorgserver xproto ]; })) // {inherit fontsproto randrproto renderproto videoproto xf86dgaproto xorgserver xproto ;}; @@ -1470,41 +1478,41 @@ let })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xorgserver xproto ;}; xf86videogeode = (stdenv.mkDerivation ((if overrides ? xf86videogeode then overrides.xf86videogeode else x: x) { - name = "xf86-video-geode-2.11.14"; + name = "xf86-video-geode-2.11.13"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-geode-2.11.14.tar.bz2; - sha256 = "1k6gl1kq2fr0gj6sqrg2rypp59f8b8pr46c902m4z4rjr530nxac"; + url = mirror://xorg/X11R7.7/src/everything/xf86-video-geode-2.11.13.tar.bz2; + sha256 = "09p2cjd2fb7h32k9qs4wp7qvhfn2zv454spv5mfplv7w2jis4863"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videoglide = (stdenv.mkDerivation ((if overrides ? xf86videoglide then overrides.xf86videoglide else x: x) { - name = "xf86-video-glide-1.2.1"; + name = "xf86-video-glide-1.2.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-glide-1.2.1.tar.bz2; - sha256 = "0vp9izdy7lgx09jfwr4ra9zvrx1hg15a5v2nhx00v31ffkh2aiyp"; + url = mirror://xorg/X11R7.7/src/everything/xf86-video-glide-1.2.0.tar.bz2; + sha256 = "0byapm9mnpqk3wijfnnan3d22ii5cw6dmg4xn1625iiz89j5vs1l"; }; buildInputs = [pkgconfig xextproto xorgserver xproto ]; })) // {inherit xextproto xorgserver xproto ;}; xf86videoglint = (stdenv.mkDerivation ((if overrides ? xf86videoglint then overrides.xf86videoglint else x: x) { - name = "xf86-video-glint-1.2.8"; + name = "xf86-video-glint-1.2.7"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-glint-1.2.8.tar.bz2; - sha256 = "08a2aark2yn9irws9c78d9q44dichr03i9zbk61jgr54ncxqhzv5"; + url = mirror://xorg/X11R7.7/src/everything/xf86-video-glint-1.2.7.tar.bz2; + sha256 = "0nf36jryabpncqq4m6sfsnmzk00f7gvfmjnl8l8sfy7w6sa6iacs"; }; buildInputs = [pkgconfig libpciaccess videoproto xextproto xf86dgaproto xorgserver xproto ]; })) // {inherit libpciaccess videoproto xextproto xf86dgaproto xorgserver xproto ;}; xf86videoi128 = (stdenv.mkDerivation ((if overrides ? xf86videoi128 then overrides.xf86videoi128 else x: x) { - name = "xf86-video-i128-1.3.6"; + name = "xf86-video-i128-1.3.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-i128-1.3.6.tar.bz2; - sha256 = "171b8lbxr56w3isph947dnw7x87hc46v6m3mcxdcz44gk167x0pq"; + url = mirror://xorg/X11R7.7/src/everything/xf86-video-i128-1.3.5.tar.bz2; + sha256 = "1sik8ck410hb2885vy7rlc590hw5br8lr2fzxgmv55jyawgfpv9y"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; @@ -1516,35 +1524,55 @@ let url = mirror://xorg/individual/driver/xf86-video-intel-2.20.19.tar.bz2; sha256 = "0k67vcf0aqhv9zmy1arxyjdl7fsrg90cjm0ryyhamghq67z0xcmr"; }; - buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXrender libXvMC ]; - })) // {inherit dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXrender libXvMC ;}; + buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess pixman randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXrender libXvMC ]; + })) // {inherit dri2proto fontsproto libdrm udev libpciaccess pixman randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXrender libXvMC ;}; + + xf86videointel_2_14_901 = (stdenv.mkDerivation ((if overrides ? xf86videointel_2_14_901 then overrides.xf86videointel_2_14_901 else x: x) { + name = "xf86-video-intel-2.14.901"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/driver/xf86-video-intel-2.14.901.tar.bz2; + sha256 = "1hm3zn96ahmirvx1iv87sk7fl7g8a6h1j7560gyw7y5b3l1zmg5r"; + }; + buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXvMC ]; + })) // {inherit dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXvMC ;}; + + xf86videointel_2_17_0 = (stdenv.mkDerivation ((if overrides ? xf86videointel_2_17_0 then overrides.xf86videointel_2_17_0 else x: x) { + name = "xf86-video-intel-2.17.0"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/driver/xf86-video-intel-2.17.0.tar.bz2; + sha256 = "11s3vjp0lrfmb4bv848fd5bajj77j3rf451lm0qyylnclbr5114b"; + }; + buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess pixman randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXrender libXvMC ]; + })) // {inherit dri2proto fontsproto libdrm udev libpciaccess pixman randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXrender libXvMC ;}; xf86videomach64 = (stdenv.mkDerivation ((if overrides ? xf86videomach64 then overrides.xf86videomach64 else x: x) { - name = "xf86-video-mach64-6.9.4"; + name = "xf86-video-mach64-6.9.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-mach64-6.9.4.tar.bz2; - sha256 = "0pl582vnc6hdxqhf5c0qdyanjqxb4crnhqlmxxml5a60syw0iwcp"; + url = mirror://xorg/X11R7.7/src/everything/xf86-video-mach64-6.9.1.tar.bz2; + sha256 = "0kl3kvpc2ny48z89313i9fi4cxzwb2pllvxcr9j5ly680ygx8slz"; }; buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; xf86videomga = (stdenv.mkDerivation ((if overrides ? xf86videomga then overrides.xf86videomga else x: x) { - name = "xf86-video-mga-1.6.2"; + name = "xf86-video-mga-1.5.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-mga-1.6.2.tar.bz2; - sha256 = "0v6agqc9lxg8jgrksc1yksmhnv70j1vnhm09i7gg14za1qjwx29z"; + url = mirror://xorg/X11R7.7/src/everything/xf86-video-mga-1.5.0.tar.bz2; + sha256 = "03l3wz5kz0hmxmzqqbkgn7pf9d956jlag04rb701a0fr1mw3v66a"; }; buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; xf86videoneomagic = (stdenv.mkDerivation ((if overrides ? xf86videoneomagic then overrides.xf86videoneomagic else x: x) { - name = "xf86-video-neomagic-1.2.7"; + name = "xf86-video-neomagic-1.2.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-neomagic-1.2.7.tar.bz2; - sha256 = "0xnbk2y5pzs1g3w2rmjc4k3nyq6kazf67bv4q3dnbywalsgfh1lz"; + url = mirror://xorg/X11R7.7/src/everything/xf86-video-neomagic-1.2.6.tar.bz2; + sha256 = "124qci48xrk0w2jy91n7vqs7s6q397zyiqqszhmkx6ld7six57mi"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;}; @@ -1570,101 +1598,101 @@ let })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videoopenchrome = (stdenv.mkDerivation ((if overrides ? xf86videoopenchrome then overrides.xf86videoopenchrome else x: x) { - name = "xf86-video-openchrome-0.3.2"; + name = "xf86-video-openchrome-0.2.906"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-openchrome-0.3.2.tar.bz2; - sha256 = "11pm8h9qxdjxn5rwz433cbnp6v0gg62b61nl20gxvghb7rgwv70m"; + url = mirror://xorg/X11R7.7/src/everything/xf86-video-openchrome-0.2.906.tar.bz2; + sha256 = "0hgzn1r7ig94xbr9dvq0bp1nxqlfp2ki8823jca3f22a2kf8wmg7"; }; - buildInputs = [pkgconfig fontsproto glproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC ]; - })) // {inherit fontsproto glproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC ;}; + buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC ]; + })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC ;}; xf86videor128 = (stdenv.mkDerivation ((if overrides ? xf86videor128 then overrides.xf86videor128 else x: x) { - name = "xf86-video-r128-6.9.1"; + name = "xf86-video-r128-6.8.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-r128-6.9.1.tar.bz2; - sha256 = "0k746kk75h3hg3wmihqlmp14s52fg0svylqay02km7misflbmqwb"; + url = mirror://xorg/X11R7.7/src/everything/xf86-video-r128-6.8.2.tar.bz2; + sha256 = "1c84x40k9qz9dnf5qs6nnjcgz7px6mpc3rbk8mj62zhp7mf16hbv"; }; buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xorgserver xproto ]; })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xorgserver xproto ;}; xf86videosavage = (stdenv.mkDerivation ((if overrides ? xf86videosavage then overrides.xf86videosavage else x: x) { - name = "xf86-video-savage-2.3.6"; + name = "xf86-video-savage-2.3.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-savage-2.3.6.tar.bz2; - sha256 = "1mk3mpwl97clxhwzl990hj31z8qfh7fd4vs6qbl5i250ykc3x0a8"; + url = mirror://xorg/X11R7.7/src/everything/xf86-video-savage-2.3.4.tar.bz2; + sha256 = "0jdy4wv3k3ylx3lajjcbsg37z2hf6366a1jvv16sv1ln6dk6lris"; }; buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; xf86videosiliconmotion = (stdenv.mkDerivation ((if overrides ? xf86videosiliconmotion then overrides.xf86videosiliconmotion else x: x) { - name = "xf86-video-siliconmotion-1.7.7"; + name = "xf86-video-siliconmotion-1.7.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.7.tar.bz2; - sha256 = "1an321kqvsxq0z35acwl99lc8hpdkayw0q180744ypcl8ffvbf47"; + url = mirror://xorg/X11R7.7/src/everything/xf86-video-siliconmotion-1.7.6.tar.bz2; + sha256 = "01sdl6ky1vmvmfgx2d44i35rqafi0z07xdy40cvindcr2k91p7x5"; }; buildInputs = [pkgconfig fontsproto libpciaccess videoproto xextproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess videoproto xextproto xorgserver xproto ;}; xf86videosis = (stdenv.mkDerivation ((if overrides ? xf86videosis then overrides.xf86videosis else x: x) { - name = "xf86-video-sis-0.10.7"; + name = "xf86-video-sis-0.10.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-sis-0.10.7.tar.bz2; - sha256 = "1l0w84x39gq4y9j81dny9r6rma1xkqvxpsavpkd8h7h8panbcbmy"; + url = mirror://xorg/X11R7.7/src/everything/xf86-video-sis-0.10.4.tar.bz2; + sha256 = "03diq0l93lfsipmwkpdb2ysgbxxryl6yakpghzc3fksjxa01112f"; }; buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xineramaproto xorgserver xproto ]; })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xineramaproto xorgserver xproto ;}; xf86videosuncg6 = (stdenv.mkDerivation ((if overrides ? xf86videosuncg6 then overrides.xf86videosuncg6 else x: x) { - name = "xf86-video-suncg6-1.1.2"; + name = "xf86-video-suncg6-1.1.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-suncg6-1.1.2.tar.bz2; - sha256 = "04fgwgk02m4nimlv67rrg1wnyahgymrn6rb2cjj1l8bmzkii4glr"; + url = mirror://xorg/X11R7.7/src/everything/xf86-video-suncg6-1.1.1.tar.bz2; + sha256 = "07w0hm63fiy5l3cpcjsl0ig8z84z9r36xm0cmnpiv3g75dy6q8fi"; }; buildInputs = [pkgconfig fontsproto randrproto renderproto xorgserver xproto ]; })) // {inherit fontsproto randrproto renderproto xorgserver xproto ;}; xf86videosunffb = (stdenv.mkDerivation ((if overrides ? xf86videosunffb then overrides.xf86videosunffb else x: x) { - name = "xf86-video-sunffb-1.2.2"; + name = "xf86-video-sunffb-1.2.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-sunffb-1.2.2.tar.bz2; - sha256 = "07z3ngifwg2d4jgq8pms47n5lr2yn0ai72g86xxjnb3k20n5ym7s"; + url = mirror://xorg/X11R7.7/src/everything/xf86-video-sunffb-1.2.1.tar.bz2; + sha256 = "04byax4sc1fn183vyyq0q11q730k16h2by4ggjky7s36wgv7ldzx"; }; buildInputs = [pkgconfig fontsproto randrproto renderproto xextproto xorgserver xproto ]; })) // {inherit fontsproto randrproto renderproto xextproto xorgserver xproto ;}; xf86videotdfx = (stdenv.mkDerivation ((if overrides ? xf86videotdfx then overrides.xf86videotdfx else x: x) { - name = "xf86-video-tdfx-1.4.5"; + name = "xf86-video-tdfx-1.4.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-tdfx-1.4.5.tar.bz2; - sha256 = "0nfqf1c8939s21ci1g7gacwzlr4g4nnilahgz7j2bz30zfnzpmbh"; + url = mirror://xorg/X11R7.7/src/everything/xf86-video-tdfx-1.4.4.tar.bz2; + sha256 = "124gsi30rj547jjd7gvv7xykfnwlyrxw0gcacamby7pvl3g33fg0"; }; buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; xf86videotga = (stdenv.mkDerivation ((if overrides ? xf86videotga then overrides.xf86videotga else x: x) { - name = "xf86-video-tga-1.2.2"; + name = "xf86-video-tga-1.2.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-tga-1.2.2.tar.bz2; - sha256 = "0cb161lvdgi6qnf1sfz722qn38q7kgakcvj7b45ba3i0020828r0"; + url = mirror://xorg/X11R7.7/src/everything/xf86-video-tga-1.2.1.tar.bz2; + sha256 = "0mdqrn02zzkdnmhg4vh9djaawg6b2p82g5qbj66z8b30yr77b93h"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;}; xf86videotrident = (stdenv.mkDerivation ((if overrides ? xf86videotrident then overrides.xf86videotrident else x: x) { - name = "xf86-video-trident-1.3.6"; + name = "xf86-video-trident-1.3.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-trident-1.3.6.tar.bz2; - sha256 = "0141qbfsm32i0pxjyx5czpa8x8m4lvapsp4amw1qigaa0gry6n3a"; + url = mirror://xorg/X11R7.7/src/everything/xf86-video-trident-1.3.5.tar.bz2; + sha256 = "02y5pzdp0a1c12jr8gghbrzgbyfbgq67x7kd7n4f323pmf8x1csb"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;}; @@ -1690,21 +1718,21 @@ let })) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ;}; xf86videovmware = (stdenv.mkDerivation ((if overrides ? xf86videovmware then overrides.xf86videovmware else x: x) { - name = "xf86-video-vmware-13.0.1"; + name = "xf86-video-vmware-12.0.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-vmware-13.0.1.tar.bz2; - sha256 = "0ggyz3yl1ly0p9c9lva5z3892vm033z49py3svd2wh92bi0xlbc0"; + url = mirror://xorg/X11R7.7/src/everything/xf86-video-vmware-12.0.2.tar.bz2; + sha256 = "0isiwx516gww8hfk3vy7js83yziyjym9mq2zjadyq1a8v5gqf9y8"; }; buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ]; })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ;}; xf86videovoodoo = (stdenv.mkDerivation ((if overrides ? xf86videovoodoo then overrides.xf86videovoodoo else x: x) { - name = "xf86-video-voodoo-1.2.5"; + name = "xf86-video-voodoo-1.2.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-voodoo-1.2.5.tar.bz2; - sha256 = "1s6p7yxmi12q4y05va53rljwyzd6ry492r1pgi7wwq6cznivhgly"; + url = mirror://xorg/X11R7.7/src/everything/xf86-video-voodoo-1.2.4.tar.bz2; + sha256 = "0ha748yz92yzn6hp2rhin3il8f4j2rs4vkgdvqkagnv1ryxkh0ph"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto xextproto xf86dgaproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xf86dgaproto xorgserver xproto ;}; @@ -1730,11 +1758,11 @@ let })) // {inherit ;}; xfs = (stdenv.mkDerivation ((if overrides ? xfs then overrides.xfs else x: x) { - name = "xfs-1.1.3"; + name = "xfs-1.1.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xfs-1.1.3.tar.bz2; - sha256 = "1dwnf5gncpnjsbh9bdrc665kfnclhzzcpwpfnprvrnq4mlr4mx3v"; + url = mirror://xorg/individual/app/xfs-1.1.2.tar.bz2; + sha256 = "17g34yq789grnic83cqj5khq0knda1w2rgabhjflsyw9wg663shd"; }; buildInputs = [pkgconfig libXfont xproto xtrans ]; })) // {inherit libXfont xproto xtrans ;}; @@ -1820,14 +1848,14 @@ let })) // {inherit inputproto libX11 libXaw xproto libXt ;}; xkeyboardconfig = (stdenv.mkDerivation ((if overrides ? xkeyboardconfig then overrides.xkeyboardconfig else x: x) { - name = "xkeyboard-config-2.8"; + name = "xkeyboard-config-2.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.8.tar.bz2; - sha256 = "1bkq415qw4r3dl139mqgal9v585x7kh3km6z1lraz2j8im3ga72f"; + url = mirror://xorg/X11R7.7/src/everything/xkeyboard-config-2.6.tar.bz2; + sha256 = "1nmb7ma8rqryicc5xqrn2hm5pwp5lkf7nj28bwbf63mz2r0mk892"; }; - buildInputs = [pkgconfig libX11 xproto ]; - })) // {inherit libX11 xproto ;}; + buildInputs = [pkgconfig ]; + })) // {inherit ;}; xkill = (stdenv.mkDerivation ((if overrides ? xkill then overrides.xkill else x: x) { name = "xkill-1.0.3"; @@ -1860,11 +1888,11 @@ let })) // {inherit libxcb ;}; xmessage = (stdenv.mkDerivation ((if overrides ? xmessage then overrides.xmessage else x: x) { - name = "xmessage-1.0.4"; + name = "xmessage-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xmessage-1.0.4.tar.bz2; - sha256 = "0s5bjlpxnmh8sxx6nfg9m0nr32r1sr3irr71wsnv76s33i34ppxw"; + url = mirror://xorg/individual/app/xmessage-1.0.3.tar.bz2; + sha256 = "0nrxidff0pcd1ampfzj91ai74j6mx613j5kqk3j0c4xdshx5v8yg"; }; buildInputs = [pkgconfig libXaw libXt ]; })) // {inherit libXaw libXt ;}; @@ -1900,14 +1928,24 @@ let })) // {inherit ;}; xorgserver = (stdenv.mkDerivation ((if overrides ? xorgserver then overrides.xorgserver else x: x) { - name = "xorg-server-1.13.4"; + name = "xorg-server-1.12.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/xserver/xorg-server-1.13.4.tar.bz2; - sha256 = "1kwq5hqgl3qmm4nxh5iwpa0wwwzsj67fxqiiglzhyyrwgy46kjd2"; + url = mirror://xorg/individual/xserver/xorg-server-1.12.4.tar.bz2; + sha256 = "1xscr6rf0q15hv3hmm51xhwk0c0rx7a2swkj14ygp8vb60sprh4a"; }; buildInputs = [pkgconfig renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ]; })) // {inherit renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ;}; + + xorgserver_1_13_0 = (stdenv.mkDerivation ((if overrides ? xorgserver_1_13_0 then overrides.xorgserver_1_13_0 else x: x) { + name = "xorg-server-1.13.0"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/xserver/xorg-server-1.13.0.tar.bz2; + sha256 = "12pjis236ss3402cg1iy749cylajjp27m3j2jbwd8yh8075r32sl"; + }; + buildInputs = [pkgconfig renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv pixman glproto ]; + })) // {inherit renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv pixman glproto ;}; xorgsgmldoctools = (stdenv.mkDerivation ((if overrides ? xorgsgmldoctools then overrides.xorgsgmldoctools else x: x) { name = "xorg-sgml-doctools-1.11"; diff --git a/pkgs/servers/x11/xorg/extra.list b/pkgs/servers/x11/xorg/extra.list index c1ef747b3a847a0771d6a033bc569db529de7003..f7f139b19c1c25661675994c2a8bff214fc58cfc 100644 --- a/pkgs/servers/x11/xorg/extra.list +++ b/pkgs/servers/x11/xorg/extra.list @@ -1,8 +1,7 @@ -http://xcb.freedesktop.org/dist/libpthread-stubs-0.3.tar.bz2 -http://xcb.freedesktop.org/dist/libxcb-1.9.tar.bz2 -http://xcb.freedesktop.org/dist/xcb-proto-1.8.tar.bz2 -http://xcb.freedesktop.org/dist/xcb-util-0.3.9.tar.bz2 -http://xcb.freedesktop.org/dist/xcb-util-image-0.3.9.tar.bz2 -http://xcb.freedesktop.org/dist/xcb-util-keysyms-0.3.9.tar.bz2 -http://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.8.tar.bz2 -http://xcb.freedesktop.org/dist/xcb-util-wm-0.3.9.tar.bz2 +mirror://xorg/individual/lib/pixman-0.26.2.tar.bz2 +mirror://xorg/individual/xcb/xcb-util-0.3.9.tar.bz2 +mirror://xorg/individual/xcb/xcb-util-image-0.3.9.tar.bz2 +mirror://xorg/individual/xcb/xcb-util-keysyms-0.3.9.tar.bz2 +mirror://xorg/individual/xcb/xcb-util-renderutil-0.3.8.tar.bz2 +mirror://xorg/individual/xcb/xcb-util-wm-0.3.9.tar.bz2 +mirror://xorg/individual/xserver/xorg-server-1.13.0.tar.bz2:xorgserver_1_13_0 diff --git a/pkgs/servers/x11/xorg/old.list b/pkgs/servers/x11/xorg/old.list index 742c656b9b76308c36802fd3f050f2549f5ca23c..94fae784488e6d884279838bdcd14e719194ec8d 100644 --- a/pkgs/servers/x11/xorg/old.list +++ b/pkgs/servers/x11/xorg/old.list @@ -2,9 +2,9 @@ mirror://xorg/individual/app/twm-1.0.7.tar.bz2 mirror://xorg/individual/app/xclock-1.0.6.tar.bz2 mirror://xorg/individual/app/xdm-1.1.11.tar.bz2 mirror://xorg/individual/app/xeyes-1.1.1.tar.bz2 -mirror://xorg/individual/app/xfs-1.1.3.tar.bz2 +mirror://xorg/individual/app/xfs-1.1.2.tar.bz2 mirror://xorg/individual/app/xinit-1.3.2.tar.bz2 -mirror://xorg/individual/app/xmessage-1.0.4.tar.bz2 +mirror://xorg/individual/app/xmessage-1.0.3.tar.bz2 mirror://xorg/individual/lib/libXp-1.0.1.tar.bz2 mirror://xorg/individual/lib/libXxf86misc-1.0.3.tar.bz2 mirror://xorg/individual/proto/printproto-1.0.5.tar.bz2 diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 1fadab2cc3d6fdda6a279f4f07cd60c909c727a5..e5b7a9a340214fce6c2483e3eadfc2b4bb991a8f 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -7,9 +7,6 @@ let ''; in { - encodings = attrs: attrs // { - buildInputs = attrs.buildInputs ++ [ xorg.mkfontscale ]; - }; fontcursormisc = attrs: attrs // { buildInputs = attrs.buildInputs ++ [ xorg.mkfontscale ]; @@ -49,6 +46,11 @@ in nativeBuildInputs = [ args.python ]; }; + pixman = attrs : attrs // { + buildInputs = [ args.pkgconfig ]; + nativeBuildInputs = [ args.perl ]; + }; + libpciaccess = attrs : attrs // { patches = [ ./libpciaccess-apple.patch ]; }; @@ -130,28 +132,83 @@ in xf86inputevdev = attrs: attrs // { preBuild = "sed -e '/motion_history_proc/d; /history_size/d;' -i src/*.c"; + NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1"; + buildInputs = attrs.buildInputs ++ [xorg.kbproto xorg.libxkbfile xorg.randrproto xorg.pixman]; installFlags = "sdkdir=\${out}/include/xorg"; }; - xf86inputjoystick = attrs: attrs // { - installFlags = "sdkdir=\${out}/include/xorg"; + xf86inputkeyboard = attrs: attrs // { + NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1"; + buildInputs = attrs.buildInputs ++ [xorg.pixman]; + }; + + xf86inputmouse = attrs: attrs // { + NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1"; + buildInputs = attrs.buildInputs ++ [xorg.pixman]; }; xf86inputsynaptics = attrs: attrs // { - buildInputs = attrs.buildInputs ++ [args.mtdev]; + NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1"; + buildInputs = attrs.buildInputs ++ [args.mtdev xorg.pixman]; installFlags = "sdkdir=\${out}/include/xorg configdir=\${out}/include/xorg"; }; - xf86inputvmmouse = attrs: attrs // { - configureFlags = [ - "--sysconfdir=$(out)/etc" - "--with-xorg-conf-dir=$(out)/share/X11/xorg.conf.d" - "--with-udev-rules-dir=$(out)/lib/udev/rules.d" - ]; + xf86inputvoid = attrs: attrs // { + NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1"; + buildInputs = attrs.buildInputs ++ [xorg.pixman]; + }; + + xf86videointel = attrs: attrs // { + buildInputs = attrs.buildInputs ++ [xorg.glproto args.mesa]; + }; + + xf86videosis = attrs: attrs // { + NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1"; + buildInputs = attrs.buildInputs ++ [xorg.glproto args.mesa]; + }; + + xf86videoati = attrs: attrs // { + NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1"; + buildInputs = attrs.buildInputs ++ [xorg.glproto args.mesa xorg.pixman]; + }; + + xf86videocirrus = attrs: attrs // { + NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1"; + buildInputs = attrs.buildInputs ++ [xorg.pixman]; + }; + + xf86videodummy = attrs: attrs // { + NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1"; + buildInputs = attrs.buildInputs ++ [xorg.pixman]; + }; + + xf86videofbdev = attrs: attrs // { + NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1"; + buildInputs = attrs.buildInputs ++ [xorg.pixman]; + }; + + xf86videoopenchrome = attrs: attrs // { + NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1"; + buildInputs = attrs.buildInputs ++ [xorg.pixman xorg.glproto args.mesa]; + }; + + xf86videonv = attrs: attrs // { + NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1"; + buildInputs = attrs.buildInputs ++ [xorg.pixman]; + }; + + xf86videovesa = attrs: attrs // { + NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1"; + buildInputs = attrs.buildInputs ++ [xorg.pixman]; + }; + + xf86videovmware = attrs: attrs // { + NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1"; + buildInputs = attrs.buildInputs ++ [xorg.pixman xorg.glproto args.mesa]; }; xdriinfo = attrs: attrs // { - buildInputs = attrs.buildInputs ++ [args.mesa]; + buildInputs = attrs.buildInputs ++ [xorg.glproto args.mesa]; }; xvinfo = attrs: attrs // { @@ -162,28 +219,44 @@ in NIX_CFLAGS_COMPILE = "-DDFLT_XKB_CONFIG_ROOT=\".\""; }; - xkeyboardconfig = attrs: attrs // { - buildInputs = attrs.buildInputs ++ [args.intltool]; + xorgserver = attrs: attrs // { + configureFlags = "--enable-xcsecurity"; # enable SECURITY extension + patches = [./xorgserver-dri-path.patch ./xorgserver-xkbcomp-path.patch ./xorgserver12-CVE-1940.patch]; + buildInputs = attrs.buildInputs ++ + [ args.zlib args.udev args.mesa args.dbus.libs + xorg.xf86bigfontproto xorg.glproto xorg.xf86driproto + xorg.compositeproto xorg.scrnsaverproto xorg.resourceproto + xorg.xineramaproto xorg.xf86dgaproto + xorg.dmxproto xorg.libdmx xorg.xf86vidmodeproto + xorg.recordproto xorg.libXext xorg.pixman xorg.libXfont + xorg.damageproto xorg.xcmiscproto xorg.xtrans xorg.bigreqsproto + ]; + propagatedBuildInputs = + [ xorg.libpciaccess xorg.inputproto xorg.xextproto xorg.randrproto + xorg.dri2proto xorg.kbproto + ]; + postInstall = + '' + rm -fr $out/share/X11/xkb/compiled + ln -s /var/tmp $out/share/X11/xkb/compiled + ''; }; - xorgserver = with xorg; attrs: attrs // { - configureFlags = [ - "--enable-xcsecurity" # enable SECURITY extension - "--with-default-font-path= " # there were only paths containing "${prefix}", - # and there are no fonts in this package anyway - ]; + xorgserver_1_13_0 = attrs: attrs // { + configureFlags = "--enable-xcsecurity"; # enable SECURITY extension patches = [./xorgserver-dri-path.patch ./xorgserver-xkbcomp-path.patch]; - buildInputs = attrs.buildInputs ++ [ xtrans ]; - propagatedBuildInputs = + buildInputs = attrs.buildInputs ++ [ args.zlib args.udev args.mesa args.dbus.libs - xf86bigfontproto glproto xf86driproto - compositeproto scrnsaverproto resourceproto - xf86dgaproto - dmxproto /*libdmx not used*/ xf86vidmodeproto - recordproto libXext pixman libXfont - damageproto xcmiscproto bigreqsproto - libpciaccess inputproto xextproto randrproto renderproto - dri2proto kbproto xineramaproto resourceproto scrnsaverproto videoproto + xorg.xf86bigfontproto xorg.glproto xorg.xf86driproto + xorg.compositeproto xorg.scrnsaverproto xorg.resourceproto + xorg.xineramaproto xorg.xf86dgaproto + xorg.dmxproto xorg.libdmx xorg.xf86vidmodeproto + xorg.recordproto xorg.libXext xorg.pixman xorg.libXfont + xorg.damageproto xorg.xcmiscproto xorg.xtrans xorg.bigreqsproto + ]; + propagatedBuildInputs = + [ xorg.libpciaccess xorg.inputproto xorg.xextproto xorg.randrproto + xorg.dri2proto xorg.kbproto ]; postInstall = '' @@ -210,11 +283,6 @@ in buildInputs = attrs.buildInputs ++ [xorg.libXrender]; }; - xcursorthemes = attrs: attrs // { - buildInputs = attrs.buildInputs ++ [xorg.xcursorgen]; - configureFlags = "--with-cursordir=$(out)/share/icons"; - }; - xinput = attrs: attrs // { buildInputs = attrs.buildInputs ++ [xorg.libXrender]; }; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 79aeb7c1a3ae95f71cde4b85744149bbf8e5cd4e..7b36163626494a52aa58378749ea2216b802063e 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -54,11 +54,13 @@ mirror://xorg/X11R7.7/src/everything/libfontenc-1.1.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/libFS-1.0.4.tar.bz2 mirror://xorg/X11R7.7/src/everything/libICE-1.0.8.tar.bz2 mirror://xorg/X11R7.7/src/everything/libpciaccess-0.13.1.tar.bz2 +mirror://xorg/X11R7.7/src/everything/libpthread-stubs-0.3.tar.bz2 mirror://xorg/X11R7.7/src/everything/libSM-1.2.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/libWindowsWM-1.0.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/libX11-1.5.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/libXau-1.0.7.tar.bz2 mirror://xorg/X11R7.7/src/everything/libXaw-1.0.11.tar.bz2 +mirror://xorg/individual/xcb/libxcb-1.9.tar.bz2 mirror://xorg/X11R7.7/src/everything/libXcomposite-0.4.3.tar.bz2 mirror://xorg/X11R7.7/src/everything/libXcursor-1.1.13.tar.bz2 mirror://xorg/X11R7.7/src/everything/libXdamage-1.1.3.tar.bz2 @@ -101,6 +103,7 @@ mirror://xorg/X11R7.7/src/everything/x11perf-1.5.4.tar.bz2 mirror://xorg/X11R7.7/src/everything/xauth-1.0.7.tar.bz2 mirror://xorg/individual/app/xbacklight-1.2.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/xbitmaps-1.1.1.tar.bz2 +mirror://xorg/individual/xcb/xcb-proto-1.8.tar.bz2 mirror://xorg/X11R7.7/src/everything/xcmiscproto-1.2.2.tar.bz2 mirror://xorg/X11R7.7/src/everything/xcmsdb-1.0.4.tar.bz2 mirror://xorg/X11R7.7/src/everything/xcursorgen-1.0.5.tar.bz2 @@ -113,42 +116,42 @@ mirror://xorg/X11R7.7/src/everything/xf86bigfontproto-1.2.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86dgaproto-2.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86driproto-2.1.1.tar.bz2 mirror://xorg/individual/driver/xf86-input-evdev-2.7.3.tar.bz2 -mirror://xorg/individual/driver/xf86-input-joystick-1.6.2.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xf86-input-joystick-1.6.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-input-keyboard-1.6.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-input-mouse-1.7.2.tar.bz2 mirror://xorg/individual/driver/xf86-input-synaptics-1.6.2.tar.bz2 -mirror://xorg/individual/driver/xf86-input-vmmouse-13.0.0.tar.bz2 -mirror://xorg/individual/driver/xf86-input-void-1.4.0.tar.bz2 -mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2 -mirror://xorg/individual/driver/xf86-video-ast-0.97.0.tar.bz2 -mirror://xorg/individual/driver/xf86-video-ati-7.1.0.tar.bz2 +mirror://xorg/individual/driver/xf86-input-vmmouse-12.9.0.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xf86-input-void-1.4.0.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xf86-video-ark-0.7.4.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xf86-video-ast-0.93.10.tar.bz2 +mirror://xorg/individual/driver/xf86-video-ati-6.14.4.tar.bz2 mirror://xorg/individual/driver/xf86-video-cirrus-1.5.1.tar.bz2 -mirror://xorg/individual/driver/xf86-video-dummy-0.3.6.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xf86-video-dummy-0.3.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-fbdev-0.4.3.tar.bz2 -mirror://xorg/individual/driver/xf86-video-geode-2.11.14.tar.bz2 -mirror://xorg/individual/driver/xf86-video-glide-1.2.1.tar.bz2 -mirror://xorg/individual/driver/xf86-video-glint-1.2.8.tar.bz2 -mirror://xorg/individual/driver/xf86-video-i128-1.3.6.tar.bz2 -mirror://xorg/individual/driver/xf86-video-intel-2.20.19.tar.bz2 -mirror://xorg/individual/driver/xf86-video-mach64-6.9.4.tar.bz2 -mirror://xorg/individual/driver/xf86-video-mga-1.6.2.tar.bz2 -mirror://xorg/individual/driver/xf86-video-neomagic-1.2.7.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xf86-video-geode-2.11.13.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xf86-video-glide-1.2.0.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xf86-video-glint-1.2.7.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xf86-video-i128-1.3.5.tar.bz2 +mirror://xorg/individual/driver/xf86-video-intel-2.20.10.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xf86-video-mach64-6.9.1.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xf86-video-mga-1.5.0.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xf86-video-neomagic-1.2.6.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-newport-0.2.4.tar.bz2 mirror://xorg/individual/driver/xf86-video-nv-2.1.20.tar.bz2 -mirror://xorg/individual/driver/xf86-video-openchrome-0.3.2.tar.bz2 -mirror://xorg/individual/driver/xf86-video-r128-6.9.1.tar.bz2 -mirror://xorg/individual/driver/xf86-video-savage-2.3.6.tar.bz2 -mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.7.tar.bz2 -mirror://xorg/individual/driver/xf86-video-sis-0.10.7.tar.bz2 -mirror://xorg/individual/driver/xf86-video-suncg6-1.1.2.tar.bz2 -mirror://xorg/individual/driver/xf86-video-sunffb-1.2.2.tar.bz2 -mirror://xorg/individual/driver/xf86-video-tdfx-1.4.5.tar.bz2 -mirror://xorg/individual/driver/xf86-video-tga-1.2.2.tar.bz2 -mirror://xorg/individual/driver/xf86-video-trident-1.3.6.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xf86-video-openchrome-0.2.906.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xf86-video-r128-6.8.2.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xf86-video-savage-2.3.4.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xf86-video-siliconmotion-1.7.6.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xf86-video-sis-0.10.4.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xf86-video-suncg6-1.1.1.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xf86-video-sunffb-1.2.1.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xf86-video-tdfx-1.4.4.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xf86-video-tga-1.2.1.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xf86-video-trident-1.3.5.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-v4l-0.2.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-vesa-2.3.2.tar.bz2 -mirror://xorg/individual/driver/xf86-video-vmware-13.0.1.tar.bz2 -mirror://xorg/individual/driver/xf86-video-voodoo-1.2.5.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xf86-video-vmware-12.0.2.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xf86-video-voodoo-1.2.4.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-wsfb-0.4.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86vidmodeproto-2.3.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/xgamma-1.0.5.tar.bz2 @@ -158,13 +161,13 @@ mirror://xorg/X11R7.7/src/everything/xinput-1.6.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/xkbcomp-1.2.4.tar.bz2 mirror://xorg/X11R7.7/src/everything/xkbevd-1.1.3.tar.bz2 mirror://xorg/X11R7.7/src/everything/xkbutils-1.0.3.tar.bz2 -mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.8.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xkeyboard-config-2.6.tar.bz2 mirror://xorg/X11R7.7/src/everything/xkill-1.0.3.tar.bz2 mirror://xorg/X11R7.7/src/everything/xlsatoms-1.1.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/xlsclients-1.1.2.tar.bz2 mirror://xorg/X11R7.7/src/everything/xmodmap-1.0.7.tar.bz2 mirror://xorg/X11R7.7/src/everything/xorg-docs-1.7.tar.bz2 -mirror://xorg/individual/xserver/xorg-server-1.13.4.tar.bz2 +mirror://xorg/individual/xserver/xorg-server-1.12.4.tar.bz2 mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-1.11.tar.bz2 mirror://xorg/X11R7.7/src/everything/xpr-1.0.4.tar.bz2 mirror://xorg/X11R7.7/src/everything/xprop-1.2.1.tar.bz2 diff --git a/pkgs/shells/ipython/default.nix b/pkgs/shells/ipython/default.nix index 82ca13185b3c2a73bb31c0d36cf4caa1f5265e86..84ca7f04e7e204fda19b2d09157b5f43c567c5c5 100644 --- a/pkgs/shells/ipython/default.nix +++ b/pkgs/shells/ipython/default.nix @@ -46,12 +46,12 @@ buildPythonPackage rec { homepage = http://ipython.scipy.org/; description = "An interactive computing environment for Python"; license = "BSD"; - longDescription = '' The goal of IPython is to create a comprehensive environment for interactive and exploratory computing. It consists of an enhanced interactive Python shell and an architecture for interactive parallel computing. ''; + maintainers = [ stdenv.lib.maintainers.bjornfor ]; }; } diff --git a/pkgs/tools/audio/pa-applet/default.nix b/pkgs/tools/audio/pa-applet/default.nix index 2cfcf35f86cb3c5b9e1e80aac90a6aaa75c2277a..c5b45743c3433beba95513b14a3c3ab94914c4ed 100644 --- a/pkgs/tools/audio/pa-applet/default.nix +++ b/pkgs/tools/audio/pa-applet/default.nix @@ -4,8 +4,9 @@ stdenv.mkDerivation rec { name = "pa-applet"; src = fetchgit { - url = "https://github.com/fernandotcl/pa-applet.git"; + url = "git://github.com/fernandotcl/pa-applet.git"; rev = "005f192df9ba6d2e6491f9aac650be42906b135a"; + sha256 = "1rqnp6nzgb3z7c6pvd5qzsxprwrzif8cfx6i7xp3f0x5s7n2dqkb"; }; buildInputs = [ diff --git a/pkgs/tools/backup/partclone/default.nix b/pkgs/tools/backup/partclone/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..b446b06f987c7c19b3e3cbc25c206035d2631fb5 --- /dev/null +++ b/pkgs/tools/backup/partclone/default.nix @@ -0,0 +1,26 @@ +{stdenv, fetchurl +, pkgconfig, libuuid +, e2fsprogs +}: +stdenv.mkDerivation { + name = "partclone-stable"; + enableParallelBuilding = true; + + src = fetchurl { + url = https://codeload.github.com/Thomas-Tsai/partclone/legacy.tar.gz/stable; + sha256 = "0vvk6c26gf2wv5y0mxnz90bivgp84pi82qk5q5xkcz6nz3swals7"; + name = "Thomas-Tsai-partclone-stable-0-gab3bd53.tar.gz"; + }; + + buildInputs = [e2fsprogs pkgconfig libuuid]; + + installPhase = ''make INSTPREFIX=$out install''; + + meta = { + description = "Partclone provides utilities to save and restore used blocks on a partition and is designed for higher compatibility of the file system by using existing libraries, e.g. e2fslibs is used to read and write the ext2 partition"; + homepage = http://partclone.org; + license = stdenv.lib.licenses.gpl2; + maintainers = [stdenv.lib.maintainers.marcweber]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/tools/backup/partimage/default.nix b/pkgs/tools/backup/partimage/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..d06ef2c836628f7b2663676109d8848148bb7ce8 --- /dev/null +++ b/pkgs/tools/backup/partimage/default.nix @@ -0,0 +1,29 @@ +{stdenv, fetchurl, bzip2, zlib, newt, openssl, pkgconfig, slang +, automake, autoconf, libtool, gettext +}: +stdenv.mkDerivation { + name = "partimage-0.6.9"; + enableParallelBuilding = true; + + src = fetchurl { + url = http://sourceforge.net/projects/partimage/files/stable/0.6.9/partimage-0.6.9.tar.bz2; + sha256 = "0db6xiphk6xnlpbxraiy31c5xzj0ql6k4rfkmqzh665yyj0nqfkm"; + }; + configureFlags = "--with-ssl-headers=${openssl}/include/openssl"; + + buildInputs = [bzip2 zlib newt newt openssl pkgconfig slang + # automake autoconf libtool gettext + ]; + + patches = [ + ./gentoos-zlib.patch + ]; + + meta = { + description = "opensource disk backup software"; + homepage = http://www.partimage.org; + license = stdenv.lib.licenses.gpl2; + maintainers = [stdenv.lib.maintainers.marcweber]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/tools/backup/partimage/gentoos-zlib.patch b/pkgs/tools/backup/partimage/gentoos-zlib.patch new file mode 100644 index 0000000000000000000000000000000000000000..05150e131e36b7f409c8a578d77bb96d5b97eb62 --- /dev/null +++ b/pkgs/tools/backup/partimage/gentoos-zlib.patch @@ -0,0 +1,33 @@ +http://bugs.gentoo.org/405323 + +--- a/src/client/imagefile.cpp ++++ b/src/client/imagefile.cpp +@@ -783,7 +783,7 @@ + else if (m_options.dwCompression == COMPRESS_GZIP) // Gzip compression + { + showDebug(1, "open gzip\n"); +- m_gzImageFile = (gzFile *) gzdopen(m_nFdImage, "wb"); //"wb1h"); ++ m_gzImageFile = gzdopen(m_nFdImage, "wb"); //"wb1h"); + if (m_gzImageFile == NULL) + { + showDebug(1, "error:%d %s\n", errno, strerror(errno)); +@@ -1098,7 +1098,7 @@ + } + else if (m_options.dwCompression == COMPRESS_GZIP) // Gzip compression + { +- m_gzImageFile = (gzFile *) gzdopen(m_nFdImage, "rb"); ++ m_gzImageFile = gzdopen(m_nFdImage, "rb"); + if (m_gzImageFile == NULL) + THROW(ERR_ERRNO, errno); + else +--- a/src/client/imagefile.h ++++ b/src/client/imagefile.h +@@ -41,7 +41,7 @@ + COptions m_options; + + FILE *m_fImageFile; +- gzFile *m_gzImageFile; ++ gzFile m_gzImageFile; + BZFILE *m_bzImageFile; + + int m_nFdImage; diff --git a/pkgs/tools/bluetooth/bluedevil/default.nix b/pkgs/tools/bluetooth/bluedevil/default.nix index 24308cdb651cbd9461f1a5b51e470b6327dc0ca1..b8b7510b882bf88b4aff193f41664b33979ddce2 100644 --- a/pkgs/tools/bluetooth/bluedevil/default.nix +++ b/pkgs/tools/bluetooth/bluedevil/default.nix @@ -1,15 +1,16 @@ -{ stdenv, fetchgit, cmake, automoc4, kdelibs, libbluedevil, shared_mime_info }: +{ stdenv, fetchurl, cmake, automoc4, kdelibs, libbluedevil, shared_mime_info, gettext }: stdenv.mkDerivation rec { - name = "bluedevil-20110303"; + name = "${pname}-${version}"; + pname = "bluedevil"; + version = "1.3.1"; - src = fetchgit { - url = git://anongit.kde.org/bluedevil.git; - sha256 = "1chx3cx43wic1sgzc651vxxiy9khbp9hcm7n40nmhnj9czfcg46q"; - rev = "7e513008aa6430d3b8d0052b14201d1d813c80b9"; + src = fetchurl { + url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.bz2"; + sha256 = "0di3hwgqzhx51x172wnbccf9f84cg69mab83qkcif0v3gv3pzy4f"; }; - buildInputs = [ cmake kdelibs libbluedevil shared_mime_info automoc4 ]; + buildInputs = [ cmake kdelibs libbluedevil shared_mime_info automoc4 gettext ]; meta = with stdenv.lib; { description = "Bluetooth manager for KDE"; diff --git a/pkgs/tools/compression/zsync/default.nix b/pkgs/tools/compression/zsync/default.nix index a657234e577c6ef6a14b36ee4ca7ae2b878cd845..3732e5b175654e733b184cb4f91de48590a86f72 100644 --- a/pkgs/tools/compression/zsync/default.nix +++ b/pkgs/tools/compression/zsync/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "zsync-0.6.1"; + name = "zsync-0.6.2"; src = fetchurl { url = "http://zsync.moria.org.uk/download/${name}.tar.bz2"; - sha256 = "13rbq2m2d4c4qqzadr1cfzrryqxvjgafr8cmask9w2acc0zpv7v1"; + sha1 = "5e69f084c8adaad6a677b68f7388ae0f9507617a"; }; meta = { diff --git a/pkgs/tools/filesystems/btrfsprogs/btrfs-progs-Fix-the-receive-code-pathing.patch b/pkgs/tools/filesystems/btrfsprogs/btrfs-progs-Fix-the-receive-code-pathing.patch deleted file mode 100644 index 6dd0639c607eb685e4794f07fd7ebc48b876936e..0000000000000000000000000000000000000000 --- a/pkgs/tools/filesystems/btrfsprogs/btrfs-progs-Fix-the-receive-code-pathing.patch +++ /dev/null @@ -1,146 +0,0 @@ -diff --git a/cmds-receive.c b/cmds-receive.c -index a8be6fa..6b7cf12 100644 ---- a/cmds-receive.c -+++ b/cmds-receive.c -@@ -52,11 +52,13 @@ static int g_verbose = 0; - struct btrfs_receive - { - int mnt_fd; -+ int dest_dir_fd; - - int write_fd; - char *write_path; - - char *root_path; -+ char *dest_dir_path; /* relative to root_path */ - char *full_subvol_path; - - struct subvol_info *cur_subvol; -@@ -150,8 +152,11 @@ static int process_subvol(const char *path, const u8 *uuid, u64 ctransid, - r->cur_subvol = calloc(1, sizeof(*r->cur_subvol)); - r->parent_subvol = NULL; - -- r->cur_subvol->path = strdup(path); -- r->full_subvol_path = path_cat(r->root_path, path); -+ if (strlen(r->dest_dir_path) == 0) -+ r->cur_subvol->path = strdup(path); -+ else -+ r->cur_subvol->path = path_cat(r->dest_dir_path, path); -+ r->full_subvol_path = path_cat3(r->root_path, r->dest_dir_path, path); - - fprintf(stderr, "At subvol %s\n", path); - -@@ -167,7 +172,7 @@ static int process_subvol(const char *path, const u8 *uuid, u64 ctransid, - - memset(&args_v1, 0, sizeof(args_v1)); - strcpy(args_v1.name, path); -- ret = ioctl(r->mnt_fd, BTRFS_IOC_SUBVOL_CREATE, &args_v1); -+ ret = ioctl(r->dest_dir_fd, BTRFS_IOC_SUBVOL_CREATE, &args_v1); - if (ret < 0) { - ret = -errno; - fprintf(stderr, "ERROR: creating subvolume %s failed. " -@@ -195,8 +200,11 @@ static int process_snapshot(const char *path, const u8 *uuid, u64 ctransid, - r->cur_subvol = calloc(1, sizeof(*r->cur_subvol)); - r->parent_subvol = NULL; - -- r->cur_subvol->path = strdup(path); -- r->full_subvol_path = path_cat(r->root_path, path); -+ if (strlen(r->dest_dir_path) == 0) -+ r->cur_subvol->path = strdup(path); -+ else -+ r->cur_subvol->path = path_cat(r->dest_dir_path, path); -+ r->full_subvol_path = path_cat3(r->root_path, r->dest_dir_path, path); - - fprintf(stderr, "At snapshot %s\n", path); - -@@ -243,7 +251,7 @@ static int process_snapshot(const char *path, const u8 *uuid, u64 ctransid, - goto out; - } - -- ret = ioctl(r->mnt_fd, BTRFS_IOC_SNAP_CREATE_V2, &args_v2); -+ ret = ioctl(r->dest_dir_fd, BTRFS_IOC_SNAP_CREATE_V2, &args_v2); - close(args_v2.fd); - if (ret < 0) { - ret = -errno; -@@ -790,17 +798,48 @@ struct btrfs_send_ops send_ops = { - int do_receive(struct btrfs_receive *r, const char *tomnt, int r_fd) - { - int ret; -+ char *dest_dir_full_path; - int end = 0; - -- r->root_path = strdup(tomnt); -- r->mnt_fd = open(tomnt, O_RDONLY | O_NOATIME); -+ dest_dir_full_path = realpath(tomnt, NULL); -+ if (!dest_dir_full_path) { -+ ret = -errno; -+ fprintf(stderr, "ERROR: realpath(%s) failed. %s\n", tomnt, -+ strerror(-ret)); -+ goto out; -+ } -+ r->dest_dir_fd = open(dest_dir_full_path, O_RDONLY | O_NOATIME); -+ if (r->dest_dir_fd < 0) { -+ ret = -errno; -+ fprintf(stderr, "ERROR: failed to open destination directory %s. %s\n", -+ dest_dir_full_path, strerror(-ret)); -+ goto out; -+ } -+ -+ ret = find_mount_root(dest_dir_full_path, &r->root_path); -+ if (ret < 0) { -+ ret = -EINVAL; -+ fprintf(stderr, "ERROR: failed to determine mount point " -+ "for %s\n", dest_dir_full_path); -+ goto out; -+ } -+ r->mnt_fd = open(r->root_path, O_RDONLY | O_NOATIME); - if (r->mnt_fd < 0) { - ret = -errno; -- fprintf(stderr, "ERROR: failed to open %s. %s\n", tomnt, -+ fprintf(stderr, "ERROR: failed to open %s. %s\n", r->root_path, - strerror(-ret)); - goto out; - } - -+ /* -+ * find_mount_root returns a root_path that is a subpath of -+ * dest_dir_full_path. Now get the other part of root_path, -+ * which is the destination dir relative to root_path. -+ */ -+ r->dest_dir_path = dest_dir_full_path + strlen(r->root_path); -+ if (r->dest_dir_path[0] == '/') -+ r->dest_dir_path++; -+ - ret = subvol_uuid_search_init(r->mnt_fd, &r->sus); - if (ret < 0) - return ret; -diff --git a/cmds-send.c b/cmds-send.c -index 9b47e70..c408bc7 100644 ---- a/cmds-send.c -+++ b/cmds-send.c -@@ -81,6 +81,14 @@ int find_mount_root(const char *path, char **mount_root) - } - } - -+ if (!longest_match) { -+ fprintf(stderr, "ERROR: Failed to find mount root for path %s.\n", -+ path); -+ fprintf(stderr, "Please make sure that you have a valid \ -+ /etc/mtab file.\n"); -+ return -ENOENT; -+ } -+ - *mount_root = realpath(longest_match, NULL); - free(longest_match); - -diff --git a/send-utils.h b/send-utils.h -index da407eb..a3e038b 100644 ---- a/send-utils.h -+++ b/send-utils.h -@@ -65,5 +65,6 @@ void subvol_uuid_search_add(struct subvol_uuid_search *s, - char *path_cat(const char *p1, const char *p2); - char *path_cat3(const char *p1, const char *p2, const char *p3); - -+int find_mount_root(const char *path, char **mount_root); - - #endif /* SEND_UTILS_H_ */ diff --git a/pkgs/tools/filesystems/btrfsprogs/btrfs-receive-help-text.patch b/pkgs/tools/filesystems/btrfsprogs/btrfs-receive-help-text.patch deleted file mode 100644 index a9892cc780edf2f1a8b971739edfd6cb0ac4a7d0..0000000000000000000000000000000000000000 --- a/pkgs/tools/filesystems/btrfsprogs/btrfs-receive-help-text.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/cmds-receive.c b/cmds-receive.c -index a8be6fa..c182175 100644 ---- a/cmds-receive.c -+++ b/cmds-receive.c -@@ -880,7 +880,7 @@ static const char * const receive_cmd_group_usage[] = { - }; - - static const char * const cmd_receive_usage[] = { -- "btrfs receive [-v] [-i ] ", -+ "btrfs receive [-v] [-f ] ", - "Receive subvolumes from stdin.", - "Receives one or more subvolumes that were previously ", - "sent with btrfs send. The received subvolumes are stored", diff --git a/pkgs/tools/filesystems/btrfsprogs/btrfs-receive-lchown.patch b/pkgs/tools/filesystems/btrfsprogs/btrfs-receive-lchown.patch deleted file mode 100644 index 3abb1ba25d32be418b0202fc5a8960ae7fb16f08..0000000000000000000000000000000000000000 --- a/pkgs/tools/filesystems/btrfsprogs/btrfs-receive-lchown.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/cmds-receive.c b/cmds-receive.c -index 6b7cf12..a6a6a5b 100644 ---- a/cmds-receive.c -+++ b/cmds-receive.c -@@ -731,7 +731,7 @@ static int process_chown(const char *path, u64 uid, u64 gid, void *user) - fprintf(stderr, "chown %s - uid=%llu, gid=%llu\n", path, - uid, gid); - -- ret = chown(full_path, uid, gid); -+ ret = lchown(full_path, uid, gid); - if (ret < 0) { - ret = -errno; diff --git a/pkgs/tools/filesystems/btrfsprogs/default.nix b/pkgs/tools/filesystems/btrfsprogs/default.nix index a42c6aa7a7ec06c2f50510041b6de4395f1d0962..a091142db249b91456f1490336ed3648c6a9f3b9 100644 --- a/pkgs/tools/filesystems/btrfsprogs/default.nix +++ b/pkgs/tools/filesystems/btrfsprogs/default.nix @@ -1,31 +1,26 @@ -{ stdenv, fetchgit, zlib, libuuid, acl, attr, e2fsprogs }: +{ stdenv, fetchgit, zlib, libuuid, acl, attr, e2fsprogs, lzo }: -let version = "0.20pre20121005"; in +let version = "0.20pre20130509"; in stdenv.mkDerivation { name = "btrfs-progs-${version}"; src = fetchgit { url = "git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git"; - rev = "91d9eec1ff044394f2b98ee7fcb76713dd33b994"; - sha256 = "72d4cd4fb23d876a17146d6231ad40a2151fa47c648485c54cf7478239b43764"; + rev = "650e656a8b9c1fbe4ec5cd8c48ae285b8abd3b69"; + sha256 = "e50e8ce9d24505711ed855f69a73d639dc5e401692a7d1c300753de3472abb21"; }; - patches = [ - ./subvol-listing.patch - ./btrfs-receive-help-text.patch - ./btrfs-progs-Fix-the-receive-code-pathing.patch - ./btrfs-receive-lchown.patch - ]; - - buildInputs = [ zlib libuuid acl attr e2fsprogs ]; + buildInputs = [ zlib libuuid acl attr e2fsprogs lzo ]; postPatch = '' cp ${./btrfs-set-received-uuid.c} btrfs-set-received-uuid.c ''; postBuild = '' - gcc -O2 -luuid -o btrfs-set-received-uuid send-utils.o rbtree.o btrfs-list.o btrfs-set-received-uuid.c + gcc -Wall -D_FILE_OFFSET_BITS=64 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -DBTRFS_FLAT_INCLUDES \ + -fPIC -g -O1 -luuid -o btrfs-set-received-uuid rbtree.o send-utils.o btrfs-list.o \ + btrfs-set-received-uuid.c ''; postInstall = '' diff --git a/pkgs/tools/filesystems/btrfsprogs/subvol-listing.patch b/pkgs/tools/filesystems/btrfsprogs/subvol-listing.patch deleted file mode 100644 index 1c113ddefbe3cc03449eec011b76233ced9a969c..0000000000000000000000000000000000000000 --- a/pkgs/tools/filesystems/btrfsprogs/subvol-listing.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- a/btrfs-list.c 2012-12-30 12:20:01.394137593 +0100 -+++ b/btrfs-list.c 2012-12-30 12:22:47.242452906 +0100 -@@ -1004,6 +1004,23 @@ - return 0; - } - -+static void __drop_deleting_roots(struct root_lookup *root_lookup) -+{ -+ struct rb_node *n; -+ -+again: -+ n = rb_first(&root_lookup->root); -+ while (n) { -+ struct root_info *entry = rb_entry(n, struct root_info, rb_node); -+ if (!entry->ref_tree) { -+ rb_erase(n, &root_lookup->root); -+ free(entry); -+ goto again; -+ } -+ n = rb_next(n); -+ } -+} -+ - static int __list_subvol_search(int fd, struct root_lookup *root_lookup) - { - int ret; -@@ -1123,6 +1140,8 @@ - break; - } - -+ __drop_deleting_roots(root_lookup); -+ - return 0; - } diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix index 4f4d235008bf73351b39555a12cde401fab4dedb..712cd32d9c33a68fba2e162d50d8c9f445491af2 100644 --- a/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libuuid }: stdenv.mkDerivation rec { - name = "e2fsprogs-1.42.5"; + name = "e2fsprogs-1.42.7"; src = fetchurl { url = "mirror://sourceforge/e2fsprogs/${name}.tar.gz"; - sha256 = "1kki3367961377wz2n6kva8q0wjjk6qhxmhp2dp3ar3lxgcamvbn"; + sha256 = "0ibkkvp6kan0hn0d1anq4n2md70j5gcm7mwna515w82xwyr02rfw"; }; buildInputs = [ pkgconfig libuuid ]; @@ -19,12 +19,18 @@ stdenv.mkDerivation rec { # libuuid, libblkid, uuidd and fsck are in util-linux-ng (the "libuuid" dependency). configureFlags = "--enable-elf-shlibs --disable-libuuid --disable-libblkid --disable-uuidd --disable-fsck"; + enableParallelBuilding = true; + preInstall = "installFlagsArray=('LN=ln -s')"; postInstall = "make install-libs"; + dontGzipMan = true; # See issue #523 + meta = { homepage = http://e2fsprogs.sourceforge.net/; description = "Tools for creating and checking ext2/ext3/ext4 filesystems"; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.eelco ]; }; } diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index 5ef6db7ae47abe43600aa86fff3179c7096f86e4..3e6902a183d5b0d476b42dd968b4496d90d3860a 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -17,11 +17,11 @@ assert libX11 != null -> (fontconfig != null && gnused != null && coreutils != null); stdenv.mkDerivation rec { - name = "gnuplot-4.4.4"; + name = "gnuplot-4.6.0"; src = fetchurl { url = "mirror://sourceforge/gnuplot/${name}.tar.gz"; - sha256 = "1zfv3npsxfn743wl65ibh11djxrc8fxzi2mgg75ppy6m12fmja6j"; + sha256 = "1ghp1jbcf95yy09lqhjcfmvb6y2101qfdbf20zs42dcs0fsssq3f"; }; buildInputs = diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix index a5d2d20968a833ba22b5e03dd234a56456868013..370ce4fc1a174396904d70867213b87998b49895 100644 --- a/pkgs/tools/graphics/graphviz/default.nix +++ b/pkgs/tools/graphics/graphviz/default.nix @@ -52,6 +52,6 @@ stdenv.mkDerivation rec { ''; platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.simons ]; + maintainers = with stdenv.lib.maintainers; [ simons bjornfor ]; }; } diff --git a/pkgs/tools/graphics/zbar/default.nix b/pkgs/tools/graphics/zbar/default.nix index 83c9b15779351ea45e43426161a7962bf73c6be7..d5cea08f3df990c1637b517d6ae5330bb0234050 100644 --- a/pkgs/tools/graphics/zbar/default.nix +++ b/pkgs/tools/graphics/zbar/default.nix @@ -1,6 +1,6 @@ x@{builderDefsPackage , imagemagickBig, pkgconfig, python, pygtk, perl, libX11, libv4l - , qt4, lzma, gtk2 + , qt4, lzma , ...}: builderDefsPackage (a : diff --git a/pkgs/tools/misc/parcellite/default.nix b/pkgs/tools/misc/parcellite/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..04ff98b5e7bb6825178ae271e820fc135a855d73 --- /dev/null +++ b/pkgs/tools/misc/parcellite/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl, pkgconfig, intltool, gtk2 }: + +stdenv.mkDerivation rec { + name = "parcellite-1.1.4"; + + src = fetchurl { + url = "mirror://sourceforge/parcellite/${name}.tar.gz"; + sha256 = "10lr2gx81i7nlxvafa9j9hnlj402k1szyi08xsl841hs1m9zdwan"; + }; + + buildInputs = [ pkgconfig intltool gtk2 ]; + + meta = { + description = "Lightweight GTK+ clipboard manager"; + homepage = "http://parcellite.sourceforge.net"; + license = "GPLv3+"; + }; +} diff --git a/pkgs/tools/networking/chrony/default.nix b/pkgs/tools/networking/chrony/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..96e2ecccd0bae0cdd1dd2e0a9b378a58bc8dc79d --- /dev/null +++ b/pkgs/tools/networking/chrony/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "chrony-1.27"; + + src = fetchurl { + url = "http://download.tuxfamily.org/chrony/${name}.tar.gz"; + sha256 = "17dfhcm5mrkg8ids0ajwscryr7fm7664kz10ygsa1ac047p3aj6l"; + }; + + meta = with stdenv.lib; { + description = "A pair of programs which are used to maintain the accuracy of the system clock on a computer."; + homepage = "http://chrony.tuxfamily.org/"; + license = licenses.gpl2; + platforms = platforms.unix; + + longDescription = '' + Chronyd is a daemon which runs in background on the system. It obtains measurements via the network of the system clock’s offset relative to time servers on other systems and adjusts the system time accordingly. For isolated systems, the user can periodically enter the correct time by hand (using Chronyc). In either case, Chronyd determines the rate at which the computer gains or loses time, and compensates for this. Chronyd implements the NTP protocol and can act as either a client or a server. + + Chronyc provides a user interface to Chronyd for monitoring its performance and configuring various settings. It can do so while running on the same computer as the Chronyd instance it is controlling or a different computer. + ''; + }; +} diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index eb93c9ef4f669ee9b1b20bb3dd219f527d4720ed..f9439f1b42aaa51a7cda3bbcb5df345a269933be 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -2,6 +2,7 @@ , zlibSupport ? false, zlib ? null , sslSupport ? false, openssl ? null , scpSupport ? false, libssh2 ? null +, gssSupport ? false, gss ? null , linkStatic ? false }: @@ -20,15 +21,21 @@ stdenv.mkDerivation rec { # Zlib and OpenSSL must be propagated because `libcurl.la' contains # "-lz -lssl", which aren't necessary direct build inputs of # applications that use Curl. - propagatedBuildInputs = - stdenv.lib.optional zlibSupport zlib ++ - stdenv.lib.optional sslSupport openssl; + propagatedBuildInputs = with stdenv.lib; + optional zlibSupport zlib ++ + optional gssSupport gss ++ + optional sslSupport openssl; - configureFlags = '' - ${if sslSupport then "--with-ssl=${openssl}" else "--without-ssl"} - ${if scpSupport then "--with-libssh2=${libssh2}" else "--without-libssh2"} - ${if linkStatic then "--enable-static --disable-shared" else ""} + preConfigure = '' + sed -e 's|/usr/bin|/no-such-path|g' -i.bak configure ''; + configureFlags = [ + ( if sslSupport then "--with-ssl=${openssl}" else "--without-ssl" ) + ( if scpSupport then "--with-libssh2=${libssh2}" else "--without-libssh2" ) + ] + ++ stdenv.lib.optional gssSupport "--with-gssapi=${gss}" + ++ stdenv.lib.optionals linkStatic [ "--enable-static" "--disable-shared" ] + ; dontDisableStatic = linkStatic; @@ -44,21 +51,18 @@ stdenv.mkDerivation rec { crossAttrs = { # We should refer to the cross built openssl # For the 'urandom', maybe it should be a cross-system option - configureFlags = '' - ${if sslSupport then "--with-ssl=${openssl.crossDrv}" else "--without-ssl"} - ${if linkStatic then "--enable-static --disable-shared" else ""} - --with-random /dev/urandom - ''; + configureFlags = [ + ( if sslSupport then "--with-ssl=${openssl.crossDrv}" else "--without-ssl" ) + "--with-random /dev/urandom" + ] + ++ stdenv.lib.optionals linkStatic [ "--enable-static" "--disable-shared" ] + ; }; passthru = { inherit sslSupport openssl; }; - preConfigure = '' - sed -e 's|/usr/bin|/no-such-path|g' -i.bak configure - ''; - meta = { homepage = "http://curl.haxx.se/"; description = "A command line tool for transferring files with URL syntax"; diff --git a/pkgs/tools/networking/filegive/default.nix b/pkgs/tools/networking/filegive/default.nix index 6f5a0b3950bf0b329fdca60ba54a3cfa4cf0f9c0..3072ba3bd4fcb7980b0717e1547a7bab3bf2bb9e 100644 --- a/pkgs/tools/networking/filegive/default.nix +++ b/pkgs/tools/networking/filegive/default.nix @@ -11,7 +11,7 @@ let sha256 = "1swwfyzaj3l40yh9np3x4fcracgs79nwryc85sxbdakx8wwxs2xb"; }; - version = "0.5.2"; + version = "0.6.1"; in stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://viric.name/cgi-bin/filegive/tarball/${name}.tar.gz?uuid=v${version}"; name = "${name}.tar.gz"; - sha256 = "0n5ilhccdy2nsdvl871nn2isr1jdlm7yncxff7zm5qzsx8k9skkz"; + sha256 = "172cvm41bqaixz50f86ppqbbridb0qnrcdldfswrs03dc569szm1"; }; buildInputs = [ go ]; diff --git a/pkgs/tools/networking/mosh/default.nix b/pkgs/tools/networking/mosh/default.nix index e5d9a656494ea7a6f13ab4cc3e5cb12d54087f50..f9562f7eff608c0bf624d159fcdbe0e3d7b18b6b 100644 --- a/pkgs/tools/networking/mosh/default.nix +++ b/pkgs/tools/networking/mosh/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, zlib, boost, protobuf, ncurses, pkgconfig, IOTty -, makeWrapper, perl }: +, makeWrapper, perl, openssl }: stdenv.mkDerivation rec { - name = "mosh-1.2.2"; + name = "mosh-1.2.4"; src = fetchurl { - url = "https://github.com/downloads/keithw/mosh/${name}.tar.gz"; - sha256 = "1763s6f398hmdgy73brpknwahnys28zk3pm37n66sr8iyz2cq8xp"; + url = "http://mosh.mit.edu/${name}.tar.gz"; + sha256 = "0inzfmqrab3n97m7rrmhd4xh3hjz0xva2sfl5m06w11668r0skg7"; }; - buildInputs = [ boost protobuf ncurses zlib pkgconfig IOTty makeWrapper perl ]; + buildInputs = [ boost protobuf ncurses zlib pkgconfig IOTty makeWrapper perl openssl ]; postInstall = '' wrapProgram $out/bin/mosh --prefix PERL5LIB : $PERL5LIB diff --git a/pkgs/tools/networking/mtr/default.nix b/pkgs/tools/networking/mtr/default.nix index 7470c07d9377d4eb29f3c4ef31de832f32f36af0..45dcb087bd76b8eee716293389fa213403045e05 100644 --- a/pkgs/tools/networking/mtr/default.nix +++ b/pkgs/tools/networking/mtr/default.nix @@ -1,4 +1,4 @@ -x@{builderDefsPackage +x@{builderDefsPackage, ncurses , ...}: builderDefsPackage (a : diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix index 8f6058d20783dd4e4f02fc34a96fe63875cd2751..1f874c70ddc806d876d1ecb15cd82214591c970f 100644 --- a/pkgs/tools/networking/network-manager-applet/default.nix +++ b/pkgs/tools/networking/network-manager-applet/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, intltool, pkgconfig, gtk, libglade, networkmanager, GConf , libnotify, libgnome_keyring, dbus_glib, polkit, isocodes , mobile_broadband_provider_info, glib_networking, gsettings_desktop_schemas -, makeWrapper }: +, makeWrapper, networkmanager_openvpn }: let pn = "network-manager-applet"; @@ -29,6 +29,8 @@ stdenv.mkDerivation rec { ]; postInstall = '' + ln -s ${networkmanager_openvpn}/etc/NetworkManager $out/etc/NetworkManager + ln -s ${networkmanager_openvpn}/lib/* $out/lib wrapProgram "$out/bin/nm-applet" \ --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "${gsettings_desktop_schemas}/share:$out/share" \ diff --git a/pkgs/tools/networking/network-manager/openvpn.nix b/pkgs/tools/networking/network-manager/openvpn.nix new file mode 100644 index 0000000000000000000000000000000000000000..15da0236172bdbc962aeb7fe443aced4494f1ac1 --- /dev/null +++ b/pkgs/tools/networking/network-manager/openvpn.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchurl, openvpn, intltool, pkgconfig, networkmanager +, withGnome ? true, gtk2, libgnome_keyring, procps, module_init_tools }: + +stdenv.mkDerivation rec { + name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; + pname = "NetworkManager-openvpn"; + version = "0.9.6.0"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/0.9/${pname}-${version}.tar.xz"; + sha256 = "18w7mlgnm7y5kg3s2jfm8biymh33ggw97bz27m5mg69kg42qgf4g"; + }; + + buildInputs = [ openvpn networkmanager ] + ++ stdenv.lib.optionals withGnome [ gtk2 libgnome_keyring ]; + + nativeBuildInputs = [ intltool pkgconfig ]; + + configureFlags = [ + "${if withGnome then "--with-gnome --with-gtkver=2" else "--without-gnome"}" + "--disable-static" + ]; + + preConfigure = '' + substituteInPlace "configure" \ + --replace "/sbin/sysctl" "${procps}/sbin/sysctl" + substituteInPlace "src/nm-openvpn-service.c" \ + --replace "/sbin/openvpn" "${openvpn}/sbin/openvpn" \ + --replace "/sbin/modprobe" "${module_init_tools}/sbin/modprobe" + substituteInPlace "properties/auth-helpers.c" \ + --replace "/sbin/openvpn" "${openvpn}/sbin/openvpn" + ''; + + postConfigure = '' + substituteInPlace "./auth-dialog/Makefile" \ + --replace "-Wstrict-prototypes" "" \ + --replace "-Werror" "" + substituteInPlace "properties/Makefile" \ + --replace "-Wstrict-prototypes" "" \ + --replace "-Werror" "" + ''; + + meta = { + description = "TODO"; + inherit (networkmanager.meta) maintainers platforms; + }; +} diff --git a/pkgs/tools/networking/tinc/default.nix b/pkgs/tools/networking/tinc/default.nix index bcfb584da1b74a327635a293c7a5d49324ac5142..dd6bfb82aab038a43b544ea62caf6d6ba06a6eb2 100644 --- a/pkgs/tools/networking/tinc/default.nix +++ b/pkgs/tools/networking/tinc/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, lzo, openssl, zlib}: stdenv.mkDerivation rec { - version = "1.0.19"; + version = "1.0.21"; name = "tinc-${version}"; src = fetchurl { url = "http://www.tinc-vpn.org/packages/tinc-${version}.tar.gz"; - sha256 = "183nxj23d05vc3pxwbb692lr048wr81wnv0avzlkdm4r6c3bp7jh"; + sha256 = "12v1x9p4f8y9967ypwxhkr10q6pk4cdallr0k4lic0kcfsmmxhba"; }; buildInputs = [ lzo openssl zlib ]; diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index e8255ccb2966ba09bb4381146e9636d520827567..55f783d792f078d0c0e295bf6385f7ff4252269c 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "nix-1.5.1"; + name = "nix-1.5.2"; src = fetchurl { url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz"; - sha256 = "c53ec8a5518445bea658e1edb4e3be8c315b583aefc55d6969f2bf6f6c805239"; + sha256 = "84880fcb94c06b11f66b28837f9c145aa3d65eb0e173fd6da195794a7b0331d1"; }; nativeBuildInputs = [ perl pkgconfig ]; diff --git a/pkgs/tools/security/gnupg/default.nix b/pkgs/tools/security/gnupg/default.nix index ba680cb8ba43636494bc31a19d7c61a1463aeacc..b94e2e50a40c72fed9055ddfcdfc4266c4b9ab27 100644 --- a/pkgs/tools/security/gnupg/default.nix +++ b/pkgs/tools/security/gnupg/default.nix @@ -13,11 +13,11 @@ assert useUsb -> (libusb != null); assert useCurl -> (curl != null); stdenv.mkDerivation rec { - name = "gnupg-2.0.19"; + name = "gnupg-2.0.20"; src = fetchurl { url = "mirror://gnupg/gnupg/${name}.tar.bz2"; - sha256 = "08n636sfffs5qvg9ppiprvsh00q0dmdw425psg3m3nssja53m8pg"; + sha256 = "16mp0j5inrcqcb3fxbn0b3aamascy3n923wiy0y8marc0rzrp53f"; }; buildInputs = [ readline zlib libgpgerror libgcrypt libassuan libksba pth ] @@ -35,7 +35,9 @@ stdenv.mkDerivation rec { doCheck = true; meta = { + homepage = "http://gnupg.org/"; description = "GNU Privacy Guard (GnuPG), GNU Project's implementation of the OpenPGP standard"; + license = stdenv.lib.licenses.gpl3Plus; longDescription = '' GnuPG is the GNU project's complete and free implementation of @@ -49,12 +51,7 @@ stdenv.mkDerivation rec { S/MIME. ''; - homepage = http://gnupg.org/; - - license = "GPLv3+"; - maintainers = with stdenv.lib.maintainers; [ ludo urkud ]; - platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/tools/security/meo/default.nix b/pkgs/tools/security/meo/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..e18b68c7593f35f2cc3aa90d21504e5bb1ad8a02 --- /dev/null +++ b/pkgs/tools/security/meo/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchhg, openssl, pcre, qt4, boost, pkcs11helper }: + +stdenv.mkDerivation { + name = "meo-20121113"; + + src = fetchhg { + url = http://oss.stamfest.net/hg/meo; + tag = "b48e5f16cff8"; + sha256 = "0ifg7y28s89i9gwda6fyj1jbrykbcvq8bf1m6rxmdcv5afi3arbq"; + }; + + buildFlags = "QMAKE=qmake"; + + buildInputs = [ openssl pcre qt4 boost pkcs11helper ]; + + preConfigure = '' + sed -i s,-mt$,, meo-gui/meo-gui.pro + ''; + + installPhase = '' + ensureDir $out/bin + cp tools/{meo,p11} $out/bin + cp meo-gui/meo-gui $out/bin + cp meo-gui/meo-gui $out/bin + ''; + + meta = { + homepage = http://oss.stamfest.net/wordpress/meo-multiple-eyepairs-only; + description = "Tools to use cryptography for things like four-eyes principles"; + license = "AGPLv3+"; + maintainers = with stdenv.lib.maintainers; [viric]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/tools/typesetting/pdf2djvu/default.nix b/pkgs/tools/typesetting/pdf2djvu/default.nix index b7204b9578420e21c78e155a3f403f971d824af2..aea28238665548b5c31bbc91f00f4af66f3d80e9 100644 --- a/pkgs/tools/typesetting/pdf2djvu/default.nix +++ b/pkgs/tools/typesetting/pdf2djvu/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, pkgconfig, djvulibre, poppler, fontconfig, libjpeg }: stdenv.mkDerivation rec { - version = "0.7.16"; + version = "0.7.11"; name = "pdf2djvu-${version}"; src = fetchurl { url = "http://pdf2djvu.googlecode.com/files/pdf2djvu_${version}.tar.gz"; - sha256 = "1yg4ppqxpfda89yi4c3rrq2zhar5dzyqypvqdvdd0r7is2321nnv"; + sha256 = "00gscd7l02jyr132vlj08ks0pgmh5ja785n3fdxa795cib45rbgq"; }; buildInputs = [ pkgconfig djvulibre poppler fontconfig libjpeg ]; @@ -15,6 +15,5 @@ stdenv.mkDerivation rec { description = "Creates djvu files from PDF files"; homepage = http://code.google.com/p/pdf2djvu/; license = stdenv.lib.licenses.gpl2; - inherit version; }; } diff --git a/pkgs/tools/typesetting/pdf2djvu/default.upstream b/pkgs/tools/typesetting/pdf2djvu/default.upstream deleted file mode 100644 index 1bb4aebdc616d75e9d7ec536d020a7da7b681fae..0000000000000000000000000000000000000000 --- a/pkgs/tools/typesetting/pdf2djvu/default.upstream +++ /dev/null @@ -1,10 +0,0 @@ -url http://code.google.com/p/pdf2djvu/downloads/list -version_link '[.]tar[.][a-z0-9]+$' -process 'code[.]google[.]com//' '' -version '.*_([0-9.]+[0-9]).*' '\1' - -do_overwrite () { - ensure_hash - set_var_value version "$CURRENT_VERSION" - set_var_value sha256 "$CURRENT_HASH" -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index adbbfe69e5c252580660247fefc7bb55006df8d0..3970ddf9fc99d0beb188e9eb2442662df4f0e77e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -581,6 +581,8 @@ let chkrootkit = callPackage ../tools/security/chkrootkit { }; + chrony = callPackage ../tools/networking/chrony { }; + cksfv = callPackage ../tools/networking/cksfv { }; ciopfs = callPackage ../tools/filesystems/ciopfs { }; @@ -799,7 +801,10 @@ let fortune = callPackage ../tools/misc/fortune { }; - fox = callPackage ../development/libraries/fox/default.nix { }; + fox = callPackage ../development/libraries/fox/default.nix { + libpng = libpng12; + }; + fox_1_6 = callPackage ../development/libraries/fox/fox-1.6.nix { }; fping = callPackage ../tools/networking/fping {}; @@ -956,6 +961,10 @@ let gzip = callPackage ../tools/compression/gzip { }; + partclone = callPackage ../tools/backup/partclone { }; + + partimage = callPackage ../tools/backup/partimage { }; + pigz = callPackage ../tools/compression/pigz { }; haproxy = callPackage ../tools/networking/haproxy { }; @@ -1047,6 +1056,8 @@ let jnettop = callPackage ../tools/networking/jnettop { }; + jq = callPackage ../development/tools/jq {}; + jscoverage = callPackage ../development/tools/misc/jscoverage { }; jwhois = callPackage ../tools/networking/jwhois { }; @@ -1146,6 +1157,8 @@ let memtest86plus = callPackage ../tools/misc/memtest86/plus.nix { }; + meo = callPackage ../tools/security/meo { }; + mc = callPackage ../tools/misc/mc { }; mcabber = callPackage ../applications/networking/instant-messengers/mcabber { }; @@ -1259,6 +1272,8 @@ let networkmanager = callPackage ../tools/networking/network-manager { }; + networkmanager_openvpn = callPackage ../tools/networking/network-manager/openvpn.nix { }; + networkmanager_pptp = callPackage ../tools/networking/network-manager/pptp.nix { }; networkmanager_pptp_gnome = networkmanager_pptp.override { withGnome = true; }; @@ -1358,6 +1373,8 @@ let parallel = callPackage ../tools/misc/parallel { }; + parcellite = callPackage ../tools/misc/parcellite { }; + patchutils = callPackage ../tools/text/patchutils { }; parted = callPackage ../tools/misc/parted { hurd = null; }; @@ -1471,7 +1488,7 @@ let pystringtemplate = callPackage ../development/python-modules/stringtemplate { }; - pythonDBus = dbus_python; + pythonDBus = callPackage ../development/python-modules/dbus { }; pythonIRClib = builderDefsPackage (import ../development/python-modules/irclib) { inherit python; @@ -1766,7 +1783,7 @@ let tigervnc = callPackage ../tools/admin/tigervnc { fontDirectories = [ xorg.fontadobe75dpi xorg.fontmiscmisc xorg.fontcursormisc xorg.fontbhlucidatypewriter75dpi ]; - inherit (xorg) xorgserver; + xorgserver = xorg.xorgserver_1_13_0; fltk = fltk13; }; @@ -1940,11 +1957,7 @@ let youtubeDL = callPackage ../tools/misc/youtube-dl { inherit (haskellPackages) pandoc; }; - zbar = callPackage ../tools/graphics/zbar { - pygtk = lib.overrideDerivation pygtk (x: { - gtk = gtk2; - }); - }; + zbar = callPackage ../tools/graphics/zbar {}; zdelta = callPackage ../tools/compression/zdelta { }; @@ -2520,9 +2533,11 @@ let fsharp = callPackage ../development/compilers/fsharp {}; - go = callPackage ../development/compilers/go { }; + go_1_0 = callPackage ../development/compilers/go { }; - go_1_1 = lowPrio (callPackage ../development/compilers/go/1.1.nix { }); + go_1_1 = callPackage ../development/compilers/go/1.1.nix { }; + + go = go_1_1; gprolog = callPackage ../development/compilers/gprolog { }; @@ -2780,13 +2795,13 @@ let urweb = callPackage ../development/compilers/urweb { }; - vala = vala19; + vala = vala17; vala15 = callPackage ../development/compilers/vala/15.2.nix { }; vala16 = callPackage ../development/compilers/vala/16.1.nix { }; - vala19 = callPackage ../development/compilers/vala/default.nix { }; + vala17 = callPackage ../development/compilers/vala/default.nix { }; visualcpp = callPackage ../development/compilers/visual-c++ { }; @@ -2941,7 +2956,6 @@ let pure = callPackage ../development/interpreters/pure {}; python3 = hiPrio (callPackage ../development/interpreters/python/3.3 { }); - python33 = callPackage ../development/interpreters/python/3.3 { }; python = python27; python26 = callPackage ../development/interpreters/python/2.6 { }; @@ -3331,6 +3345,8 @@ let licenseAccepted = (config.neoload.accept_license or false); }; + ninja = callPackage ../development/tools/build-managers/ninja { }; + noweb = callPackage ../development/tools/literate-programming/noweb { }; omake = callPackage ../development/tools/ocaml/omake { }; @@ -3415,6 +3431,8 @@ let swftools = callPackage ../tools/video/swftools { }; + tcptrack = callPackage ../development/tools/misc/tcptrack { }; + texinfo413 = callPackage ../development/tools/misc/texinfo/4.13a.nix { }; texinfo49 = callPackage ../development/tools/misc/texinfo/4.9.nix { }; texinfo5 = callPackage ../development/tools/misc/texinfo/5.1.nix { }; @@ -3629,16 +3647,23 @@ let db48 = callPackage ../development/libraries/db4/db4-4.8.nix { }; - dbus = let dbus_all = callPackage ../development/libraries/dbus { }; - in dbus_all.libs // dbus_all; # previously dbus.libs also contained the daemon - dbus_cplusplus = callPackage ../development/libraries/dbus-cplusplus { }; - dbus_glib = callPackage ../development/libraries/dbus-glib { }; - dbus_java = callPackage ../development/libraries/java/dbus-java { }; - dbus_python = callPackage ../development/python-modules/dbus { }; - # Should we deprecate these? Currently there are many references. - dbus_tools = dbus.tools; - dbus_libs = dbus.libs; - dbus_daemon = dbus.daemon; + dbus = pkgs.dbus_all.libs // { inherit (pkgs.dbus_all) libs; }; + + dbus_daemon = pkgs.dbus_all.daemon; + + dbus_tools = pkgs.dbus_all.tools; + + dbus_libs = pkgs.dbus_all.libs; + + dbus_all = callPackage ../development/libraries/dbus { + useX11 = true; + }; + + dbus_cplusplus = callPackage ../development/libraries/dbus-cplusplus { }; + + dbus_glib = callPackage ../development/libraries/dbus-glib { }; + + dbus_java = callPackage ../development/libraries/java/dbus-java { }; dclib = callPackage ../development/libraries/dclib { }; @@ -3752,6 +3777,8 @@ let gav = callPackage ../games/gav { }; + GConf3 = callPackage ../development/libraries/GConf/3.x.nix { }; + gdome2 = callPackage ../development/libraries/gdome2 { inherit (gnome) gtkdoc; }; @@ -3789,6 +3816,8 @@ let giblib = callPackage ../development/libraries/giblib { }; + libgit2 = callPackage ../development/libraries/git2 { }; + glew = callPackage ../development/libraries/glew { }; glfw = callPackage ../development/libraries/glfw { }; @@ -3970,32 +3999,25 @@ let gtkmm; }; - glib = callPackage ../development/libraries/glib { }; + glib = callPackage ../development/libraries/glib/2.34.x.nix { }; glibmm = callPackage ../development/libraries/glibmm { }; glib_networking = callPackage ../development/libraries/glib-networking {}; - atk = callPackage ../development/libraries/atk { }; + atk = callPackage ../development/libraries/atk/2.6.x.nix { }; atkmm = callPackage ../development/libraries/atkmm { }; - cairo = callPackage ../development/libraries/cairo { - pixman = pixman_cairo; # it's recommended to be in sync - }; - pixman_cairo = callPackage ../development/libraries/pixman { }; + cairo = callPackage ../development/libraries/cairo { }; cairomm = callPackage ../development/libraries/cairomm { }; cairo_1_12_2 = callPackage ../development/libraries/cairo/1.12.2.nix { }; - pango = callPackage ../development/libraries/pango { }; + pango = callPackage ../development/libraries/pango/1.30.x.nix { }; pangomm = callPackage ../development/libraries/pangomm/2.28.x.nix { }; - pangox_compat = callPackage ../development/libraries/pangox-compat { }; - - gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf { }; + gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf/2.26.x.nix { }; - gtk2 = callPackage ../development/libraries/gtk+/2.x.nix { }; - gtk3 = lowPrio (callPackage ../development/libraries/gtk+/3-default.nix { - inherit (gnome3) at_spi2_atk; - }); + gtk2 = callPackage ../development/libraries/gtk+/2.24.x.nix { }; + gtk3 = lowPrio (callPackage ../development/libraries/gtk+/3.2.x.nix { }); gtk = pkgs.gtk2; gtkmm = callPackage ../development/libraries/gtkmm/2.x.nix { }; @@ -4085,7 +4107,8 @@ let inteltbb = callPackage ../development/libraries/intel-tbb { }; - intltool = callPackage ../development/tools/misc/intltool { }; + intltool = gnome.intltool; + intltool_standalone = callPackage ../development/tools/misc/intltool {}; irrlicht3843 = callPackage ../development/libraries/irrlicht { }; @@ -4101,6 +4124,8 @@ let jama = callPackage ../development/libraries/jama { }; + jansson = callPackage ../development/libraries/jansson { }; + jbig2dec = callPackage ../development/libraries/jbig2dec { }; jetty_gwt = callPackage ../development/libraries/java/jetty-gwt { }; @@ -4129,6 +4154,8 @@ let lesstif93 = callPackage ../development/libraries/lesstif-0.93 { }; + leveldb = callPackage ../development/libraries/leveldb { }; + levmar = callPackage ../development/libraries/levmar { }; leptonica = callPackage ../development/libraries/leptonica { }; @@ -4185,7 +4212,7 @@ let libcm = callPackage ../development/libraries/libcm { }; - inherit (gnome3) libcroco; + libcroco = callPackage ../development/libraries/libcroco {}; libctemplate = callPackage ../development/libraries/libctemplate { }; @@ -4255,10 +4282,12 @@ let libgig = callPackage ../development/libraries/libgig { }; libgnome_keyring = callPackage ../development/libraries/libgnome-keyring { }; - libgnome_keyring3 = gnome3.libgnome_keyring; + libgnome_keyring3 = callPackage ../development/libraries/libgnome-keyring/3.x.nix { }; libgtop = callPackage ../development/libraries/libgtop {}; + libgweather = callPackage ../development/libraries/libgweather {}; + liblo = callPackage ../development/libraries/liblo { }; liblrdf = librdf; @@ -4349,7 +4378,9 @@ let libspectre = callPackage ../development/libraries/libspectre { }; - libgsf = callPackage ../development/libraries/libgsf { }; + libgsf = callPackage ../development/libraries/libgsf { + inherit (gnome) gnome_vfs libbonobo; + }; libiconv = callPackage ../development/libraries/libiconv { }; @@ -4377,9 +4408,9 @@ let libiptcdata = callPackage ../development/libraries/libiptcdata { }; - libjpeg_original = callPackage ../development/libraries/libjpeg { }; + libjpeg = callPackage ../development/libraries/libjpeg { }; + libjpeg_turbo = callPackage ../development/libraries/libjpeg-turbo { }; - libjpeg = if stdenv.isDarwin then libjpeg_original else libjpeg_turbo; libjpeg62 = callPackage ../development/libraries/libjpeg/62.nix { libtool = libtool_1_5; @@ -4472,9 +4503,6 @@ let libpng = callPackage ../development/libraries/libpng { }; libpng_apng = callPackage ../development/libraries/libpng/libpng-apng.nix { }; libpng12 = callPackage ../development/libraries/libpng/12.nix { }; - libpng15 = callPackage ../development/libraries/libpng/15.nix { }; - - libpaper = callPackage ../development/libraries/libpaper { }; libproxy = callPackage ../development/libraries/libproxy { }; @@ -4482,9 +4510,7 @@ let libqalculate = callPackage ../development/libraries/libqalculate { }; - librsvg = callPackage ../development/libraries/librsvg { - gtk2 = null; gtk3 = null; # neither gtk version by default - }; + librsvg = callPackage ../development/libraries/librsvg { }; librsync = callPackage ../development/libraries/librsync { }; @@ -4545,7 +4571,7 @@ let libva = callPackage ../development/libraries/libva { }; - libvdpau = callPackage ../development/libraries/libvdpau { }; + libvdpau = callPackage ../development/libraries/libvdpau { inherit (xlibs) libX11; }; libvirt = callPackage ../development/libraries/libvirt { }; @@ -4583,8 +4609,6 @@ let libxdg_basedir = callPackage ../development/libraries/libxdg-basedir { }; - libxkbcommon = callPackage ../development/libraries/libxkbcommon { }; - libxklavier = callPackage ../development/libraries/libxklavier { }; libxmi = callPackage ../development/libraries/libxmi { }; @@ -4622,14 +4646,13 @@ let liquidwar = builderDefsPackage ../games/liquidwar { inherit (xlibs) xproto libX11 libXrender; - inherit gmp mesa libjpeg + inherit gmp mesa libjpeg libpng expat gettext perl SDL SDL_image SDL_mixer SDL_ttf curl sqlite libogg libvorbis ; - guile = guile_1_8; - libpng = libpng15; # 0.0.13 needs libpng 1.2--1.5 + guile = guile_1_8; }; log4cpp = callPackage ../development/libraries/log4cpp { }; @@ -4649,15 +4672,11 @@ let mesaSupported = lib.elem system lib.platforms.mesaPlatforms; - mesa_noglu = callPackage ../development/libraries/mesa { }; - mesa_glu = callPackage ../development/libraries/mesa-glu { }; - mesa = if stdenv.isDarwin then darwinX11AndOpenGL - else buildEnv { - name = "mesa-${mesa_noglu.version}"; - paths = [ mesa_glu mesa_noglu ]; - }; darwinX11AndOpenGL = callPackage ../os-specific/darwin/native-x11-and-opengl { }; + mesa = if stdenv.isDarwin then darwinX11AndOpenGL else + callPackage ../development/libraries/mesa { }; + metaEnvironment = recurseIntoAttrs (let callPackage = newScope pkgs.metaEnvironment; in rec { sdfLibrary = callPackage ../development/libraries/sdf-library { aterm = aterm28; }; toolbuslib = callPackage ../development/libraries/toolbuslib { aterm = aterm28; inherit (windows) w32api; }; @@ -4834,6 +4853,8 @@ let physfs = callPackage ../development/libraries/physfs { }; + pkcs11helper = callPackage ../development/libraries/pkcs11helper { }; + plib = callPackage ../development/libraries/plib { }; pocketsphinx = callPackage ../development/libraries/pocketsphinx { }; @@ -4846,14 +4867,14 @@ let policykit = callPackage ../development/libraries/policykit { }; - poppler = let popplers = callPackage ../development/libraries/poppler { }; - in popplers // popplers.poppler_glib; - popplerQt4 = poppler.poppler_qt4; + poppler = callPackage ../development/libraries/poppler { + gtkSupport = true; + qt4Support = false; + }; - poppler_0_18 = callPackage ../development/libraries/poppler/0.18.nix { - glibSupport = true; - gtk3Support = false; - qt4Support = false; + popplerQt4 = poppler.override { + gtkSupport = false; + qt4Support = true; }; popt = callPackage ../development/libraries/popt { }; @@ -5185,6 +5206,8 @@ let inherit libpng; }; + wildmidi = callPackage ../development/libraries/wildmidi { }; + wvstreams = callPackage ../development/libraries/wvstreams { }; wxGTK = wxGTK28; @@ -5417,6 +5440,8 @@ let pygobject = pythonPackages.pygobject; + pygobject3 = pythonPackages.pygobject3; + pygtk = pythonPackages.pygtk; pyGtkGlade = pythonPackages.pyGtkGlade; @@ -5491,6 +5516,10 @@ let inherit stdenv lib dict; }; + dictdWiktionary = callPackage ../servers/dict/dictd-wiktionary.nix {}; + + dictdWordnet = callPackage ../servers/dict/dictd-wordnet.nix {}; + dovecot = callPackage ../servers/mail/dovecot { }; ejabberd = callPackage ../servers/xmpp/ejabberd { }; @@ -5602,6 +5631,8 @@ let gdSupport = true; }; + munin = callPackage ../servers/monitoring/munin { }; + nagiosPluginsOfficial = callPackage ../servers/monitoring/nagios/plugins/official { }; net_snmp = callPackage ../servers/monitoring/net-snmp { }; @@ -5697,12 +5728,11 @@ let xinetd = callPackage ../servers/xinetd { }; xorg = recurseIntoAttrs (import ../servers/x11/xorg/default.nix { - inherit fetchurl fetchsvn stdenv pkgconfig intltool freetype fontconfig + inherit fetchurl fetchsvn stdenv pkgconfig freetype fontconfig libxslt expat libdrm libpng zlib perl mesa xkeyboard_config dbus libuuid openssl gperf m4 autoconf libtool xmlto asciidoc udev flex bison python mtdev; automake = automake110x; - pixman = pixman_cairo; }); xorgReplacements = callPackage ../servers/x11/xorg/replacements.nix { }; @@ -5765,7 +5795,10 @@ let bcm43xx = callPackage ../os-specific/linux/firmware/bcm43xx { }; - bluez4 = callPackage ../os-specific/linux/bluez { }; + bluez4 = callPackage ../os-specific/linux/bluez { + pygobject = pygobject3; + }; + bluez5 = lowPrio (callPackage ../os-specific/linux/bluez/bluez5.nix { }); bluez = bluez4; @@ -5959,6 +5992,14 @@ let ]; }; + linux_3_2_apparmor = linux_3_2.override { + kernelPatches = [ kernelPatches.apparmor_3_2 ]; + extraConfig = '' + SECURITY_APPARMOR y + DEFAULT_SECURITY_APPARMOR y + ''; + }; + linux_3_2_xen = linux_3_2.override { extraConfig = '' XEN_DOM0 y @@ -6100,6 +6141,8 @@ let */ ndiswrapper = callPackage ../os-specific/linux/ndiswrapper { }; + netatop = callPackage ../os-specific/linux/netatop { }; + perf = callPackage ../os-specific/linux/kernel/perf.nix { }; spl = callPackage ../os-specific/linux/spl/default.nix { }; @@ -6131,6 +6174,7 @@ let # Build the kernel modules for the some of the kernels. linuxPackages_3_0 = recurseIntoAttrs (linuxPackagesFor linux_3_0 linuxPackages_3_0); linuxPackages_3_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2 linuxPackages_3_2); + linuxPackages_3_2_apparmor = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2_apparmor linuxPackages_3_2_apparmor); linuxPackages_3_2_xen = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2_xen linuxPackages_3_2_xen); linuxPackages_3_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_4 linuxPackages_3_4); linuxPackages_3_6_rpi = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_6_rpi linuxPackages_3_6_rpi); @@ -6214,9 +6258,7 @@ let nettools = callPackage ../os-specific/linux/net-tools { }; - neverball = callPackage ../games/neverball { - libpng = libpng15; - }; + neverball = callPackage ../games/neverball { }; numactl = callPackage ../os-specific/linux/numactl { }; @@ -6539,11 +6581,13 @@ let freefont_ttf = callPackage ../data/fonts/freefont-ttf { }; + freepats = callPackage ../data/misc/freepats { }; + gentium = callPackage ../data/fonts/gentium {}; gnome_user_docs = callPackage ../data/documentation/gnome-user-docs { }; - inherit (gnome3) gsettings_desktop_schemas; + gsettings_desktop_schemas = callPackage ../data/misc/gsettings-desktop-schemas {}; hicolor_icon_theme = callPackage ../data/misc/hicolor-icon-theme { }; @@ -6781,6 +6825,7 @@ let compiz = callPackage ../applications/window-managers/compiz { inherit (gnome) GConf ORBit2 metacity; boost = boost149; # https://bugs.launchpad.net/compiz/+bug/1131864 + intltool = intltool_standalone; }; coriander = callPackage ../applications/video/coriander { @@ -7028,7 +7073,13 @@ let keepassx = callPackage ../applications/misc/keepassx { }; - inherit (gnome3) evince; + # FIXME: Evince and other GNOME/GTK+ apps (e.g., Viking) provide + # `share/icons/hicolor/icon-theme.cache'. Arbitrarily give this one a + # higher priority. + evince = hiPrio (callPackage ../applications/misc/evince { + inherit (gnome) gnomedocutils gnomeicontheme libgnome + libgnomeui libglade scrollkeeper; + }); evolution_data_server = newScope (gnome) ../servers/evolution-data-server { }; @@ -7186,8 +7237,8 @@ let gmrun = callPackage ../applications/misc/gmrun {}; gnucash = callPackage ../applications/office/gnucash { - inherit (gnome2) libgnomeui libgtkhtml gtkhtml libbonoboui libgnomeprint libglade libart_lgpl; - gconf = gnome2.GConf; + inherit (gnome) libgnomeui libgtkhtml gtkhtml libbonoboui libgnomeprint; + gconf = gnome.GConf; guile = guile_1_8; slibGuile = slibGuile.override { scheme = guile_1_8; }; }; @@ -7415,7 +7466,7 @@ let jwm = callPackage ../applications/window-managers/jwm { }; k3d = callPackage ../applications/graphics/k3d { - inherit (pkgs.gnome2) gtkglext; + inherit (pkgs.gnome) gtkglext; }; keepnote = callPackage ../applications/office/keepnote { @@ -7467,7 +7518,6 @@ let freefont_ttf xorg.fontmiscmisc xorg.fontbhttf ]; }; - poppler = poppler_0_18; }; lingot = callPackage ../applications/audio/lingot { @@ -7548,6 +7598,8 @@ let mmex = callPackage ../applications/office/mmex { }; + monkeysAudio = callPackage ../applications/audio/monkeys-audio { }; + monodevelop = callPackage ../applications/editors/monodevelop { inherit (gnome) gnome_vfs libbonobo libglade libgnome GConf; mozilla = firefox; @@ -7769,6 +7821,8 @@ let qemuImage = callPackage ../applications/virtualization/qemu/linux-img { }; + qmmp = callPackage ../applications/audio/qmmp { }; + qsampler = callPackage ../applications/audio/qsampler { }; qsynth = callPackage ../applications/audio/qsynth { }; @@ -8094,12 +8148,6 @@ let weechat = callPackage ../applications/networking/irc/weechat { }; - weston = callPackage ../applications/window-managers/weston { - cairo = cairo.override { - glSupport = true; - }; - }; - wings = callPackage ../applications/graphics/wings { erlang = erlangR14B04; esdl = esdl.override { erlang = erlangR14B04; }; @@ -8155,6 +8203,7 @@ let if cfg.enableQuakeLive or false then with xlibs; [ stdenv.gcc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ] else [ ]; + gtk_modules = [ libcanberra ]; }; x11vnc = callPackage ../tools/X11/x11vnc { }; @@ -8195,7 +8244,9 @@ let xen = callPackage ../applications/virtualization/xen { }; - xfe = callPackage ../applications/misc/xfe { }; + xfe = callPackage ../applications/misc/xfe { + fox = fox_1_6; + }; xfig = callPackage ../applications/graphics/xfig { }; @@ -8582,11 +8633,6 @@ let inherit (pkgs) libsoup libwnck gtk_doc gnome_doc_utils; }; - gnome3 = callPackage ../desktops/gnome-3 { - callPackage = pkgs.newScope pkgs.gnome3; - self = pkgs.gnome3; - }; - gnome = recurseIntoAttrs gnome2; kde4 = recurseIntoAttrs pkgs.kde48; @@ -8619,6 +8665,8 @@ let in kde4 // { inherit kde4; + wrapper = callPackage ../build-support/kdewrapper {}; + recurseForRelease = true; akunambol = callPackage ../applications/networking/sync/akunambol { }; @@ -8703,6 +8751,8 @@ let rekonq = callPackage ../applications/networking/browsers/rekonq { }; + kwebkitpart = callPackage ../applications/networking/browsers/kwebkitpart { }; + rsibreak = callPackage ../applications/misc/rsibreak { }; semnotes = callPackage ../applications/misc/semnotes { }; @@ -8725,8 +8775,6 @@ let oxygen_gtk = callPackage ../misc/themes/gtk2/oxygen-gtk { }; - gnome_themes_standard = callPackage ../misc/themes/gnome-themes-standard { }; - xfce = xfce4_10; xfce4_10 = recurseIntoAttrs (import ../desktops/xfce { inherit pkgs newScope; }); @@ -8845,6 +8893,8 @@ let cvc3 = callPackage ../applications/science/logic/cvc3 {}; + ekrhyper = callPackage ../applications/science/logic/ekrhyper {}; + eprover = callPackage ../applications/science/logic/eprover { texLive = texLiveAggregationFun { paths = [ @@ -8936,6 +8986,11 @@ let pari = callPackage ../applications/science/math/pari {}; + R = callPackage ../applications/science/math/R { + inherit (xlibs) libX11 libXt; + texLive = texLiveAggregationFun { paths = [ texLive texLiveExtra ]; }; + }; + singular = callPackage ../applications/science/math/singular {}; scilab = callPackage ../applications/science/math/scilab { @@ -9043,7 +9098,7 @@ let lazylist = callPackage ../tools/typesetting/tex/lazylist { }; - lilypond = callPackage ../misc/lilypond { }; + lilypond = callPackage ../misc/lilypond { guile = guile_1_8; }; martyr = callPackage ../development/libraries/martyr { }; @@ -9065,10 +9120,13 @@ let stateDir = config.nix.stateDir or "/nix/var"; }; + nixUnstable = nixStable; + /* nixUnstable = callPackage ../tools/package-management/nix/unstable.nix { storeDir = config.nix.storeDir or "/nix/store"; stateDir = config.nix.stateDir or "/nix/var"; }; + */ nut = callPackage ../applications/misc/nut { }; diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 58b48b06ffeb5ca3be01e72127b0a2c2d114c9ad..10b0347127e22e147a3974e6a921267f2c5ad9ad 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -22,6 +22,13 @@ extensibleExceptions = self.extensibleExceptions_0_1_1_4; }; + ghc763Prefs = + self : self.haskellPlatformArgs_2013_2_0_0 self // { + haskellPlatform = self.haskellPlatform_2013_2_0_0; + binary = null; # now a core package + extensibleExceptions = self.extensibleExceptions_0_1_1_4; + }; + ghc742Prefs = self : self.haskellPlatformArgs_2012_4_0_0 self // { haskellPlatform = self.haskellPlatform_2012_4_0_0; @@ -279,19 +286,19 @@ packages_ghc761 = packages { ghcPath = ../development/compilers/ghc/7.6.1.nix; ghcBinary = ghc704Binary; - prefFun = ghcHEADPrefs; + prefFun = ghc763Prefs; }; packages_ghc762 = packages { ghcPath = ../development/compilers/ghc/7.6.2.nix; ghcBinary = ghc704Binary; - prefFun = ghcHEADPrefs; + prefFun = ghc763Prefs; }; packages_ghc763 = packages { ghcPath = ../development/compilers/ghc/7.6.3.nix; ghcBinary = ghc704Binary; - prefFun = ghcHEADPrefs; + prefFun = ghc763Prefs; }; # Reasonably current HEAD snapshot. Should *always* be lowPrio. diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index cff0c664d75e255a148fe5931d8007167b77f891..30b08114e360f3c84b525a185c03c4b29ac2a384 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -140,16 +140,21 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); haskellPlatformArgs_future = self : { inherit (self) cabal ghc; async = self.async_2_0_1_4; # 7.6 ok + attoparsec = self.attoparsec_0_10_4_0; # 7.6 ok + caseInsensitive = self.caseInsensitive_1_0_0_1; cgi = self.cgi_3001_1_7_5; # 7.6 ok fgl = self.fgl_5_4_2_4; # 7.6 ok GLUT = self.GLUT_2_4_0_0; # 7.6 ok + GLURaw = self.GLURaw_1_3_0_0; # 7.6 ok haskellSrc = self.haskellSrc_1_0_1_5; # 7.6 ok + hashable = self.hashable_1_1_2_5; # 7.6 ok html = self.html_1_0_1_2; # 7.6 ok HTTP = self.HTTP_4000_2_8; # 7.6 ok HUnit = self.HUnit_1_2_5_2; # 7.6 ok mtl = self.mtl_2_1_2; # 7.6 ok network = self.network_2_4_1_2; # 7.6 ok OpenGL = self.OpenGL_2_8_0_0; # 7.6 ok + OpenGLRaw = self.OpenGLRaw_1_3_0_0; # 7.6 ok parallel = self.parallel_3_2_0_3; # 7.6 ok parsec = self.parsec_3_1_3; # 7.6 ok QuickCheck = self.QuickCheck_2_6; # 7.6 ok @@ -162,6 +167,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); syb = self.syb_0_4_0; # 7.6 ok text = self.text_0_11_3_1; # 7.6 ok transformers = self.transformers_0_3_0_0; # 7.6 ok + unorderedContainers = self.unorderedContainers_0_2_3_0; vector = self.vector_0_10_0_1; # 7.6 ok xhtml = self.xhtml_3000_2_1; # 7.6 ok zlib = self.zlib_0_5_4_1; # 7.6 ok @@ -172,6 +178,51 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); primitive = self.primitive_0_5_0_1; # semi-official, but specified }; + haskellPlatformArgs_2013_2_0_0 = self : { + inherit (self) cabal ghc; + async = self.async_2_0_1_4; + attoparsec = self.attoparsec_0_10_4_0; + caseInsensitive = self.caseInsensitive_1_0_0_1; + cgi = self.cgi_3001_1_7_5; + fgl = self.fgl_5_4_2_4; + GLUT = self.GLUT_2_4_0_0; + GLURaw = self.GLURaw_1_3_0_0; + haskellSrc = self.haskellSrc_1_0_1_5; + hashable = self.hashable_1_1_2_5; + html = self.html_1_0_1_2; + HTTP = self.HTTP_4000_2_8; + HUnit = self.HUnit_1_2_5_2; + mtl = self.mtl_2_1_2; + network = self.network_2_4_1_2; + OpenGL = self.OpenGL_2_8_0_0; + OpenGLRaw = self.OpenGLRaw_1_3_0_0; + parallel = self.parallel_3_2_0_3; + parsec = self.parsec_3_1_3; + QuickCheck = self.QuickCheck_2_6; + random = self.random_1_0_1_1; + regexBase = self.regexBase_0_93_2; + regexCompat = self.regexCompat_0_95_1; + regexPosix = self.regexPosix_0_95_2; + split = self.split_0_2_2; + stm = self.stm_2_4_2; + syb = self.syb_0_4_0; + text = self.text_0_11_3_1; + transformers = self.transformers_0_3_0_0; + unorderedContainers = self.unorderedContainers_0_2_3_0; + vector = self.vector_0_10_0_1; + xhtml = self.xhtml_3000_2_1; + zlib = self.zlib_0_5_4_1; + cabalInstall = self.cabalInstall_1_16_0_2; + alex = self.alex_3_0_5; + haddock = self.haddock_2_13_2; + happy = self.happy_1_18_10; + primitive = self.primitive_0_5_0_1; # semi-official, but specified + }; + + haskellPlatform_2013_2_0_0 = + callPackage ../development/libraries/haskell/haskell-platform/2013.2.0.0.nix + (self.haskellPlatformArgs_2013_2_0_0 self); + haskellPlatformArgs_2012_4_0_0 = self : { inherit (self) cabal ghc; async = self.async_2_0_1_3; @@ -457,12 +508,12 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); accelerate = callPackage ../development/libraries/haskell/accelerate {}; - accelerateCuda = callPackage ../development/libraries/haskell/accelerate-cuda { - languageCQuote = self.languageCQuote_0_4_4; - }; + accelerateCuda = callPackage ../development/libraries/haskell/accelerate-cuda {}; accelerateExamples = callPackage ../development/libraries/haskell/accelerate-examples {}; + accelerateFft = callPackage ../development/libraries/haskell/accelerate-fft {}; + accelerateIo = callPackage ../development/libraries/haskell/accelerate-io {}; active = callPackage ../development/libraries/haskell/active {}; @@ -477,6 +528,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); alternativeIo = callPackage ../development/libraries/haskell/alternative-io {}; + alsaCore = callPackage ../development/libraries/haskell/alsa-core {}; + + alsaPcm = callPackage ../development/libraries/haskell/alsa-pcm {}; + appar = callPackage ../development/libraries/haskell/appar {}; ansiTerminal = callPackage ../development/libraries/haskell/ansi-terminal {}; @@ -497,15 +552,18 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); async_2_0_1_4 = callPackage ../development/libraries/haskell/async/2.0.1.4.nix {}; async = self.async_2_0_1_4; + atomicPrimops = callPackage ../development/libraries/haskell/atomic-primops {}; + attempt = callPackage ../development/libraries/haskell/attempt {}; - attoparsec = callPackage ../development/libraries/haskell/attoparsec {}; + attoparsec_0_10_4_0 = callPackage ../development/libraries/haskell/attoparsec/0.10.4.0.nix {}; + attoparsec = self.attoparsec_0_10_4_0; attoparsecBinary = callPackage ../development/libraries/haskell/attoparsec-binary {}; attoparsecConduit = callPackage ../development/libraries/haskell/attoparsec-conduit {}; - attoparsecEnumerator = callPackage ../development/libraries/haskell/attoparsec/enumerator.nix {}; + attoparsecEnumerator = callPackage ../development/libraries/haskell/attoparsec-enumerator {}; authenticate = callPackage ../development/libraries/haskell/authenticate {}; @@ -582,6 +640,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); bytestringTrie = callPackage ../development/libraries/haskell/bytestring-trie {}; + bytestringProgress = callPackage ../development/libraries/haskell/bytestring-progress {}; + c2hs = callPackage ../development/libraries/haskell/c2hs { languageC = self.languageC_0_3_2_1; }; @@ -599,7 +659,11 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); libc = pkgs.stdenv.gcc.libc; }; - caseInsensitive = callPackage ../development/libraries/haskell/case-insensitive {}; + carray = callPackage ../development/libraries/haskell/carray {}; + + caseInsensitive_1_0_0_1 = callPackage ../development/libraries/haskell/case-insensitive/1.0.0.1.nix {}; + caseInsensitive_1_0_0_2 = callPackage ../development/libraries/haskell/case-insensitive/1.0.0.2.nix {}; + caseInsensitive = self.caseInsensitive_1_0_0_2; cautiousFile = callPackage ../development/libraries/haskell/cautious-file {}; @@ -697,18 +761,16 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); cryptoRandomApi = callPackage ../development/libraries/haskell/crypto-random-api {}; - cuda_0_4_1_1 = callPackage ../development/libraries/haskell/cuda/0.4.1.1.nix { + cuda = callPackage ../development/libraries/haskell/cuda { inherit (pkgs.linuxPackages) nvidia_x11; }; - cuda_0_5_0_2 = callPackage ../development/libraries/haskell/cuda/0.5.0.2.nix { - inherit (pkgs.linuxPackages) nvidia_x11; - }; - cuda = self.cuda_0_4_1_1; csv = callPackage ../development/libraries/haskell/csv {}; cssText = callPackage ../development/libraries/haskell/css-text {}; + cufft = callPackage ../development/libraries/haskell/cufft {}; + curl = callPackage ../development/libraries/haskell/curl { curl = pkgs.curl; }; cpu = callPackage ../development/libraries/haskell/cpu {}; @@ -759,8 +821,16 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); derive = callPackage ../development/libraries/haskell/derive {}; + dependentMap = callPackage ../development/libraries/haskell/dependent-map {}; + + dependentSum = callPackage ../development/libraries/haskell/dependent-sum {}; + + dependentSumTemplate = callPackage ../development/libraries/haskell/dependent-sum-template {}; + derp = callPackage ../development/libraries/haskell/derp {}; + dice = callPackage ../development/libraries/haskell/dice {}; + diagrams = callPackage ../development/libraries/haskell/diagrams/diagrams.nix {}; diagramsCairo = callPackage ../development/libraries/haskell/diagrams/cairo.nix {}; diagramsCore = callPackage ../development/libraries/haskell/diagrams/core.nix {}; @@ -956,7 +1026,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); glpkHs = callPackage ../development/libraries/haskell/glpk-hs {}; - GLURaw = callPackage ../development/libraries/haskell/GLURaw {}; + GLURaw_1_3_0_0 = callPackage ../development/libraries/haskell/GLURaw/1.3.0.0.nix {}; + GLURaw = self.GLURaw_1_3_0_0; GLUT_2_1_1_2 = callPackage ../development/libraries/haskell/GLUT/2.1.1.2.nix {}; GLUT_2_1_2_1 = callPackage ../development/libraries/haskell/GLUT/2.1.2.1.nix {}; @@ -1136,6 +1207,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); hspecMeta = callPackage ../development/libraries/haskell/hspec-meta {}; + hstatsd = callPackage ../development/libraries/haskell/hstatsd {}; + hsyslog = callPackage ../development/libraries/haskell/hsyslog {}; html_1_0_1_2 = callPackage ../development/libraries/haskell/html/1.0.1.2.nix {}; @@ -1186,14 +1259,14 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); iproute = callPackage ../development/libraries/haskell/iproute {}; - irc = callPackage ../development/libraries/haskell/irc { - parsec = self.parsec2; - }; + irc = callPackage ../development/libraries/haskell/irc {}; iteratee = callPackage ../development/libraries/haskell/iteratee {}; ivor = callPackage ../development/libraries/haskell/ivor {}; + ixShapable = callPackage ../development/libraries/haskell/ix-shapable {}; + JuicyPixels = callPackage ../development/libraries/haskell/JuicyPixels {}; jpeg = callPackage ../development/libraries/haskell/jpeg {}; @@ -1209,13 +1282,13 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); kansasLava = callPackage ../development/libraries/haskell/kansas-lava {}; + knob = callPackage ../development/libraries/haskell/knob {}; + languageC_0_4_2 = callPackage ../development/libraries/haskell/language-c/0.4.2.nix {}; languageC_0_3_2_1 = callPackage ../development/libraries/haskell/language-c/0.3.2.1.nix {}; languageC = self.languageC_0_4_2; - languageCQuote_0_4_4 = callPackage ../development/libraries/haskell/language-c-quote/0.4.4.nix {}; - languageCQuote_0_7_1 = callPackage ../development/libraries/haskell/language-c-quote/0.7.1.nix {}; - languageCQuote = self.languageCQuote_0_7_1; + languageCQuote = callPackage ../development/libraries/haskell/language-c-quote {}; languageJavascript = callPackage ../development/libraries/haskell/language-javascript {}; @@ -1235,6 +1308,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); lens = callPackage ../development/libraries/haskell/lens {}; + lenses = callPackage ../development/libraries/haskell/lenses {}; + libmpd = callPackage ../development/libraries/haskell/libmpd {}; liblastfm = callPackage ../development/libraries/haskell/liblastfm {}; @@ -1283,6 +1358,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); mimeTypes = callPackage ../development/libraries/haskell/mime-types {}; + misfortune = callPackage ../development/libraries/haskell/misfortune {}; + MissingH = callPackage ../development/libraries/haskell/MissingH {}; mmap = callPackage ../development/libraries/haskell/mmap {}; @@ -1334,6 +1411,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); mtlparse = callPackage ../development/libraries/haskell/mtlparse {}; + mueval = callPackage ../development/libraries/haskell/mueval {}; + multiarg = callPackage ../development/libraries/haskell/multiarg {}; multiplate = callPackage ../development/libraries/haskell/multiplate {}; @@ -1418,7 +1497,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); OpenGL_2_8_0_0 = callPackage ../development/libraries/haskell/OpenGL/2.8.0.0.nix {}; OpenGL = self.OpenGL_2_8_0_0; - OpenGLRaw = callPackage ../development/libraries/haskell/OpenGLRaw {}; + OpenGLRaw_1_3_0_0 = callPackage ../development/libraries/haskell/OpenGLRaw/1.3.0.0.nix {}; + OpenGLRaw = self.OpenGLRaw_1_3_0_0; optparseApplicative = callPackage ../development/libraries/haskell/optparse-applicative {}; @@ -1613,6 +1693,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); RSA = callPackage ../development/libraries/haskell/RSA {}; + sampleFrame = callPackage ../development/libraries/haskell/sample-frame {}; + safe = callPackage ../development/libraries/haskell/safe {}; safecopy = callPackage ../development/libraries/haskell/safecopy {}; @@ -1777,6 +1859,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); Tensor = callPackage ../development/libraries/haskell/Tensor {}; + terminalProgressBar = callPackage ../development/libraries/haskell/terminal-progress-bar {}; + terminfo = callPackage ../development/libraries/haskell/terminfo {}; testFramework = callPackage ../development/libraries/haskell/test-framework {}; @@ -1860,7 +1944,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); unlambda = callPackage ../development/libraries/haskell/unlambda {}; - unorderedContainers = callPackage ../development/libraries/haskell/unordered-containers {}; + unorderedContainers_0_2_3_0 = callPackage ../development/libraries/haskell/unordered-containers/0.2.3.0.nix {}; + unorderedContainers_0_2_3_1 = callPackage ../development/libraries/haskell/unordered-containers/0.2.3.1.nix {}; + unorderedContainers = self.unorderedContainers_0_2_3_1; url = callPackage ../development/libraries/haskell/url {}; @@ -1876,6 +1962,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); uuid = callPackage ../development/libraries/haskell/uuid {}; + uuOptions = callPackage ../development/libraries/haskell/uu-options {}; + + uuInterleaved = callPackage ../development/libraries/haskell/uu-interleaved {}; + uuParsinglib = callPackage ../development/libraries/haskell/uu-parsinglib {}; vacuum = callPackage ../development/libraries/haskell/vacuum {}; @@ -2131,6 +2221,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); # Applications. + arbtt = callPackage ../applications/misc/arbtt {}; + darcs = callPackage ../applications/version-management/darcs {}; leksah = callPackage ../applications/editors/leksah { diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix index 01cebccf1bcf4da89384417f3f33aba4701d080b..48ce273c46b3549e5e323ae4d9b03b610645db05 100644 --- a/pkgs/top-level/node-packages.nix +++ b/pkgs/top-level/node-packages.nix @@ -84,7 +84,20 @@ let self = { ]; }; - "async" = self."async-0.1.22"; + "assert" = self."assert-0.4.9"; + + "assert-0.4.9" = self.buildNodePackage rec { + name = "assert-0.4.9"; + src = fetchurl { + url = "http://registry.npmjs.org/assert/-/${name}.tgz"; + sha256 = "1sxyba88p08956havkxc5m9x5v5ybcswgasgfcix31kjbww14slp"; + }; + deps = [ + self."util" + ]; + }; + + "async" = self."async-0.2.8"; "async-0.1.22" = self.buildNodePackage rec { name = "async-0.1.22"; @@ -96,6 +109,17 @@ let self = { ]; }; + + "async-0.2.8" = self.buildNodePackage rec { + name = "async-0.2.8"; + src = fetchurl { + url = "http://registry.npmjs.org/async/-/${name}.tgz"; + sha256 = "0ii3pqb70wb6nws35p1ahc40dhmj7yp85f35j8xiip473gpwbms5"; + }; + deps = [ + + ]; + }; "aws-sdk" = self."aws-sdk-*"; @@ -515,6 +539,17 @@ let self = { "diff" = self."diff-~1.0.3"; + "diff-~1.0.2" = self.buildNodePackage rec { + name = "diff-1.0.2"; + src = fetchurl { + url = "http://registry.npmjs.org/diff/-/${name}.tgz"; + sha256 = "0i9hpssk0sx3a7610qr58cm9bx1fr95dvjk4wsklgi5zyb1xiqax"; + }; + deps = [ + + ]; + }; + "diff-~1.0.3" = self.buildNodePackage rec { name = "diff-1.0.3"; src = fetchurl { @@ -552,6 +587,16 @@ let self = { ]; }; + "events.node" = self."events.node-0.4.9"; + + "events.node-0.4.9" = self.buildNodePackage rec { + name = "events.node-0.4.9"; + src = fetchurl { + url = "http://registry.npmjs.org/events.node/-/${name}.tgz"; + sha256 = "1dphp42qir4f3j68lx3403870rc3iacfsm0ppzi1cgx3lzxgknmf"; + }; + }; + "express" = self."express-*"; "express-*" = self.buildNodePackage rec { @@ -700,6 +745,16 @@ let self = { ]; }; + + "growl" = self."growl-1.7.0"; + + "growl-1.7.0" = self.buildNodePackage rec { + name = "growl-1.7.0"; + src = fetchurl { + url = "http://registry.npmjs.org/growl/-/${name}.tgz"; + sha256 = "1kzzygdxr9h6jl74iqg8n1z6kvhpi8wjmic7vdnsdm9gmvnyk9jj"; + }; + }; "hat" = self."hat-0.0.3"; @@ -798,6 +853,30 @@ let self = { ]; }; + "jade" = self."jade-0.26.3"; + + "jade-0.26.3" = self.buildNodePackage rec { + name = "jade-0.26.3"; + src = fetchurl { + url = "http://registry.npmjs.org/jade/-/${name}.tgz"; + sha256 = "02sdl7dkpnbag40gl9gii1igyd9cpw8717dvyy3njaqrxf3l4cga"; + }; + deps = [ + self."commander-~0.6.1" + self."mkdirp-0.3.0" + ]; + }; + + "jayschema" = self."jayschema-*"; + + "jayschema-*" = self.buildNodePackage rec { + name = "jayschema-0.1.5"; + src = fetchurl { + url = "http://registry.npmjs.org/jayschema/-/${name}.tgz"; + sha256 = "03f8ymrfc03qhs48nm9zibgi8axbjkqa4bfl44iqhkdjy217vqb6"; + }; + }; + "jsontool" = self."jsontool-*"; "jsontool-*" = self.buildNodePackage rec { @@ -926,6 +1005,28 @@ let self = { "mkdirp" = self."mkdirp-0.3.4"; + "mkdirp-0.3.0" = self.buildNodePackage rec { + name = "mkdirp-0.3.0"; + src = fetchurl { + url = "http://registry.npmjs.org/mkdirp/-/${name}.tgz"; + sha256 = "0zf2yxajyv94nydky2g8229pn544yz2z4ml087l6m5wwm3ind0vh"; + }; + deps = [ + + ]; + }; + + "mkdirp-0.3.3" = self.buildNodePackage rec { + name = "mkdirp-0.3.3"; + src = fetchurl { + url = "http://registry.npmjs.org/mkdirp/-/${name}.tgz"; + sha256 = "1ybxjmcj45s90izizl2v7i19vbzayjanpqv7nz7w68kmbf2i4ymn"; + }; + deps = [ + + ]; + }; + "mkdirp-0.3.4" = self.buildNodePackage rec { name = "mkdirp-0.3.4"; src = fetchurl { @@ -937,6 +1038,25 @@ let self = { ]; }; + "mocha" = self."mocha-1.9.0"; + + "mocha-1.9.0" = self.buildNodePackage rec { + name = "mocha-1.9.0"; + src = fetchurl { + url = "http://registry.npmjs.org/mocha/-/${name}.tgz"; + sha256 = "1l175lzff4h4skf98xq259jr0dv3gb3pygbpdbkb2n9jd1pd6xih"; + }; + deps = [ + self."commander-~0.6.1" + self."growl-1.7.0" + self."diff-~1.0.2" + self."debug" + self."mkdirp-0.3.3" + self."ms-0.3.0" + self."jade-0.26.3" + ]; + }; + "mongodb" = self."mongodb-1.1.11"; "mongodb-1.1.11" = self.buildNodePackage rec { @@ -963,6 +1083,16 @@ let self = { ]; }; + "ms" = self."ms-0.3.0"; + + "ms-0.3.0" = self.buildNodePackage rec { + name = "ms-0.3.0"; + src = fetchurl { + url = "http://registry.npmjs.org/ms/-/${name}.tgz"; + sha256 = "1wh7pqm55vf7l2b10rzn4zj1j4f0wba873qilyzbpnm6hq0snbpp"; + }; + }; + "nijs" = self."nijs-0.0.5"; "nijs-0.0.5" = self.buildNodePackage rec { @@ -1655,6 +1785,19 @@ let self = { ]; }; + "util" = self."util-0.4.9"; + + "util-0.4.9" = self.buildNodePackage rec { + name = "util-0.4.9"; + src = fetchurl { + url = "http://registry.npmjs.org/util/-/${name}.tgz"; + sha256 = "1rchmv7d29j5wc5m2jqk170xgn50y71hpwhy5ib515klkrnc5v1h"; + }; + deps = [ + self."events.node" + ]; + }; + "vows" = self."vows->=0.5.4"; "vows->=0.5.4" = self.buildNodePackage rec { diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e99065e10898232dac03ffce7cce8b51a79c9bcb..3cd4da0612f144302770cf93aeb3beaacac3874a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1048,6 +1048,19 @@ rec { }; }; + ConfigAutoConf = buildPerlPackage { + name = "Config-AutoConf-0.22"; + src = fetchurl { + url = mirror://cpan/authors/id/A/AM/AMBS/Config/Config-AutoConf-0.22.tar.gz; + sha256 = "1zk2xfvxd3yn3299i13vn5wm1c7jxgr7z3h0yh603xs2h9cg79wc"; + }; + propagatedBuildInputs = [ CaptureTiny ]; + meta = { + description = "A module to implement some of AutoConf macros in pure perl."; + license = "perl5"; + }; + }; + ConfigGeneral = buildPerlPackage { name = "Config-General-2.51"; src = fetchurl { @@ -1915,6 +1928,7 @@ rec { }; }; + ExtUtilsCppGuess = buildPerlModule rec { name = "ExtUtils-CppGuess-0.07"; src = fetchurl { @@ -1924,6 +1938,18 @@ rec { propagatedBuildInputs = [ CaptureTiny ]; }; + ExtUtilsLibBuilder = buildPerlModule { + name = "ExtUtils-LibBuilder-0.04"; + src = fetchurl { + url = mirror://cpan/authors/id/A/AM/AMBS/ExtUtils/ExtUtils-LibBuilder-0.04.tar.gz; + sha256 = "0j4rhx3w6nbvmxqjg6q09gm10nnpkcmqmh29cgxsfc9k14d8bb6w"; + }; + meta = { + description = "A tool to build C libraries."; + license = "perl"; + }; + }; + ExtUtilsMakeMaker = buildPerlPackage rec{ name = "ExtUtils-MakeMaker-6.66"; src = fetchurl { @@ -1969,6 +1995,15 @@ rec { buildInputs = [ Spiffy TestBase TestDifferences ]; }; + FCGI = buildPerlPackage rec { + name = "FCGI-0.74"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/FCGI/${name}.tar.gz"; + sha256 = "0m089q07kpsk8y8g2wmi3d8i1jzn5m5m00shs7vnf2lnvvv4d7pm"; + }; + buildInputs = [ ]; + }; + FileChangeNotify = buildPerlModule rec { name = "File-ChangeNotify-0.20"; src = fetchurl { @@ -2981,6 +3016,14 @@ rec { }; }; + Log4Perl = buildPerlPackage rec { + name = "Log-Log4perl-1.41"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/Log/${name}.tar.gz"; + sha256 = "0dajkgvlwsb4zdw6x3fil2n5phypq829dmqf8l9s88g9smms2a2i"; + }; + }; + LWP = buildPerlPackage { name = "libwww-perl-6.04"; src = fetchurl { @@ -3768,6 +3811,14 @@ rec { propagatedBuildInputs = [IOSocketSSL DigestHMAC]; }; + NetSNMP = buildPerlPackage rec { + name = "Net-SNMP-v6.0.1"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DT/DTOWN/${name}.tar.gz"; + sha256 = "0hdpn1cw52x8cw24m9ayzpf4rwarm0khygn1sv3wvwxkrg0pphql"; + }; + }; + NetSSLeay = buildPerlPackage rec { name = "Net-SSLeay-1.52"; src = fetchurl { @@ -5141,6 +5192,19 @@ rec { }; }; + TextBibTeX = buildPerlModule { + name = "Text-BibTeX-0.66"; + buildInputs = [ ConfigAutoConf ExtUtilsLibBuilder ]; + src = fetchurl { + url = mirror://cpan/authors/id/A/AM/AMBS/Text/Text-BibTeX-0.66.tar.gz; + sha256 = "0wymg190afqfhr5i9ws02jgnksk06h3w45770ynjjr1fs343b9j7"; + }; + meta = { + description = "Interface to read and parse BibTeX files"; + license = "perl5"; + }; + }; + TextCSV = buildPerlPackage rec { name = "Text-CSV-1.10"; src = fetchurl { @@ -5300,10 +5364,10 @@ rec { }; TimeHiRes = buildPerlPackage rec { - name = "Time-HiRes-1.9724"; + name = "Time-HiRes-1.9725"; src = fetchurl { url = "mirror://cpan/modules/by-module/Time/${name}.tar.gz"; - sha256 = "0lrwfixr3qg8j4vkfax1z4gqiccq0v0jyvc7db40qpvi88655gjs"; + sha256 = "0fr7zkc55kazcjxdkrcjgimic8xpk6imxkckdpjlggjpkggv76f0"; }; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ecc553f85e4fe55ef4a0530badafe73adac49f58..076e8a8d9b978629864a040e12fde5d2e7f29e92 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -91,6 +91,11 @@ pythonPackages = python.modules // rec { inherit python; }; + pygobject3 = import ../development/python-modules/pygobject/3.nix { + inherit (pkgs) stdenv fetchurl pkgconfig glib gobjectIntrospection cairo; + inherit python pycairo; + }; + pygtk = import ../development/python-modules/pygtk { inherit (pkgs) fetchurl stdenv pkgconfig glib gtk; inherit python buildPythonPackage pygobject pycairo; @@ -137,11 +142,11 @@ pythonPackages = python.modules // rec { almir = buildPythonPackage rec { - name = "almir-0.1.7"; + name = "almir-0.1.8"; src = fetchurl { url = "http://pypi.python.org/packages/source/a/almir/${name}.zip"; - md5 = "daea15c898487a2bded1ae6ef78633e5"; + md5 = "9a1f3c72a039622ca72b74be7a1cd37e"; }; buildInputs = [ @@ -1001,6 +1006,24 @@ pythonPackages = python.modules // rec { }; + pudb = buildPythonPackage rec { + name = "pudb-2013.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/pudb/${name}.tar.gz"; + md5 = "f94922aba7f862f13886457dc3fadc6a"; + }; + + propagatedBuildInputs = [ pythonPackages.pygments pythonPackages.urwid ]; + + meta = with stdenv.lib; { + description = "A full-screen, console-based Python debugger"; + license = licenses.mit; + platforms = platforms.all; + }; + }; + + pyramid = buildPythonPackage rec { name = "pyramid-1.3.4"; @@ -1321,6 +1344,12 @@ pythonPackages = python.modules // rec { propagatedBuildInputs = with pkgs; [ pyGtkGlade libtorrentRasterbar twisted Mako chardet pyxdg pyopenssl ]; + + postInstall = '' + cp -R deluge/data/share $out/share + cp -R deluge/data/pixmaps $out/share/ + cp -R deluge/data/icons $out/share/ + ''; meta = { homepage = http://deluge-torrent.org; @@ -1386,11 +1415,11 @@ pythonPackages = python.modules // rec { django_1_3 = buildPythonPackage rec { - name = "Django-1.3.3"; + name = "Django-1.3.7"; src = fetchurl { url = "http://www.djangoproject.com/m/releases/1.3/${name}.tar.gz"; - sha256 = "0snlrcvk92qj1v0n9dpycn6sw56w4zns4mpc30837q6yi7ylrx4f"; + sha256 = "12pv8y2x3fhrcrjayfm6z40r57iwchfi5r19ajs8q8z78i3z8l7f"; }; # error: invalid command 'test' @@ -1404,11 +1433,11 @@ pythonPackages = python.modules // rec { django_evolution = buildPythonPackage rec { - name = "django_evolution-0.6.7"; + name = "django_evolution-0.6.9"; src = fetchurl { url = "http://pypi.python.org/packages/source/d/django_evolution/${name}.tar.gz"; - md5 = "24b8373916f53f74d701b99a6cf41409"; + md5 = "c0d7d10bc41898c88b14d434c48766ff"; }; propagatedBuildInputs = [ django_1_3 ]; @@ -1421,14 +1450,14 @@ pythonPackages = python.modules // rec { djblets = buildPythonPackage rec { - name = "Djblets-0.6.23"; + name = "Djblets-0.6.28"; src = fetchurl { url = "http://downloads.reviewboard.org/releases/Djblets/0.6/${name}.tar.gz"; - sha256 = "1d8vg5a9q2ldnbxqap1893lqb66jwcsli2brbjx7mcnqrzcz449x"; + sha256 = "11fsi911cqkjgv9j7646ljc2fgxsdfyq44kzmv01xhysm50fn6xx"; }; - propagatedBuildInputs = [ pil django_1_3 ]; + propagatedBuildInputs = [ pil django_1_3 feedparser ]; meta = { description = "A collection of useful extensions for Django"; @@ -1990,11 +2019,11 @@ pythonPackages = python.modules // rec { jedi = buildPythonPackage (rec { - name = "jedi-0.5b5"; + name = "jedi-0.6.0"; src = fetchurl { url = "http://pypi.python.org/packages/source/j/jedi/${name}.tar.gz"; - sha256 = "10xqdhda9kdbc22h4dphxqjncpdb80s1crxsirr5h016rw9czsa4"; + sha256 = "0k27nai69ypi9whipg45s1myqr477wj7jaryqv37bqqij4jc85hg"; }; meta = { @@ -2928,11 +2957,11 @@ pythonPackages = python.modules // rec { pg8000 = buildPythonPackage rec { - name = "pg8000-1.08"; + name = "pg8000-1.09"; src = fetchurl { - url = "http://pybrary.net/pg8000/dist/${name}.tar.gz"; - md5 = "2e8317a22d0e09a6f12e98ddf3bb75fd"; + url = "http://pg8000.googlecode.com/files/${name}.zip"; + sha256 = "0kdc4rg47k1qkq22inghd50xlxjdkfcilym8mxff8wy4h091xykw"; }; buildInputs = [ pkgs.unzip ]; @@ -3030,6 +3059,46 @@ pythonPackages = python.modules // rec { }; + powerline = buildPythonPackage rec { + rev = "72ea6730ead85fc19b983bd70173d15e6caa4965"; + name = "powerline-beta_${rev}"; + + src = fetchurl { + url = "https://github.com/Lokaltog/powerline/tarball/${rev}"; + name = "${name}.tar.bz"; + sha256 = "08sr8ymhphh7rsn2gcmpdz3kzd04b7w3k4pc35h8w60jvg9i449s"; + }; + + propagatedBuildInputs = [ pkgs.git pkgs.mercurial pkgs.bazaar pythonPackages.psutil pythonPackages.pygit2 ]; + + # error: This is still beta and some tests still fail + doCheck = false; + + postInstall = '' + install -dm755 "$out/share/fonts/OTF/" + install -dm755 "$out/etc/fonts/conf.d" + install -m644 "font/PowerlineSymbols.otf" "$out/share/fonts/OTF/PowerlineSymbols.otf" + install -m644 "font/10-powerline-symbols.conf" "$out/etc/fonts/conf.d/10-powerline-symbols.conf" + + install -dm755 "$out/share/vim/vimfiles/plugin" + install -m644 "powerline/bindings/vim/plugin/powerline.vim" "$out/share/vim/vimfiles/plugin/powerline.vim" + + install -dm755 "$out/share/zsh/site-contrib" + install -m644 "powerline/bindings/zsh/powerline.zsh" "$out/share/zsh/site-contrib/powerline.zsh" + + install -dm755 "$out/share/tmux" + install -m644 "powerline/bindings/tmux/powerline.conf" "$out/share/tmux/powerline.conf" + ''; + + meta = { + homepage = https://github.com/Lokaltog/powerline; + description = "The ultimate statusline/prompt utility."; + license = with stdenv.lib.licenses; mit; + platforms = with stdenv.lib.platforms; all; + }; + }; + + prettytable = buildPythonPackage rec { name = "prettytable-0.7.1"; @@ -3163,6 +3232,25 @@ pythonPackages = python.modules // rec { }; + pygit2 = buildPythonPackage rec { + name = "pygit2-0.18.1"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/pygit2/${name}.tar.gz"; + md5 = "8d27f84509a96d6791a6c393ae67d7c8"; + }; + + propagatedBuildInputs = [ pkgs.libgit2 ]; + + meta = { + homepage = https://pypi.python.org/pypi/pygit2; + description = "Pygit2 is a set of Python bindings to the libgit2 shared library."; + license = with stdenv.lib.licenses; gpl2; + platforms = with stdenv.lib.platforms; all; + }; + }; + + Babel = buildPythonPackage (rec { name = "Babel-0.9.6"; @@ -3844,15 +3932,15 @@ pythonPackages = python.modules // rec { reviewboard = buildPythonPackage rec { - name = "ReviewBoard-1.6.13"; + name = "ReviewBoard-1.6.16"; src = fetchurl { url = "http://downloads.reviewboard.org/releases/ReviewBoard/1.6/${name}.tar.gz"; - sha256 = "06q9vgvmmwiyqj6spw6sbhrcxwds02pvqir50psbpps74nxn2mph"; + sha256 = "0vg3ypm57m43bscv8vswjdllv3d2j8lxqwwvpd65cl7jd1in0yr1"; }; propagatedBuildInputs = - [ recaptcha_client pytz memcached dateutil paramiko flup pygments + [ recaptcha_client pytz memcached dateutil_1_5 paramiko flup pygments djblets django_1_3 django_evolution pycrypto python.modules.sqlite3 pysvn pil psycopg2 ]; @@ -4662,8 +4750,7 @@ pythonPackages = python.modules // rec { md5 = "a1266d4db421963fd3deb172c6689e4b"; }; - buildInputs = [ pkgs.unzip ] ++ optionals isPy26 [ pythonPackages.ordereddict - pythonPackages.unittest2 ]; + buildInputs = [ pkgs.unzip ] ++ optionals isPy26 [ pythonPackages.ordereddict ]; # XXX: skipping two tests fails in python2.6 doCheck = ! isPy26; @@ -4674,6 +4761,7 @@ pythonPackages = python.modules // rec { six beautifulsoup4 waitress + unittest2 mock pyquery wsgiproxy2 diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index efd0b4569f865b1b6ed8ba4dc49a68106f5f8bea..67647e11ccaef1693c818d3bf55880761f602dac 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -50,6 +50,8 @@ mapHaskellTestOn { AgdaExecutable = default; alex = all; alexMeta = default; + alsaCore = default; + alsaPcm = default; alternativeIo = default; ansiTerminal = default; ansiWlPprint = default; @@ -187,7 +189,7 @@ mapHaskellTestOn { hashedStorage = default; haskeline = default; haskellLexer = default; - haskellPlatform = allBut ghc763; + haskellPlatform = all; haskellSrc = all; haskellSrcExts = default; haskellSrcMeta = default; @@ -397,6 +399,7 @@ mapHaskellTestOn { uuagc = default; uuid = default; uulib = default ++ latest; + uuOptions = default; uuParsinglib = default; vacuumCairo = default; vacuum = default; diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix index 5052a41a96cfa34af3f64a3e5d4ab4f9d7971051..3280df09dd54becb3f75e9c4e431ac77c19eaf8b 100644 --- a/pkgs/top-level/release-lib.nix +++ b/pkgs/top-level/release-lib.nix @@ -130,7 +130,7 @@ rec { /* Common platform groups on which to test packages. */ - inherit (pkgs.lib.platforms) linux darwin cygwin allBut all mesaPlatforms; + inherit (pkgs.lib.platforms) unix linux darwin cygwin allBut all mesaPlatforms; /* Platform groups for specific kinds of applications. */ x11Supported = linux; diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index f08c8a8189cee68a1ec10f825095186a848e5fbb..4b5bad0761d0d48d0bd0392c2b0a670f1b7672a8 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -372,6 +372,7 @@ in gcj44 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; gcj46 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; gcl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + GConf3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; gdb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; gdbCross = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; gdk_pixbuf = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; @@ -1031,6 +1032,7 @@ in libgpod = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; libgsf = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; libgtop = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libgweather = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; libimobiledevice = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; libinfinity = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; liblapack = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; @@ -1139,8 +1141,6 @@ in mediastreamer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; mediatomb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; meld = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - mercurial = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - mercurialFull = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; merkaartor = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; mesa = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; meshlab = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; @@ -1933,6 +1933,7 @@ in xmessage = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; xmodmap = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; xorgserver = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xorgserver_1_13_0 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; xpr = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; xprop = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; xrandr = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix index cde219eafe6a47e2fd7452ac46c077f2a8b8d0ef..9c85cb381b6ea32259522a94e134fdbd0c43b384 100644 --- a/pkgs/top-level/release-small.nix +++ b/pkgs/top-level/release-small.nix @@ -200,7 +200,6 @@ with (import ./release-lib.nix); dbus_all = { libs = linux; - daemon = linux; tools = linux; }; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 8fc364a60e38fd955c27a8a10ff7a1736dfa230f..f7c2ac399a434427a79f2523ff4fe5ff83485649 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -92,7 +92,6 @@ let doxygen = linux; dpkg = linux; drgeo = linux; - e2fsprogs = linux; ejabberd = linux; elinks = linux; emacs23 = gtkSupported; @@ -198,8 +197,8 @@ let mcabber = linux; mcron = linux; mdadm = linux; - mercurial = allBut "i686-cygwin"; - mercurialFull = allBut "i686-cygwin"; + mercurial = unix; + mercurialFull = linux; mesa = mesaPlatforms; midori = linux; mingetty = linux;