diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix index a60ecdcb866f..8a330800b9e1 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 000000000000..3c48f6ad828f --- /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 000000000000..48b0b52c5ea7 --- /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 000000000000..8b99988f07b4 --- /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 3be08f4496c8..a11cbf349c02 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/leksah/default.nix b/pkgs/applications/editors/leksah/default.nix index 5c17a6c18155..86f0106ed050 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/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index e64889ff52f0..7b92d5e1690c 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { # Make digikam find some FindXXXX.cmake KDEDIRS="${marble}:${qjson}"; + enableParallelBuilding = true; + meta = { description = "Photo Management Program"; license = "GPL"; diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix index 64cbdb0ca9a0..cf4e7e635d09 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 2491b93bbc20..b647c07368ef 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/sxiv/default.nix b/pkgs/applications/graphics/sxiv/default.nix new file mode 100644 index 000000000000..26d910943efa --- /dev/null +++ b/pkgs/applications/graphics/sxiv/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, libX11, imlib2, giflib }: + +stdenv.mkDerivation { + name = "sxiv-1.1"; + + src = fetchurl { + url = "https://github.com/muennich/sxiv/archive/v1.1.tar.gz"; + name = "sxiv-1.1.tar.gz"; + sha256 = "0gsqwa1yacsig7ycjrw0sjyrsa9mynfzzbwm1vp2bgk4s9hb08kx"; + }; + + buildInputs = [ libX11 imlib2 giflib ]; + + prePatch = ''sed -i "s@/usr/local@$out@" Makefile''; + + meta = { + description = "Simple X Image Viewer"; + homepage = "https://github.com/muennich/sxiv"; + license = "GPLv2+"; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/misc/arbtt/default.nix b/pkgs/applications/misc/arbtt/default.nix new file mode 100644 index 000000000000..92b8cb4f295c --- /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 1ed51a81f5cc..0951340ee945 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/dunst/default.nix b/pkgs/applications/misc/dunst/default.nix index 457f20b4d441..1eb0949aeb41 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/evtest/default.nix b/pkgs/applications/misc/evtest/default.nix index 9d7b6fa7a281..58b4f0d01bf5 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/freicoin/default.nix b/pkgs/applications/misc/freicoin/default.nix index 163cb04c27eb..bce6d1f639cb 100644 --- a/pkgs/applications/misc/freicoin/default.nix +++ b/pkgs/applications/misc/freicoin/default.nix @@ -1,12 +1,12 @@ { fetchurl, stdenv, db4, boost, gmp, mpfr, miniupnpc, qt4, unzip }: stdenv.mkDerivation rec { - version = "0.0.1-3"; + version = "0.0.2"; name = "freicoin-${version}"; src = fetchurl { url = "https://github.com/freicoin/freicoin/archive/v${version}.zip"; - sha256 = "19q4llv67kmvfr0x56rnqcf0d050dayv246q4i51mmkvjijc1qpf"; + sha256 = "09izmm85rb64d5hd0hz9hkfvv3qag55sb3mdyp8z4103icqwd6d7"; }; # I think that openssl and zlib are required, but come through other diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix index 798b0e5162f3..07de62712897 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 495583d95d4b..355ea9b2033d 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/st/default.nix b/pkgs/applications/misc/st/default.nix index 70089759626f..41575ce35a69 100644 --- a/pkgs/applications/misc/st/default.nix +++ b/pkgs/applications/misc/st/default.nix @@ -1,14 +1,22 @@ -{ stdenv, fetchurl, libX11, ncurses, libXext, libXft }: +{ stdenv, fetchurl, writeText, libX11, ncurses, libXext, libXft, fontconfig +, conf? null}: + +with stdenv.lib; stdenv.mkDerivation rec { - name = "st-0.3"; + name = "st-0.4.1"; src = fetchurl { url = "http://dl.suckless.org/st/${name}.tar.gz"; - sha256 = "0d0fjixiis4ixbz4l18rqhnssa7cy2bap3jkjyphqlqhl7lahv3d"; + sha256 = "0cdzwbm5fxrwz8ryxkh90d3vwx54wjyywgj28ymsb5fdv3396bzf"; }; + + configFile = optionalString (conf!=null) (writeText "config.def.h" conf); + preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h"; - buildInputs = [ libX11 ncurses libXext libXft ]; + buildInputs = [ libX11 ncurses libXext libXft fontconfig ]; + + NIX_LDFLAGS = "-lfontconfig"; installPhase = '' TERMINFO=$out/share/terminfo make install PREFIX=$out @@ -17,7 +25,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://st.suckless.org/; license = "MIT"; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + maintainers = with maintainers; [viric]; + platforms = with platforms; linux; }; } diff --git a/pkgs/applications/misc/xfe/default.nix b/pkgs/applications/misc/xfe/default.nix index 67ff2ec55411..bd00d91e23d3 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 14f0fdb53846..36a5817772d5 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 65a60b88477e..842dd8a88265 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.134"; + sha256 = if stdenv.system == "x86_64-linux" then "1kyxiqjabqgsg7n0a8snh03axxzpniazp93shb2l1b6x0f7d24n7" + else if stdenv.system == "i686-linux" then "02wb8pqcb1rk108r49cqyg7s14grmjnkr6p3068pkiwdwwgi8jakbt" 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 682de9090676..b0dc87217476 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, which +{ stdenv, fetchurl, makeWrapper, ninja, which # default dependencies , bzip2, flac, speex @@ -12,12 +12,9 @@ , utillinux, alsaLib , gcc, bison, gperf , glib, gtk, dbus_glib -, libXScrnSaver, libXcursor, mesa +, libXScrnSaver, libXcursor, libXtst, mesa , protobuf, speechd, libXdamage -# dependencies for >= v27 -, libXtst - # optional dependencies , libgcrypt ? null # gnomeSupport || cupsSupport @@ -81,14 +78,15 @@ let libusb1 libexif ]; - pre27 = versionOlder sourceInfo.version "27.0.0.0"; - pre28 = versionOlder sourceInfo.version "28.0.0.0"; - 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; @@ -106,22 +104,20 @@ in stdenv.mkDerivation rec { gcc bison gperf krb5 glib gtk dbus_glib - libXScrnSaver libXcursor mesa + libXScrnSaver libXcursor libXtst mesa pciutils protobuf speechd libXdamage ] ++ optional gnomeKeyringSupport libgnome_keyring ++ optionals gnomeSupport [ gconf libgcrypt ] ++ optional enableSELinux libselinux ++ optional cupsSupport libgcrypt - ++ optional pulseSupport pulseaudio - ++ optional post26 libXtst; + ++ optional pulseSupport pulseaudio; opensslPatches = optional useOpenSSL openssl.patches; prePatch = "patchShebangs ."; - patches = optional cupsSupport ./cups_allow_deprecated.patch - ++ optional (pulseSupport && pre27) ./pulseaudio_array_bounds.patch - ++ optional pre27 ./glibc-2.16-use-siginfo_t.patch; + patches = [ ./sandbox_userns.patch ] + ++ optional cupsSupport ./cups_allow_deprecated.patch; postPatch = '' sed -i -r -e 's/-f(stack-protector)(-all)?/-fno-\1/' build/common.gypi @@ -129,8 +125,8 @@ in stdenv.mkDerivation rec { cat $opensslPatches | patch -p1 -d third_party/openssl/openssl '' + '' sed -i -e 's|/usr/bin/gcc|gcc|' \ - third_party/WebKit/Source/${if post27 - then "core/core.gyp/core.gyp" + third_party/WebKit/Source/${if !versionOlder sourceInfo.version "28.0.0.0" + then "core/core.gypi" else "WebCore/WebCore.gyp/WebCore.gyp"} ''; @@ -146,6 +142,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,49 +154,43 @@ in stdenv.mkDerivation rec { target_arch = "ia32"; }); - buildType = "Release"; - - enableParallelBuilding = true; - configurePhase = '' - python build/gyp_chromium --depth "$(pwd)" ${gypFlags} + GYP_GENERATORS=ninja python build/gyp_chromium --depth "$(pwd)" ${gypFlags} ''; - makeFlags = let + buildPhase = let CC = "${gcc}/bin/gcc"; CXX = "${gcc}/bin/g++"; - in [ - "CC=${CC}" - "CXX=${CXX}" - "CC.host=${CC}" - "CXX.host=${CXX}" - "LINK.host=${CXX}" - ]; - - buildFlags = [ - "BUILDTYPE=${buildType}" - "library=shared_library" - "chrome" - ]; + in '' + CC="${CC}" CC_host="${CC}" \ + CXX="${CXX}" CXX_host="${CXX}" \ + LINK_host="${CXX}" \ + "${ninja}/bin/ninja" -C "out/${buildType}" \ + -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES \ + chrome ${optionalString (!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" + expr "$icon_size" : "^[0-9][0-9]*$" || continue + 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/glibc-2.16-use-siginfo_t.patch b/pkgs/applications/networking/browsers/chromium/glibc-2.16-use-siginfo_t.patch deleted file mode 100644 index d06555dda54b..000000000000 --- a/pkgs/applications/networking/browsers/chromium/glibc-2.16-use-siginfo_t.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- a/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h.orig 2012-12-22 16:01:44.000000000 +0200 -+++ b/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h 2012-12-23 21:53:26.746069153 +0200 -@@ -250,7 +250,7 @@ - struct kernel_old_sigaction { - union { - void (*sa_handler_)(int); -- void (*sa_sigaction_)(int, struct siginfo *, void *); -+ void (*sa_sigaction_)(int, siginfo_t *, void *); - }; - unsigned long sa_mask; - unsigned long sa_flags; -@@ -287,13 +287,13 @@ - unsigned long sa_flags; - union { - void (*sa_handler_)(int); -- void (*sa_sigaction_)(int, struct siginfo *, void *); -+ void (*sa_sigaction_)(int, siginfo_t *, void *); - }; - struct kernel_sigset_t sa_mask; - #else - union { - void (*sa_handler_)(int); -- void (*sa_sigaction_)(int, struct siginfo *, void *); -+ void (*sa_sigaction_)(int, siginfo_t *, void *); - }; - unsigned long sa_flags; - void (*sa_restorer)(void); diff --git a/pkgs/applications/networking/browsers/chromium/pulseaudio_array_bounds.patch b/pkgs/applications/networking/browsers/chromium/pulseaudio_array_bounds.patch deleted file mode 100644 index ca78b6959c05..000000000000 --- a/pkgs/applications/networking/browsers/chromium/pulseaudio_array_bounds.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/media/media.gyp b/media/media.gyp -index 2a8c6c6..66ca767 100644 ---- a/media/media.gyp -+++ b/media/media.gyp -@@ -399,6 +399,7 @@ - ['use_pulseaudio == 1', { - 'cflags': [ - ' +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 0e041ee95187..209b1ad80fe6 100644 --- a/pkgs/applications/networking/browsers/chromium/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/sources.nix @@ -1,18 +1,18 @@ # 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 = "29.0.1516.3"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-29.0.1516.3.tar.xz"; + sha256 = "0pdn9c6v0v55d7g4amivxrv132bpj9sfqywk5b8l6kqfjq28mw5k"; }; beta = { - version = "27.0.1453.65"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-27.0.1453.65.tar.xz"; - sha256 = "1flv9870p0bqglnbm4gfzbxzcvz30k2chxgnlbqgpfk5c4qq9mpb"; + version = "28.0.1500.20"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-28.0.1500.20.tar.xz"; + sha256 = "1q4qsgixh9q5akjnk614k942kxshi81v4xvm40f7rxzns88qbfrz"; }; stable = { - version = "26.0.1410.63"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-26.0.1410.63.tar.xz"; - sha256 = "0gsb0dgk7p04997wlw7swxnnpf5ix9drn0wn07pgsalr8l3zgy3s"; + version = "27.0.1453.93"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-27.0.1453.93.tar.xz"; + sha256 = "0h5d4v7003y3h6rg48dn6cswp6zzj9zdcci3cl9cbb3j9ldc1n3d"; }; } diff --git a/pkgs/applications/networking/browsers/firefox/20.0.nix b/pkgs/applications/networking/browsers/firefox/21.0.nix similarity index 97% rename from pkgs/applications/networking/browsers/firefox/20.0.nix rename to pkgs/applications/networking/browsers/firefox/21.0.nix index 3b2f9962a32c..6043364c754b 100644 --- a/pkgs/applications/networking/browsers/firefox/20.0.nix +++ b/pkgs/applications/networking/browsers/firefox/21.0.nix @@ -15,9 +15,9 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null; rec { - firefoxVersion = "20.0"; + firefoxVersion = "21.0"; - xulVersion = "20.0"; # this attribute is used by other packages + xulVersion = "21.0"; # this attribute is used by other packages src = fetchurl { @@ -27,7 +27,7 @@ rec { # Fall back to this url for versions not available at releases.mozilla.org. "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2" ]; - sha1 = "6d776c29da0be0d2a50abeb504d63b06b7861218"; + sha256 = "076rfh82m1b1hw10dzbgg13h63wmnispgyvag4nb20ylnlf0629r"; }; commonConfigureFlags = diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 2bbff467bc5c..f8d2c2d0e8cd 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 000000000000..e9babf787bd1 --- /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/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index 1def7e2b1f01..d5902d143590 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -1,54 +1,92 @@ -a : -let - fetchurl = a.fetchurl; +{ stdenv, fetchurl, python, intltool, pkgconfig, libX11, gtk +, ldns, pyopenssl, pythonDBus, pythonPackages + +, enableJingle ? true, farstream ? null, gst_plugins_bad ? null +, libnice ? null +, enableE2E ? true +, enableRST ? true +, enableSpelling ? true, gtkspell ? null +, enableNotifications ? false +, enableLaTeX ? false, texLive ? null +}: + +assert enableJingle -> farstream != null && gst_plugins_bad != null + && libnice != null; +assert enableE2E -> pythonPackages.pycrypto != null; +assert enableRST -> pythonPackages.docutils != null; +assert enableSpelling -> gtkspell != null; +assert enableNotifications -> pythonPackages.notify != null; +assert enableLaTeX -> texLive != null; + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "gajim-${version}"; + version = "0.15.4"; - version = a.lib.attrByPath ["version"] "0.15.1" a; - buildInputs = with a; [ - python pyGtkGlade gtk perl intltool dbus gettext - pkgconfig makeWrapper libglade pyopenssl libXScrnSaver - libXt xproto libXext xextproto libX11 gtkspell aspell - scrnsaverproto pycrypto pythonDBus pythonSexy - docutils pyasn1 farstream gst_plugins_bad gstreamer - gst_ffmpeg gst_python - ]; -in -rec { src = fetchurl { url = "http://www.gajim.org/downloads/0.15/gajim-${version}.tar.gz"; - sha256 = "b315d4a600da0c5f8248e8f887a41ce2630c49995b36cbad8fb2cd81cc8d2e8b"; + sha256 = "1g4m5j777vqqdwqvr2m6l09ljjx65ilag45d5kfc78z7frm0cz7g"; }; - inherit buildInputs; - configureFlags = []; + patches = [ + (fetchurl { + name = "gajim-drill-srv.patch"; + url = "https://projects.archlinux.org/svntogit/packages.git/" + + "plain/trunk/gajim-drill.patch?h=packages/gajim"; + sha256 = "1k8zz3ns0l0kriffq41jgkv5ym6jvyd24171l7s98v9d81prdw1w"; + }) + (fetchurl { + name = "gajim-icon-index.patch"; + url = "http://hg.gajim.org/gajim/raw-rev/b9ec78663dfb"; + sha256 = "0w54hr5dq9y36val55kmh8d6cid7h4fs2nghx09714jylz2nyxxv"; + }) + ]; - preConfigure = a.fullDepEntry ('' - export PYTHONPATH="$PYTHONPATH''${PYTHONPATH:+:}$(toPythonPath ${a.pyGtkGlade})/gtk-2.0" - export PYTHONPATH="$PYTHONPATH''${PYTHONPATH:+:}$(toPythonPath ${a.pygobject})/gtk-2.0" - sed -e '/-L[$]x_libraries/d' -i configure - sed -e 's@tmpfd.close()@os.close(tmpfd)@' -i src/common/latex.py - '') ["addInputs" "doUnpack"]; + postPatch = '' + sed -i -e '0,/^[^#]/ { + /^[^#]/i export \\\ + PYTHONPATH="'"$PYTHONPATH\''${PYTHONPATH:+:}\$PYTHONPATH"'" \\\ + GST_PLUGIN_PATH="'"\$GST_PLUGIN_PATH''${GST_PLUGIN_PATH:+:}${"" + }$GST_PLUGIN_PATH"'" + }' scripts/gajim.in - fixScriptNames = a.fullDepEntry ('' - mkdir "$out"/bin-wrapped - for i in "$out"/bin/.*-wrapped; do - name="$i" - name="''${name%-wrapped}" - name="''${name##*/.}" - mv "$i" "$out/bin-wrapped/$name" - sed -e 's^'"$i"'^'"$out/bin-wrapped/$name"'^' -i "$out/bin/$name" - sed -e "2aexport LD_LIBRARY_PATH=\"\$LD_LIBRARY_PATH\''${LD_LIBRARY_PATH:+:}${a.gtkspell}/lib:${a.gtkspell}/lib64\"" -i "$out/bin/gajim" - sed -e "2aexport NIX_LDFLAGS=\"\$NIX_LDFLAGS -L${a.gtkspell}/lib -L${a.gtkspell}/lib64\"" -i "$out/bin/gajim" - sed -e "2aexport GST_PLUGIN_PATH=\"\$GST_PLUGIN_PATH''${GST_PLUGIN_PATH:+:}$(echo ${a.gst_plugins_bad}/lib/gstreamer-*):$(echo ${a.gst_ffmpeg}/lib/gstreamer-*):$(echo ${a.farstream}/lib/gstreamer-*)\"" -i "$out/bin/gajim" - done - '') ["wrapBinContentsPython"]; + sed -i -e 's/return helpers.is_in_path('"'"'drill.*/return True/' \ + src/features_window.py + sed -i -e "s|'drill'|'${ldns}/bin/drill'|" src/common/resolver.py + '' + optionalString enableSpelling '' + sed -i -e 's|=.*find_lib.*|= "${gtkspell}/lib/libgtkspell.so"|' \ + src/gtkspell.py + '' + optionalString enableLaTeX '' + sed -i -e "s|try_run(.'dvipng'|try_run(['${texLive}/bin/dvipng'|" \ + -e "s|try_run(.'latex'|try_run(['${texLive}/bin/latex'|" \ + -e 's/tmpfd.close()/os.close(tmpfd)/' \ + src/common/latex.py + ''; - /* doConfigure should be removed if not needed */ - phaseNames = ["preConfigure" (a.doDump "1") "doConfigure" "doMakeInstall" - "wrapBinContentsPython" "fixScriptNames"]; + buildInputs = [ + python intltool pkgconfig libX11 + pythonPackages.pygobject pythonPackages.pyGtkGlade + pythonPackages.sqlite3 pythonPackages.pyasn1 + pythonPackages.pyxdg + pyopenssl pythonDBus + ] ++ optionals enableJingle [ farstream gst_plugins_bad libnice ] + ++ optional enableE2E pythonPackages.pycrypto + ++ optional enableRST pythonPackages.docutils + ++ optional enableNotifications pythonPackages.notify + ++ optional enableLaTeX texLive; + + postInstall = '' + install -m 644 -t "$out/share/gajim/icons/hicolor" \ + "icons/hicolor/index.theme" + ''; + + enableParallelBuilding = true; - name = "gajim-" + version; meta = { - description = "Jabber client with meta-contacts"; - maintainers = [a.lib.maintainers.raskin]; + homepage = "http://gajim.org/"; + description = "Jabber client written in PyGTK"; + license = licenses.gpl3Plus; + maintainers = [ maintainers.raskin maintainers.aszlig ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix index e51798502371..c0f76602b2bb 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/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index c0d87ee5a034..95ae70810a12 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/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index de78e8975751..9befe98399da 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -41,5 +41,7 @@ stdenv.mkDerivation rec { homepage = http://mumble.sourceforge.net/; description = "Low-latency, high quality voice chat software"; license = "BSD"; + platforms = with stdenv.lib.platforms; linux; + maintainers = with stdenv.lib.maintainers; [viric]; }; } diff --git a/pkgs/applications/networking/p2p/gnunet/0.8.nix b/pkgs/applications/networking/p2p/gnunet/0.8.nix deleted file mode 100644 index 586146bdd9dd..000000000000 --- a/pkgs/applications/networking/p2p/gnunet/0.8.nix +++ /dev/null @@ -1,85 +0,0 @@ -{ stdenv, fetchurl, libextractor, libmicrohttpd, libgcrypt -, zlib, gmp, curl, libtool, guile, adns, sqlite, pkgconfig -, libxml2, ncurses, gettext, findutils -, gtkSupport ? false, gtk ? null, libglade ? null -, makeWrapper }: - -assert gtkSupport -> (gtk != null) && (libglade != null); - -let version = "0.8.1b"; -in - stdenv.mkDerivation { - name = "gnunet-${version}"; - - src = fetchurl { - url = "mirror://gnu/gnunet/GNUnet-${version}.tar.gz"; - sha256 = "0k6nrsxz5s52z6hlahb7d3sj1z0gidm79n04pf9j2ngfylp4v1bw"; - }; - - buildInputs = [ - libextractor libmicrohttpd libgcrypt gmp curl libtool - zlib guile adns sqlite libxml2 ncurses - pkgconfig gettext findutils - makeWrapper - ] ++ (if gtkSupport then [ gtk libglade ] else []); - - preConfigure = '' - # Brute force: since nix-worker chroots don't provide - # /etc/{resolv.conf,hosts}, replace all references to `localhost' - # by their IPv4 equivalent. - for i in $(find . \( -name \*.c -or -name \*.conf \) \ - -exec grep -l localhost {} \;) - do - echo "$i: substituting \`127.0.0.1' to \`localhost'..." - substituteInPlace "$i" --replace "localhost" "127.0.0.1" - done - - # Make sure the tests don't rely on `/tmp', for the sake of chroot - # builds. - for i in $(find . \( -iname \*test\*.c -or -name \*.conf \) \ - -exec grep -l /tmp {} \;) - do - echo "$i: replacing references to \`/tmp' by \`$TMPDIR'..." - substituteInPlace "$i" --replace "/tmp" "$TMPDIR" - done - ''; - - doCheck = false; - - # 1. Run tests have once GNUnet is installed. - # 2. Help programs find the numerous modules that sit under - # `$out/lib/GNUnet'. - - # FIXME: `src/transports/test_udp' hangs forever. - postInstall = '' - #GNUNET_PREFIX="$out" make check - wrapProgram "$out/bin/gnunetd" \ - --prefix LTDL_LIBRARY_PATH ":" "$out/lib/GNUnet" - ''; - - meta = { - description = "GNUnet, GNU's decentralized anonymous and censorship-resistant P2P framework"; - - longDescription = '' - GNUnet is a framework for secure peer-to-peer networking that - does not use any centralized or otherwise trusted services. A - first service implemented on top of the networking layer - allows anonymous censorship-resistant file-sharing. Anonymity - is provided by making messages originating from a peer - indistinguishable from messages that the peer is routing. All - peers act as routers and use link-encrypted connections with - stable bandwidth utilization to communicate with each other. - GNUnet uses a simple, excess-based economic model to allocate - resources. Peers in GNUnet monitor each others behavior with - respect to resource usage; peers that contribute to the - network are rewarded with better service. - ''; - - homepage = http://gnunet.org/; - - license = "GPLv2+"; - - maintainers = [ stdenv.lib.maintainers.ludo ]; - platforms = stdenv.lib.platforms.gnu; - }; - } diff --git a/pkgs/applications/networking/p2p/gnunet/svn.nix b/pkgs/applications/networking/p2p/gnunet/svn.nix new file mode 100644 index 000000000000..9335778d3d22 --- /dev/null +++ b/pkgs/applications/networking/p2p/gnunet/svn.nix @@ -0,0 +1,89 @@ +{ stdenv, fetchsvn, libextractor, libmicrohttpd, libgcrypt +, zlib, gmp, curl, libtool, adns, sqlite, pkgconfig +, libxml2, ncurses, gettext, libunistring, libidn +, makeWrapper, autoconf, automake }: + +let + rev = "27314"; +in +stdenv.mkDerivation rec { + name = "gnunet-svn-${rev}"; + + src = fetchsvn { + url = https://gnunet.org/svn/gnunet; + sha256 = "14b893y5dy84hp1klrmng06znbh2m2wk4f1kpbhzbwnvjyhk6kdq"; + }; + + buildInputs = [ + libextractor libmicrohttpd libgcrypt gmp curl libtool + zlib adns sqlite libxml2 ncurses libidn + pkgconfig gettext libunistring makeWrapper + autoconf automake + ]; + + preConfigure = '' + # Brute force: since nix-worker chroots don't provide + # /etc/{resolv.conf,hosts}, replace all references to `localhost' + # by their IPv4 equivalent. + for i in $(find . \( -name \*.c -or -name \*.conf \) \ + -exec grep -l '\' {} \;) + do + echo "$i: substituting \`127.0.0.1' to \`localhost'..." + sed -i "$i" -e's/\/127.0.0.1/g' + done + + # Make sure the tests don't rely on `/tmp', for the sake of chroot + # builds. + for i in $(find . \( -iname \*test\*.c -or -name \*.conf \) \ + -exec grep -l /tmp {} \;) + do + echo "$i: replacing references to \`/tmp' by \`$TMPDIR'..." + substituteInPlace "$i" --replace "/tmp" "$TMPDIR" + done + + # Ensure NSS installation works fine + configureFlags="$configureFlags --with-nssdir=$out/lib" + patchShebangs src/gns/nss/install-nss-plugin.sh + + sh contrib/pogen.sh + sh bootstrap + ''; + + doCheck = false; + + /* FIXME: Tests must be run this way, but there are still a couple of + failures. + + postInstall = + '' export GNUNET_PREFIX="$out" + export PATH="$out/bin:$PATH" + make -k check + ''; + */ + + meta = { + description = "GNUnet, GNU's decentralized anonymous and censorship-resistant P2P framework"; + + longDescription = '' + GNUnet is a framework for secure peer-to-peer networking that + does not use any centralized or otherwise trusted services. A + first service implemented on top of the networking layer + allows anonymous censorship-resistant file-sharing. Anonymity + is provided by making messages originating from a peer + indistinguishable from messages that the peer is routing. All + peers act as routers and use link-encrypted connections with + stable bandwidth utilization to communicate with each other. + GNUnet uses a simple, excess-based economic model to allocate + resources. Peers in GNUnet monitor each others behavior with + respect to resource usage; peers that contribute to the + network are rewarded with better service. + ''; + + homepage = http://gnunet.org/; + + license = "GPLv2+"; + + maintainers = with stdenv.lib.maintainers; [ ludo viric ]; + platforms = stdenv.lib.platforms.gnu; + }; +} diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 173453f7b5ef..599229753b5e 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 7c731874a5f5..715e7fa6998f 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 da2d166fc86d..1b692586e0c8 100644 --- a/pkgs/applications/office/calligra/default.nix +++ b/pkgs/applications/office/calligra/default.nix @@ -4,11 +4,11 @@ , libkdcraw, libxslt, fftw, glew, gsl, shared_desktop_ontologies, okular }: stdenv.mkDerivation rec { - name = "calligra-2.5.0"; + name = "calligra-2.5.5"; src = fetchurl { url = "mirror://kde/stable/${name}/${name}.tar.bz2"; - sha256 = "0q6ydi7hzrzwqzb38gikdh1l2zf8qp4i3nkgyb01148bjwrhvf21"; + sha256 = "0h9idadrcyjvd0mkwri4lg310mzpna6s0pvc7b7r3267wzjbn9kw"; }; nativeBuildInputs = [ cmake perl pkgconfig ]; diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 065f439427cf..fc5f5058f97b 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 357b703d84d6..7f8f2c089f3b 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 541340df6299..04c82b21e859 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/electronics/eagle/default.nix b/pkgs/applications/science/electronics/eagle/default.nix new file mode 100644 index 000000000000..04c9a9b79ec5 --- /dev/null +++ b/pkgs/applications/science/electronics/eagle/default.nix @@ -0,0 +1,86 @@ +{ stdenv, fetchurl, makeDesktopItem, patchelf, zlib, freetype, fontconfig +, openssl, libXrender, libXrandr, libXcursor, libX11, libXext, libXi +}: + +let + + libPath = stdenv.lib.makeLibraryPath + [ zlib freetype fontconfig openssl libXrender libXrandr libXcursor libX11 + libXext libXi + ]; + +in + +stdenv.mkDerivation rec { + name = "eagle-${version}"; + version = "6.4.0"; + + src = fetchurl { + url = "ftp://ftp.cadsoft.de/eagle/program/6.4/eagle-lin-${version}.run"; + sha256 = "0jb44dsq4cl9rx5nam6rxsw9fsmm6fsksv9s544p2zrwnad2x2i8"; + }; + + desktopItem = makeDesktopItem { + name = "Eagle"; + exec = "eagle"; + icon = "eagle"; + comment = "Schematic capture and PCB layout"; + desktopName = "Eagle"; + genericName = "Schematic editor"; + categories = "Application;Development;"; + }; + + buildInputs = + [ patchelf zlib freetype fontconfig openssl libXrender libXrandr libXcursor + libX11 libXext libXi + ]; + + phases = [ "installPhase" ]; + + # NOTES: + # Eagle for Linux comes as a self-extracting shell script with embedded + # tarball. The tarball data (.tar.bz2) starts after a __DATA__ marker. + # + # Eagle apparently doesn't like binary patching. This is what happens: + # $ ./result/eagle-6.4.0/bin/eagle + # argv[0] (/home/bfo/nixpkgs/result/eagle-6.4.0/bin/eagle) is not the currently executed program version! + installPhase = '' + # Extract eagle tarball + mkdir "$out" + sed '1,/^__DATA__$/d' "$src" | tar -xjf - -C "$out" + + # Install manpage + mkdir -p "$out"/share/man/man1 + ln -s "$out"/eagle-${version}/doc/eagle.1 "$out"/share/man/man1/eagle.1 + + # Build LD_PRELOAD library that redirects license file access to the home + # directory of the user + mkdir -p "$out"/lib + gcc -shared -fPIC -DEAGLE_PATH=\"$out/eagle-${version}\" ${./eagle_fixer.c} -o "$out"/lib/eagle_fixer.so -ldl + + # Make wrapper script + dynlinker="$(cat $NIX_GCC/nix-support/dynamic-linker)" + mkdir -p "$out"/bin + cat > "$out"/bin/eagle << EOF + #!${stdenv.shell} + export LD_LIBRARY_PATH="${stdenv.gcc.gcc}/lib:${libPath}" + export LD_PRELOAD="$out/lib/eagle_fixer.so" + exec "$dynlinker" "$out/eagle-${version}/bin/eagle" "\$@" + EOF + chmod a+x "$out"/bin/eagle + + # Make desktop item + mkdir -p "$out"/share/applications + cp "$desktopItem"/share/applications/* "$out"/share/applications/ + mkdir -p "$out"/share/icons + ln -s "$out/eagle-${version}/bin/eagleicon50.png" "$out"/share/icons/eagle.png + ''; + + meta = with stdenv.lib; { + description = "Schematic editor and PCB layout tool from CadSoft"; + homepage = http://www.cadsoftusa.com/; + license = licenses.unfree; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; +} diff --git a/pkgs/applications/science/electronics/eagle/eagle_fixer.c b/pkgs/applications/science/electronics/eagle/eagle_fixer.c new file mode 100644 index 000000000000..da9da4dcbd3a --- /dev/null +++ b/pkgs/applications/science/electronics/eagle/eagle_fixer.c @@ -0,0 +1,134 @@ +/* + * LD_PRELOAD trick to make Eagle (schematic editor and PCB layout tool from + * CadSoft) work from a read-only installation directory. + * + * When Eagle starts, it looks for the license file in /bin/eagle.key + * (where is the install path). If eagle.key is not found, Eagle checks + * for write access to /bin/, shows a license dialog to the user and + * then attempts to write a license file to /bin/. + * + * This will of course fail when Eagle is installed in the read-only Nix store. + * Hence this library that redirects accesses to the those paths in the + * following way: + * + * /bin => $HOME + * /bin/eagle.key => $HOME/.eagle.key + * + * Also, if copying an example project to ~/eagle/ (in the Eagle GUI), Eagle + * chmod's the destination with read-only permission bits (presumably because + * the source is read-only) and fails to complete the copy operation. + * Therefore, the mode argument in calls to chmod() is OR'ed with the S_IWUSR + * bit (write by owner). + * + * Usage: + * gcc -shared -fPIC -DEAGLE_PATH="$out/eagle-${version}" eagle_fixer.c -o eagle_fixer.so -ldl + * LD_PRELOAD=$PWD/eagle_fixer.so ./result/bin/eagle + * + * To see the paths that are modified at runtime, set the environment variable + * EAGLE_FIXER_DEBUG to 1. + */ + +#define _GNU_SOURCE +#include +#include +#include +#include +#include +#include +#include +#include + +#ifndef EAGLE_PATH +#error Missing EAGLE_PATH, path to the eagle-${version} installation directory. +#endif + +typedef FILE *(*fopen_func_t)(const char *path, const char *mode); +typedef int (*access_func_t)(const char *pathname, int mode); +typedef int (*chmod_func_t)(const char *path, mode_t mode); + +/* + * Map /bin to $HOME and /bin/eagle.key to $HOME/.eagle.key + * + * Path is truncated if bigger than PATH_MAX. It's not threadsafe, but that's + * OK. + */ +static const char *redirect(const char *pathname) +{ + static char buffer[PATH_MAX]; + const char *homepath; + const char *new_path; + static int have_warned; + + homepath = getenv("HOME"); + if (!homepath) { + homepath = "/"; + if (!have_warned && getenv("EAGLE_FIXER_DEBUG")) { + fprintf(stderr, "eagle_fixer: HOME is unset, using \"/\" (root) instead.\n"); + have_warned = 1; + } + } + + new_path = pathname; + if (strcmp(EAGLE_PATH "/bin", pathname) == 0) { + /* redirect to $HOME */ + new_path = homepath; + } else if (strcmp(EAGLE_PATH "/bin/eagle.key", pathname) == 0) { + /* redirect to $HOME/.eagle.key */ + snprintf(buffer, PATH_MAX, "%s/.eagle.key", homepath); + buffer[PATH_MAX-1] = '\0'; + new_path = buffer; + } + + return new_path; +} + +FILE *fopen(const char *pathname, const char *mode) +{ + FILE *fp; + const char *path; + fopen_func_t orig_fopen; + + orig_fopen = (fopen_func_t)dlsym(RTLD_NEXT, "fopen"); + path = redirect(pathname); + fp = orig_fopen(path, mode); + + if (path != pathname && getenv("EAGLE_FIXER_DEBUG")) { + fprintf(stderr, "eagle_fixer: fopen(\"%s\", \"%s\") => \"%s\": fp=%p\n", pathname, mode, path, fp); + } + + return fp; +} + +int access(const char *pathname, int mode) +{ + int ret; + const char *path; + access_func_t orig_access; + + orig_access = (access_func_t)dlsym(RTLD_NEXT, "access"); + path = redirect(pathname); + ret = orig_access(path, mode); + + if (path != pathname && getenv("EAGLE_FIXER_DEBUG")) { + fprintf(stderr, "eagle_fixer: access(\"%s\", %d) => \"%s\": ret=%d\n", pathname, mode, path, ret); + } + + return ret; +} + +int chmod(const char *pathname, mode_t mode) +{ + int ret; + mode_t new_mode; + chmod_func_t orig_chmod; + + orig_chmod = (chmod_func_t)dlsym(RTLD_NEXT, "chmod"); + new_mode = mode | S_IWUSR; + ret = orig_chmod(pathname, new_mode); + + if (getenv("EAGLE_FIXER_DEBUG")) { + fprintf(stderr, "eagle_fixer: chmod(\"%s\", %o) => %o: ret=%d\n", pathname, mode, new_mode, ret); + } + + return ret; +} diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix new file mode 100644 index 000000000000..5ceefb87af00 --- /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 2f616b2bed0d..e9e6ca7bead7 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/spyder/default.nix b/pkgs/applications/science/spyder/default.nix index 6c0125e4b850..cd2bd4fecf3d 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 1a2e637bff06..f8809d27cc47 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 58071d86d4e5..f042b2e0faa5 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 ea9ce97be161..20644d09dd70 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/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 865033ae2d26..669aa5713a08 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/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index d86b81be7563..a1ec200aaf0f 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -16,6 +16,7 @@ , x264Support ? false, x264 ? null , jackaudioSupport ? false, jackaudio ? null , pulseSupport ? false, pulseaudio ? null +, bs2bSupport ? false, libbs2b ? null # For screenshots , libpngSupport ? true, libpng ? null , useUnfreeCodecs ? false @@ -38,6 +39,7 @@ assert theoraSupport -> libtheora != null; assert x264Support -> x264 != null; assert jackaudioSupport -> jackaudio != null; assert pulseSupport -> pulseaudio != null; +assert bs2bSupport -> libbs2b != null; assert libpngSupport -> libpng != null; let @@ -112,6 +114,7 @@ stdenv.mkDerivation rec { ++ optional vdpauSupport libvdpau ++ optional speexSupport speex ++ optional libpngSupport libpng + ++ optional bs2bSupport libbs2b ; nativeBuildInputs = [ yasm ]; diff --git a/pkgs/applications/video/mplayer2/default.nix b/pkgs/applications/video/mplayer2/default.nix index 9e89d5384147..24f53884e39c 100644 --- a/pkgs/applications/video/mplayer2/default.nix +++ b/pkgs/applications/video/mplayer2/default.nix @@ -12,6 +12,7 @@ , theoraSupport ? true, libtheora ? null , jackaudioSupport ? false, jackaudio ? null , pulseSupport ? true, pulseaudio ? null +, bs2bSupport ? false, libbs2b ? null # For screenshots , libpngSupport ? true, libpng ? null , useUnfreeCodecs ? false @@ -29,6 +30,7 @@ assert speexSupport -> speex != null; assert theoraSupport -> libtheora != null; assert jackaudioSupport -> jackaudio != null; assert pulseSupport -> pulseaudio != null; +assert bs2bSupport -> libbs2b != null; assert libpngSupport -> libpng != null; let @@ -92,6 +94,7 @@ stdenv.mkDerivation rec { ++ optional screenSaverSupport libXScrnSaver ++ optional vdpauSupport libvdpau ++ optional speexSupport speex + ++ optional bs2bSupport libbs2b ++ optional libpngSupport libpng ; diff --git a/pkgs/applications/video/xbmc/default.nix b/pkgs/applications/video/xbmc/default.nix index e5deba4f97f9..55734e495391 100644 --- a/pkgs/applications/video/xbmc/default.nix +++ b/pkgs/applications/video/xbmc/default.nix @@ -33,11 +33,11 @@ assert vdpauSupport -> libvdpau != null && ffmpeg.vdpauSupport; assert pulseSupport -> pulseaudio != null; stdenv.mkDerivation rec { - name = "xbmc-12.1"; + name = "xbmc-12.2"; src = fetchurl { url = "http://mirrors.xbmc.org/releases/source/${name}.tar.gz"; - sha256 = "1hqyq1vl34sywcj8zgx7kdpf8ljzj969l5w6yy4314c431pg7qr9"; + sha256 = "077apkq9sx6wlwkwmiz63w5dcqbbrbjbn6qk9fj2fgaizhs0ccxj"; }; buildInputs = [ diff --git a/pkgs/applications/window-managers/openbox/default.nix b/pkgs/applications/window-managers/openbox/default.nix index 016325140e05..e8314ef1b433 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/build-support/fetchhg/builder.sh b/pkgs/build-support/fetchhg/builder.sh index fbdd12b4f055..73ec7ec0b362 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/fetchsvn/default.nix b/pkgs/build-support/fetchsvn/default.nix index 39272b996082..30625a758f8c 100644 --- a/pkgs/build-support/fetchsvn/default.nix +++ b/pkgs/build-support/fetchsvn/default.nix @@ -1,5 +1,5 @@ -{stdenv, subversion, sshSupport ? false, openssh ? null}: -{url, rev ? "HEAD", md5 ? "", sha256 ? "", ignoreExternals ? false}: +{stdenv, subversion, sshSupport ? false, openssh ? null}: +{url, rev ? "HEAD", md5 ? "", sha256 ? "", ignoreExternals ? false, name ? null}: let repoName = with stdenv.lib; @@ -18,10 +18,12 @@ let else if snd path == "tags" then "${trd path}-${fst path}" # ../repo (no trunk) -> repo else fst path; + + name_ = if name == null then "${repoName}-r${toString rev}" else name; in stdenv.mkDerivation { - name = "${repoName}-r${toString rev}"; + name = name_; builder = ./builder.sh; buildInputs = [subversion]; diff --git a/pkgs/build-support/fetchurl/builder.sh b/pkgs/build-support/fetchurl/builder.sh index 177b1e016a6b..402fe0cba5b8 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 09816d9ba8e4..6c981229531a 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 000000000000..be90011f4939 --- /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/vm/default.nix b/pkgs/build-support/vm/default.nix index 86b15ff91553..b1eb82ed8303 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 @@ -302,7 +302,7 @@ rec { fi touch /mnt/.debug - mkdir /mnt/proc /mnt/dev /mnt/sys /mnt/bin + mkdir /mnt/proc /mnt/dev /mnt/sys ${createDeviceNodes "/mnt/dev"} ''; @@ -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 @@ -479,6 +479,7 @@ rec { fillDiskWithRPMs = { size ? 4096, rpms, name, fullName, preInstall ? "", postInstall ? "" , runScripts ? true, createRootFS ? defaultCreateRootFS + , unifiedSystemDir ? false }: runInLinuxVM (stdenv.mkDerivation { @@ -491,10 +492,25 @@ rec { chroot=$(type -tP chroot) + # 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 + + # Newer distributions like Fedora 18 require /lib etc. to be + # symlinked to /usr. + ${lib.optionalString unifiedSystemDir '' + mkdir -p /mnt/usr/bin /mnt/usr/sbin /mnt/usr/lib /mnt/usr/lib64 + ln -s /usr/bin /mnt/bin + 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..." for i in $rpms; do echo "$i..." - ${rpm}/bin/rpm2cpio "$i" | (cd /mnt && ${cpio}/bin/cpio -i --make-directories) + ${rpm}/bin/rpm2cpio "$i" | (chroot /mnt ${cpio}/bin/cpio -i --make-directories) done eval "$preInstall" @@ -505,9 +521,6 @@ rec { PATH=/usr/bin:/bin:/usr/sbin:/sbin $chroot /mnt \ rpm --initdb - # 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 ${utillinux}/bin/mount -o bind /tmp /mnt/tmp echo "installing RPMs..." @@ -519,8 +532,7 @@ rec { rm /mnt/.debug - ${utillinux}/bin/umount /mnt/nix/store - ${utillinux}/bin/umount /mnt/tmp + ${utillinux}/bin/umount /mnt/nix/store /mnt/tmp ${lib.optionalString unifiedSystemDir "/mnt/proc"} ${utillinux}/bin/umount /mnt ''; @@ -726,10 +738,11 @@ rec { , packagesList ? "", packagesLists ? [packagesList] , packages, extraPackages ? [] , preInstall ? "", postInstall ? "", archs ? ["noarch" "i386"] - , runScripts ? true, createRootFS ? defaultCreateRootFS }: + , runScripts ? true, createRootFS ? defaultCreateRootFS + , unifiedSystemDir ? false }: fillDiskWithRPMs { - inherit name fullName size preInstall postInstall runScripts createRootFS; + inherit name fullName size preInstall postInstall runScripts createRootFS unifiedSystemDir; rpms = import (rpmClosureGenerator { inherit name packagesLists urlPrefixes archs; packages = packages ++ extraPackages; @@ -982,6 +995,32 @@ rec { packages = commonFedoraPackages ++ [ "cronie" "util-linux" ]; }; + fedora18i386 = { + name = "fedora-18-i386"; + fullName = "Fedora 18 (i386)"; + packagesList = fetchurl { + url = mirror://fedora/linux/releases/18/Everything/i386/os/repodata/935f57e61365047b6aee346792bc68bfd24de30874ce5d26bf730a992d36678d-primary.xml.gz; + sha256 = "935f57e61365047b6aee346792bc68bfd24de30874ce5d26bf730a992d36678d"; + }; + urlPrefix = mirror://fedora/linux/releases/18/Everything/i386/os; + archs = ["noarch" "i386" "i586" "i686"]; + packages = commonFedoraPackages ++ [ "cronie" "util-linux" ]; + unifiedSystemDir = true; + }; + + fedora18x86_64 = { + name = "fedora-18-x86_64"; + fullName = "Fedora 18 (x86_64)"; + packagesList = fetchurl { + url = mirror://fedora/linux/releases/18/Everything/x86_64/os/repodata/463ac49f2218e404607b2eeb3c04be1a648d90293f4239bbb6a63c2fed672bea-primary.xml.gz; + sha256 = "463ac49f2218e404607b2eeb3c04be1a648d90293f4239bbb6a63c2fed672bea"; + }; + urlPrefix = mirror://fedora/linux/releases/18/Everything/x86_64/os; + archs = ["noarch" "x86_64"]; + packages = commonFedoraPackages ++ [ "cronie" "util-linux" ]; + unifiedSystemDir = true; + }; + opensuse103i386 = { name = "opensuse-10.3-i586"; fullName = "openSUSE 10.3 (i586)"; @@ -1559,14 +1598,14 @@ rec { name = "redhat-9-i386"; fullName = "Red Hat Linux 9 (i386)"; size = 1024; - rpms = import ./rpm/redhat-9-i386.nix {inherit fetchurl;}; + rpms = import ./rpm/redhat-9-i386.nix { inherit fetchurl; }; }; suse90i386 = fillDiskWithRPMs { name = "suse-9.0-i386"; fullName = "SUSE Linux 9.0 (i386)"; size = 1024; - rpms = import ./rpm/suse-9-i386.nix {inherit fetchurl;}; + rpms = import ./rpm/suse-9-i386.nix { inherit fetchurl; }; # Urgh. The /etc/group entries are installed by aaa_base (or # something) but due to dependency ordering, that package isn't # installed yet by the time some other packages refer to these diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix index 7349ab3e9828..711ebc9e88fb 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 000000000000..21f34a607d4f --- /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/shared-mime-info/default.nix b/pkgs/data/misc/shared-mime-info/default.nix index a761594d07f2..1e424aca46b1 100644 --- a/pkgs/data/misc/shared-mime-info/default.nix +++ b/pkgs/data/misc/shared-mime-info/default.nix @@ -2,11 +2,11 @@ , libxml2, glib}: stdenv.mkDerivation rec { - name = "shared-mime-info-1.0"; + name = "shared-mime-info-1.1"; src = fetchurl { url = "http://freedesktop.org/~hadess/${name}.tar.xz"; - sha256 = "13xf09c4vc4hl5qhk7i4gc6z8knc32b5wjb4ds8ds4z2mbjk1s6j"; + sha256 = "0v70z5b6340jsjvdhf7brczpzq766wc1lsnjg9hc57ks2m5hjk8q"; }; buildInputs = [ diff --git a/pkgs/desktops/kde-4.10/default.nix b/pkgs/desktops/kde-4.10/default.nix index 4ea8b6acd444..6be77e321d1d 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 64bc7d56e690..000000000000 --- 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 000000000000..f6c66a8498cf --- /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-runtime.nix b/pkgs/desktops/kde-4.10/kde-runtime.nix index 6b642eb0b226..b562d8cadd5c 100644 --- a/pkgs/desktops/kde-4.10/kde-runtime.nix +++ b/pkgs/desktops/kde-4.10/kde-runtime.nix @@ -1,18 +1,20 @@ { kde, kdelibs, shared_desktop_ontologies, bzip2, libssh, exiv2, attica , libcanberra, virtuoso, samba, libjpeg, ntrack, pkgconfig, qca2, xz, pulseaudio -, networkmanager, kactivities, kdepimlibs +, networkmanager, kactivities, kdepimlibs, openexr, ilmbase }: kde { buildInputs = [ kdelibs attica xz bzip2 libssh libjpeg exiv2 ntrack qca2 samba (libcanberra.override { gtk = null; }) pulseaudio - networkmanager kactivities kdepimlibs -#todo: add openslp, openexr + networkmanager kactivities kdepimlibs openexr +#todo: add openslp ]; nativeBuildInputs = [ pkgconfig ]; + NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR"; + passthru.propagatedUserEnvPackages = [ virtuoso ]; meta = { diff --git a/pkgs/desktops/kde-4.10/kde-wallpapers.nix b/pkgs/desktops/kde-4.10/kde-wallpapers.nix index fe463786e4ca..6e559ad8a6c2 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 16e082ac07b3..4386317309fd 100644 --- a/pkgs/desktops/kde-4.10/kdelibs/kdelibs.nix +++ b/pkgs/desktops/kde-4.10/kdelibs/kdelibs.nix @@ -3,60 +3,39 @@ , openexr, avahi, kerberos, attr, shared_desktop_ontologies, libXScrnSaver , automoc4, strigi, soprano, qca2, attica, enchant, libdbusmenu_qt, grantlee , docbook_xml_dtd_42, docbook_xsl, polkit_qt_1 -, getopt, udev, herqq, phonon, libjpeg, xz +, getopt, udev, herqq, phonon, libjpeg, xz, ilmbase , pkgconfig }: kde { buildInputs = - [ pkgconfig -# attr - attica #todo: update to 4.1 - avahi - bzip2 - enchant - fam -# getopt - giflib - grantlee # todo: update to 0.3 - herqq - jasper - libdbusmenu_qt #todo: update to 0.9.2 - libXScrnSaver - libxslt -# pcre - polkit_qt_1 qca2 - shared_desktop_ontologies xz udev -# libxml2 - libjpeg - kerberos - -#openexr # todo: update openexr to 1.7.1. make it compile maybe need ilmbase although it's supposedly propagated + [ pkgconfig attica avahi bzip2 enchant fam giflib grantlee herqq jasper + libdbusmenu_qt libXScrnSaver libxslt polkit_qt_1 qca2 + shared_desktop_ontologies xz udev libjpeg kerberos openexr ]; - propagatedBuildInputs = [ qt4 soprano - strigi # todo: update to 0.7.8 - phonon ]; + NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR"; - propagatedNativeBuildInputs = [ automoc4 cmake perl - shared_mime_info #todo: update to 1.1 - ]; + propagatedBuildInputs = [ qt4 soprano strigi phonon ]; + + propagatedNativeBuildInputs = [ automoc4 cmake perl shared_mime_info ]; # TODO: make sonnet plugins (dictionaries) really work. # There are a few hardcoded paths. - # Let kdelibs find openexr # Split plugins from libs? patches = [ ../files/polkit-install.patch ]; # cmake fails to find acl.h because of C++-style comment - # TODO: OpenEXR + cmakeFlags = [ "-DDOCBOOKXML_CURRENTDTD_DIR=${docbook_xml_dtd_42}/xml/dtd/docbook" "-DDOCBOOKXSL_DIR=${docbook_xsl}/xml/xsl/docbook" "-DHUPNP_ENABLED=ON" ]; + passthru.wantsUdisks2 = false; + meta = { description = "KDE libraries"; license = "LGPL"; diff --git a/pkgs/desktops/kde-4.10/kdepim.nix b/pkgs/desktops/kde-4.10/kdepim.nix index fffab0010e3a..dca60d3d4b64 100644 --- a/pkgs/desktops/kde-4.10/kdepim.nix +++ b/pkgs/desktops/kde-4.10/kdepim.nix @@ -3,7 +3,7 @@ , nepomuk_widgets, dblatex }: kde { -#todo: update grantlee to 0.3 + buildInputs = [ kdepimlibs boost akonadi shared_desktop_ontologies nepomuk_widgets libxslt cyrus_sasl gpgme libassuan grantlee prison dblatex 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 93e47d2e63a2..000000000000 --- 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 000000000000..102363ba1dee --- /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 34af88a31931..4f6008865157 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/kde-4.10/support/akonadi/default.nix b/pkgs/desktops/kde-4.10/support/akonadi/default.nix index 0ba617226211..e1d8a5ef9ae7 100644 --- a/pkgs/desktops/kde-4.10/support/akonadi/default.nix +++ b/pkgs/desktops/kde-4.10/support/akonadi/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, qt4, shared_mime_info, libxslt, boost, automoc4, soprano, sqlite }: stdenv.mkDerivation rec { - name = "akonadi-1.9.1"; + name = "akonadi-1.9.2"; src = fetchurl { url = "mirror://kde/stable/akonadi/src/${name}.tar.bz2"; - sha256 = "1w10kb4m8ri6yi1mii2j0sckj3vq11y6qkzijm3lbh4w0fi4kbjk"; + sha256 = "1ndzc7a1q1hqy4pn9xnihq6ni02zsqfdyy6z6lwn27bkb7pg64p7"; }; buildInputs = [ qt4 soprano libxslt boost sqlite ]; diff --git a/pkgs/development/compilers/Agda-executable/default.nix b/pkgs/development/compilers/Agda-executable/default.nix index 6b5e58e77520..f9acff43ef71 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 9060d313be5a..1767a61a7d19 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 c3cbf8422bf9..39c79e9a3de1 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/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix index 1b4f237cca5b..b2d69f2ea7d7 100644 --- a/pkgs/development/compilers/haxe/default.nix +++ b/pkgs/development/compilers/haxe/default.nix @@ -1,34 +1,27 @@ { stdenv, fetchsvn, ocaml, zlib, neko }: stdenv.mkDerivation { - name = "haxe-2.10"; + name = "haxe-3.00"; buildInputs = [ocaml zlib neko]; - srcs = fetchsvn { - url = "http://haxe.googlecode.com/svn/tags/v2-10"; - sha256 = "0vwdlj0vmmf97bg6cish7yah36aca2q599vwzbr1m0jpjbvindkh"; - ignoreExternals = true; - }; - - ocamllibs = fetchsvn { - url = "http://ocamllibs.googlecode.com/svn/trunk"; - sha256 = "143s320xn2xalm0lnw46h1fvy48qg7my3j8cf66f0wwzv2fisr1q"; - rev = 256; - ignoreExternals = true; + src = fetchsvn { + url = "http://haxe.googlecode.com/svn/trunk"; + sha256 = "0hg8qailhgrcdk7r4k9kmwfl9d9ds0vy0l7wbv5wdrrc34qzifm4"; + rev = 6706; }; prePatch = '' - cp -r "$ocamllibs" libs - chmod -R u+w libs sed -i -e 's|com.class_path <- \[|&"'"$out/lib/haxe/std/"'";|' main.ml ''; postBuild = '' find std/tools -name '*.n' -delete - rm std/tools/haxedoc/haxedoc std/tools/haxelib/haxelib + rm -f std/tools/haxedoc/haxedoc std/tools/haxelib/haxelib ''; + buildFlags = [ "all" "tools" ]; + installPhase = '' install -vd "$out/bin" "$out/lib/haxe/std" install -vt "$out/bin" haxe haxelib haxedoc diff --git a/pkgs/development/compilers/jdk/jdk6-linux.nix b/pkgs/development/compilers/jdk/jdk6-linux.nix index 368f01706876..340bbdf91ac9 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/mentor/default.nix b/pkgs/development/compilers/mentor/default.nix new file mode 100644 index 000000000000..e053599e5ddf --- /dev/null +++ b/pkgs/development/compilers/mentor/default.nix @@ -0,0 +1,75 @@ +# Sourcery CodeBench Lite toolchain(s) (GCC) from Mentor Graphics + +{ stdenv, fetchurl, patchelf, ncurses }: + +let + + buildToolchain = + { name, src, description }: + + stdenv.mkDerivation rec { + inherit name src; + + buildInputs = [ patchelf ]; + + buildCommand = '' + # Unpack tarball + mkdir -p "$out" + tar --strip-components=1 -xjf "$src" -C "$out" + + # Patch binaries + interpreter="$(cat "$NIX_GCC"/nix-support/dynamic-linker)" + for file in "$out"/bin/* "$out"/libexec/gcc/*/*/* "$out"/*/bin/*; do + # Skip non-executable files + case "$file" in + *README.txt) echo "skipping $file"; continue;; + *liblto_plugin.so*) echo "skipping $file"; continue;; + esac + + # Skip directories + test -d "$file" && continue + + echo "patchelf'ing $file" + patchelf --set-interpreter "$interpreter" "$file" + + # GDB needs ncurses + case "$file" in + *gdb) patchelf --set-rpath "${ncurses}/lib" "$file";; + esac + done + ''; + + meta = with stdenv.lib; { + inherit description; + homepage = http://www.mentor.com/embedded-software/sourcery-tools/sourcery-codebench/editions/lite-edition/; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; + }; + +in + +{ + + armLinuxGnuEabi = let version = "2013.05-24"; in buildToolchain rec { + name = "sourcery-codebench-lite-arm-linux-gnueabi-${version}"; + description = "Sourcery CodeBench Lite toolchain (GCC) for ARM GNU/Linux, from Mentor Graphics"; + src = fetchurl { + url = "http://sourcery.mentor.com/public/gnu_toolchain/arm-none-linux-gnueabi/arm-${version}-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2"; + sha256 = "1xb075ia61c59cya2jl8zp4fvqpfnwkkc5330shvgdlg9981qprr"; + }; + }; + + armEabi = let version = "2013.05-23"; in buildToolchain rec { + name = "sourcery-codebench-lite-arm-eabi-${version}"; + description = "Sourcery CodeBench Lite toolchain (GCC) for ARM EABI, from Mentor Graphics"; + src = fetchurl { + url = "http://sourcery.mentor.com/public/gnu_toolchain/arm-none-eabi/arm-${version}-arm-none-eabi-i686-pc-linux-gnu.tar.bz2"; + sha256 = "0nbvdwj3kcv9scx808gniqp0ncdiy2i7afmdvribgkz1lsfin923"; + }; + }; + + # TODO: Sourcery CodeBench is also available for MIPS, Power, SuperH, + # ColdFire (and more). +} diff --git a/pkgs/development/compilers/pakcs/adjust-buildsystem.patch b/pkgs/development/compilers/pakcs/adjust-buildsystem.patch new file mode 100644 index 000000000000..4de7683dcdd3 --- /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 7f4ae9646af4..bb4657d8afff 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 ]; + + configurePhase = '' + # Phony HOME. + mkdir phony-home + export HOME=$(pwd)/phony-home + + # SWI Prolog + sed -i 's@SWIPROLOG=@SWIPROLOG='${swiProlog}/bin/swipl'@' pakcsinitrc ''; - patches = [ ./pakcs-ghc741.patch ]; - - 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 + preBuild = '' + # Set up link to cymake, which has been built already. + ensureDir bin/.local + ln -s ${curryFront}/bin/cymake bin/.local/ ''; - 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/ + 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 - # The Prolog sources must be built in their final directory. - (cd $out/curry2prolog/ ; make) + # Fixing PAKCSHOME and related paths. + sed -i 's@PAKCSHOME=/tmp/.*@PAKCSHOME='$out/pakcs'@' $out/pakcs/bin/{pakcs,makecurrycgi,parsecurry,.makesavedstate} - 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/; + # 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 - sed -i 's@which@type -P@' $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 - # 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 - - 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 439cb787d67d..000000000000 --- 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 e7c2c80ac55c..a7c9dbc90736 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 ebc052764f2d..a22b0d9ea00e 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/yasm/default.nix b/pkgs/development/compilers/yasm/default.nix index ed97e8f1b28a..02614106706c 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/erlang/R15B02.nix b/pkgs/development/interpreters/erlang/R15B03.nix similarity index 87% rename from pkgs/development/interpreters/erlang/R15B02.nix rename to pkgs/development/interpreters/erlang/R15B03.nix index 858f77531773..d282e45dc622 100644 --- a/pkgs/development/interpreters/erlang/R15B02.nix +++ b/pkgs/development/interpreters/erlang/R15B03.nix @@ -3,14 +3,14 @@ assert wxSupport -> mesa != null && wxGTK != null && xlibs != null; -let version = "15B02"; in +let version = "15B03"; in stdenv.mkDerivation { name = "erlang-" + version; src = fetchurl { - url = "http://www.erlang.org/download/otp_src_R${version}.tar.gz"; - sha256 = "03eb0bd640916666ff83df1330912225fbf555e0c8cf58bb35d8307a314f1158"; + url = "http://www.erlang.org/download/otp_src_R15B03-1.tar.gz"; + sha256 = "4bccac86dd76aec050252e44276a0283a0df9218e6470cf042a9b9f9dfc9476c"; }; buildInputs = diff --git a/pkgs/development/interpreters/php/5.3.nix b/pkgs/development/interpreters/php/5.3.nix index fce9c0f152b2..35508230ebdf 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 823920ed1021..13707709a7cf 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/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index d0e4fee33595..347647fd87e6 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/attica/default.nix b/pkgs/development/libraries/attica/default.nix index 9a5002551cb8..99fe36faa4b1 100644 --- a/pkgs/development/libraries/attica/default.nix +++ b/pkgs/development/libraries/attica/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, qt4 }: stdenv.mkDerivation rec { - name = "attica-0.4.0"; + name = "attica-0.4.1"; src = fetchurl { url = "mirror://kde/stable/attica/${name}.tar.bz2"; - sha256 = "172d1z97aw9iscq6wh23i31s4hgq7mmhr3mk4xgifqv0hjcmzyhq"; + sha256 = "1rnd861vy6waf25b1ilsr3rwb06dmmlnd8zq3l8y6r0lq5i2bl9n"; }; buildInputs = [ qt4 ]; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library to access Open Collaboration Service providers"; license = "LGPL"; - maintainers = [ maintainers.sander maintainers.urkud ]; + maintainers = [ maintainers.sander maintainers.urkud maintainers.phreedom ]; inherit (qt4.meta) platforms; }; } diff --git a/pkgs/development/libraries/audio/libbs2b/default.nix b/pkgs/development/libraries/audio/libbs2b/default.nix new file mode 100644 index 000000000000..e43a5acb6bdb --- /dev/null +++ b/pkgs/development/libraries/audio/libbs2b/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, pkgconfig, libsndfile }: + +stdenv.mkDerivation rec { + name = "libbs2b-${version}"; + version = "3.1.0"; + + src = fetchurl { + url = "mirror://sourceforge/bs2b/${name}.tar.bz2"; + sha256 = "0vz442kkjn2h0dlxppzi4m5zx8qfyrivq581n06xzvnyxi5rg6a7"; + }; + + buildInputs = [ pkgconfig libsndfile ]; + + meta = { + homepage = "http://bs2b.sourceforge.net/"; + description = "Bauer stereophonic-to-binaural DSP library"; + license = stdenv.lib.licenses.mit; + }; +} diff --git a/pkgs/development/libraries/boost/1.49.nix b/pkgs/development/libraries/boost/1.49.nix index e0ba0630cd06..6035232caf6a 100644 --- a/pkgs/development/libraries/boost/1.49.nix +++ b/pkgs/development/libraries/boost/1.49.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation { }; # See . - patches = [ ./boost_filesystem_post_1_49_0.patch ./time_utc.patch ]; + patches = [ ./boost_filesystem_post_1_49_0.patch ./time_utc.patch ] ++ (stdenv.lib.optional stdenv.isDarwin ./boost-149-darwin.patch ); enableParallelBuilding = true; diff --git a/pkgs/development/libraries/boost/boost-149-darwin.patch b/pkgs/development/libraries/boost/boost-149-darwin.patch new file mode 100644 index 000000000000..2485f883afc2 --- /dev/null +++ b/pkgs/development/libraries/boost/boost-149-darwin.patch @@ -0,0 +1,40 @@ +diff -rc boost_1_49_0/tools/build/v2/tools/darwin.jam boost_1_49_0-new/tools/build/v2/tools/darwin.jam +*** boost_1_49_0/tools/build/v2/tools/darwin.jam Mon Jun 6 22:36:21 2011 +--- boost_1_49_0-new/tools/build/v2/tools/darwin.jam Thu May 23 22:07:45 2013 +*************** +*** 498,504 **** + flags darwin.compile OPTIONS shared : -dynamic ; + + # Misc options. +! flags darwin.compile OPTIONS : -no-cpp-precomp -gdwarf-2 -fexceptions ; + #~ flags darwin.link OPTIONS : -fexceptions ; + + # Add the framework names to use. +--- 498,504 ---- + flags darwin.compile OPTIONS shared : -dynamic ; + + # Misc options. +! flags darwin.compile OPTIONS : -gdwarf-2 -fexceptions ; + #~ flags darwin.link OPTIONS : -fexceptions ; + + # Add the framework names to use. +diff -rc boost_1_49_0/tools/build/v2/tools/darwin.py boost_1_49_0-new/tools/build/v2/tools/darwin.py +*** boost_1_49_0/tools/build/v2/tools/darwin.py Wed Oct 28 08:47:51 2009 +--- boost_1_49_0-new/tools/build/v2/tools/darwin.py Thu May 23 21:58:12 2013 +*************** +*** 37,43 **** + feature.feature ('framework', [], ['free']) + + toolset.flags ('darwin.compile', 'OPTIONS', 'shared', ['-dynamic']) +! toolset.flags ('darwin.compile', 'OPTIONS', None, ['-Wno-long-double', '-no-cpp-precomp']) + toolset.flags ('darwin.compile.c++', 'OPTIONS', None, ['-fcoalesce-templates']) + + toolset.flags ('darwin.link', 'FRAMEWORK', '') +--- 37,43 ---- + feature.feature ('framework', [], ['free']) + + toolset.flags ('darwin.compile', 'OPTIONS', 'shared', ['-dynamic']) +! toolset.flags ('darwin.compile', 'OPTIONS', None, ['-Wno-long-double']) + toolset.flags ('darwin.compile.c++', 'OPTIONS', None, ['-fcoalesce-templates']) + + toolset.flags ('darwin.link', 'FRAMEWORK', '') diff --git a/pkgs/development/libraries/c-ares/default.nix b/pkgs/development/libraries/c-ares/default.nix new file mode 100644 index 000000000000..c1b23179a1db --- /dev/null +++ b/pkgs/development/libraries/c-ares/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "c-ares-1.10.0"; + + src = fetchurl { + url = "http://c-ares.haxx.se/download/${name}.tar.gz"; + sha256 = "1nyka87yf2jfd0y6sspll0yxwb8zi7kyvajrdbjmh4axc5s1cw1x"; + }; + + meta = { + description = "A C library for asynchronous DNS requests"; + + homepage = http://c-ares.haxx.se; + + license = stdenv.lib.licenses.mit; + + maintainer = [ stdenv.lib.maintainers.shlevy ]; + }; +} diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix index 87165fa8e7fe..e90ec4226619 100644 --- a/pkgs/development/libraries/cyrus-sasl/default.nix +++ b/pkgs/development/libraries/cyrus-sasl/default.nix @@ -22,6 +22,8 @@ stdenv.mkDerivation rec { ) ''; + installFlags = if stdenv.isDarwin then [ "framedir=$(out)/Library/Frameworks/SASL2.framework" ] else null; + meta = { homepage = "http://cyrusimap.web.cmu.edu/"; description = "library for adding authentication support to connection-based protocols"; diff --git a/pkgs/development/libraries/enginepkcs11/default.nix b/pkgs/development/libraries/enginepkcs11/default.nix index edd646f94fab..8c570c5421d6 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/flann/default.nix b/pkgs/development/libraries/flann/default.nix index eaf4ed8836e3..4e4391a50f75 100644 --- a/pkgs/development/libraries/flann/default.nix +++ b/pkgs/development/libraries/flann/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, unzip, cmake, python}: stdenv.mkDerivation { - name = "flann-1.6.8"; + name = "flann-1.8.4"; src = fetchurl { - url = http://people.cs.ubc.ca/~mariusm/uploads/FLANN/flann-1.6.8-src.zip; - sha256 = "0ag9k821jy0983gjrfsjnqkl5axklcih0qkpfy72h3643nin0f50"; + url = http://people.cs.ubc.ca/~mariusm/uploads/FLANN/flann-1.8.4-src.zip; + sha256 = "022w8hph7bli5zbpnk3z1qh1c2sl5hm8fw2ccim651ynn0hr7fyz"; }; buildInputs = [ unzip cmake python ]; @@ -14,5 +14,7 @@ stdenv.mkDerivation { homepage = http://people.cs.ubc.ca/~mariusm/flann/; license = "BSD"; description = "Fast approximate nearest neighbor searches in high dimensional spaces"; + maintainers = with stdenv.lib.maintainers; [viric]; + platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/development/libraries/fox/default.nix b/pkgs/development/libraries/fox/default.nix index 76cc1d5c3d29..87e47e1b046e 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 e8961621cab1..540c2c61d946 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/git2/default.nix b/pkgs/development/libraries/git2/default.nix new file mode 100644 index 000000000000..2e7a8d33cb01 --- /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 db36944dcb24..77686c9a7de6 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/grantlee/default.nix b/pkgs/development/libraries/grantlee/default.nix index 47d3d22f043c..4fc7b681baa6 100644 --- a/pkgs/development/libraries/grantlee/default.nix +++ b/pkgs/development/libraries/grantlee/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, qt4, cmake }: stdenv.mkDerivation rec { - name = "grantlee-0.2.0"; + name = "grantlee-0.3.0"; # Upstream download server has country code firewall, so I made a mirror. src = fetchurl { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { "http://downloads.grantlee.org/${name}.tar.gz" "http://www.loegria.net/grantlee/${name}.tar.gz" ]; - sha256 = "0x6lvn5i9025vdbs6sybs2mm5ay5y40f7nvb58mc2k518rmjb9j3"; + sha256 = "0c2zwaickp7han0zbxg78qrxv06jjfc4xyz2lmvl1xxmpv4vqzpv"; }; buildInputs = [ cmake qt4 ]; diff --git a/pkgs/development/libraries/haskell/AC-Vector/default.nix b/pkgs/development/libraries/haskell/AC-Vector/default.nix index e4b78876c57a..bbcfd4a0c921 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 0c3a87a4059e..ea32e6358987 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 89661b14481b..6cbd760b4aca 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 2a8fc76b53c1..bc8e9dca159c 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 31789974b6bc..a59e4ca7f422 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 d2ed408c401f..719e5eb2cee9 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 bdc86cf1385a..29d417562ccb 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 ee584e2ed8fe..4a413e2e7b85 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 feb28002355a..c7d10d0160d8 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 a412ee9eeb5c..c330f082e890 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 94fdb79fbcb1..409afcd45b07 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 134a7fc3f986..04149400ff8c 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 e7167baab7d7..daef52bec752 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 cb266ac99ce5..f204bcdf6554 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 91bd5737cf93..d719e8179d45 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 302b1fb8fb9e..32e45aebeb27 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 13f513551c4f..64bc7feaf176 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 955fd51b702b..2b9a0fadfc92 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 3248631be3e2..e5ff3951d3c3 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 4e80684cbae9..d65dfa15c6f3 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 710f2b2ab844..a7a7e7f371ad 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 922b18d9f83a..08ae46179569 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 421e64ee7a24..d22273f2030b 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 88563876132e..d61abc7a245d 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 40091d3e7ba4..50994384c966 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 a78d46541f74..b66ed3ce28f6 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 aa983026c915..783c4c186e2c 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 c39c68d9f76b..a8275c31b858 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 657e4899b7b2..35b03f77dde6 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 ee150c3e946d..6f96bbbcb7f4 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 69e84d88f881..ac4ac232edf8 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 1f17f7488855..0beebbfe2944 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 405e7672bfb3..31cfdddac79e 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 1a54d1ed8bb5..8d4a39526b2a 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 11af0863cf17..f3da4a5ccf22 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 b21d853b7146..e6238a5e738f 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 78ba7772b1ec..d9e422f9e895 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 ca17c1869ab8..93ba5e949db8 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 3ad33fe86c13..1b52261dea08 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 ebf561825ce0..01130de10cd9 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 ec65d160e866..e14aad1a015c 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 9c58da37b503..2cb9f859f462 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 e0dd6bd2bc17..8ad518ee1f6d 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 2682c0ab4202..9ac01e70865d 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 e98d2a785180..06ac5fa1bbf6 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 cbebb60b1748..b94e0f20733b 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 d598c09148f8..b490cf75d96c 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 0e344a865450..417ded6da54f 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 1f917fafc3c5..fee714491429 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 2adf5701eb04..9eefaaef84a0 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 f27d1f97f374..56e999d7b83e 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 7e7c23c0a854..8025ef13bc28 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 b01de9175c02..84b5f6fe6107 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 632de1f30e5b..960868e3ab0a 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 95a7ab52fd3a..713e67fbf608 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 7e377ebc66cd..c289c0092567 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 ca221a5a9de8..65c90c0824ea 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 68d7f25e431b..2fa427b1f57e 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 f2c56fdd2ce4..d7307bde5d71 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 348560508622..a29997f9de95 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 195af40d1f03..f3bd183d1373 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 c2b6b067b2f1..659a1158d0f3 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 b9be1488e4e3..9b044f6dbab5 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 e675ae6b6a1c..4edd801d08d8 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 daf961f15506..6d8e66952e40 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 70430f9f3c75..738b69f28325 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 4bf301bd66d0..490aeb4167b5 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 1e55feeb9897..d276697a6d95 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 0be7c3dd22c9..27f9b444a711 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 2ecc841a8a47..945e12438b58 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 534fa1c8667d..a04aea993fa2 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 e74fcdca0245..2e4ac90c79e1 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 65e3da59367a..25133657ccb4 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 cf1bee122afc..33e9c4d21a0a 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 73b5c741bbb2..c8cfd796afd0 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 1e56e88de384..318bdf197486 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 7714f08e698f..72183c86192c 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 c0d62685e49f..a6a45bf5b248 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 ff3bd0b8fb5f..32497935cdbe 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 90df60cc8e6e..19d7d8abaa54 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 a459fd953175..3cf80d93336e 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 c104a4be27a8..6ba32ce71c0b 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 828255a9860c..2f305b8a23ce 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 ac9ac3d2a7de..4e634078a7d8 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 8eb413d2b31c..e2d274dca05c 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 69a1c1dc417a..b3202cdc4b93 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 98548b938638..24e16a4955f5 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 8a9413989088..39c97859e657 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 cdaa5b5136b3..c5257c5b2620 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 6a6211b6263a..e65752e35b4c 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 1adec3b3d6d9..12c3e34571e8 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 d49242256f22..15cba0c0b283 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 e6695f013580..6c61813ac308 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 674282e30a86..8690d7e89163 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 50b7bcd33105..f1a0489167e5 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 0d333097b451..62731657e82a 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 b0c30d93605c..343412700842 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 ea9c60adeabb..91c128756f42 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 b43c22244fe2..d4cc74902776 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 8f36e8ebc088..d896eab923d9 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 95148607b6fe..3b27022bea07 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 aea9af862d22..a95b30761373 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 f1c212d7a491..c4960813f3eb 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 3856409819df..d62b42833a3e 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 dd305cab560b..85fdcfd0b4af 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 18371c57f082..d69ac78b83d1 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 cd34f3161f3d..26f14a087748 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 89161608843e..49bcd8ed112a 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 88502db4dfff..0638ce06ef91 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 6603117c77e1..4240d7b9ce94 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 d9eee5f5e1c5..1690ec9031e6 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 fa1cc44d9909..c304a58b9a51 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 125da2a795e1..1cb214b94b01 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 c527d34f738b..475abb0b3a9b 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 797d42319bb6..033fc242321d 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 22fdb877ff4d..aee3b666890c 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 095d2ff16649..b9536052dd2d 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 000000000000..523e5ae1504c --- /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 d327d710e3b6..3daa16d87c93 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 f4c70657caa9..b91de6de44eb 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 cadcb223366d..209341e22e76 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 4f0b55a50792..3c4135feb724 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 000000000000..140d554e88c6 --- /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 000000000000..3d1091f27027 --- /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 4d9c9d44dd61..9daf9406742c 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 1f13d67d3e8d..6d598f29ec95 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 79492bc2eebb..bfccdcffd746 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 012e771d1816..4c2f5a9ce464 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 1f54347986be..181937fdd807 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 f9ba4b422a25..149f5f951e5d 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 f35f5769a0c5..a90e8e769e23 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 fc32f366ce42..1b943208dea4 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 ef6ee614053a..5dd76b4d6e00 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 000000000000..4b37ea84d588 --- /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 2c5fc47ea314..c000002d4998 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 bdba04cf14d8..623ae1040901 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 690196c80ffd..663a91b0c30f 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 880181fa4a1d..d52687d80801 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 d7fa58de5d7b..c352ce7ca8ec 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 60cd5ffb73a4..c21d6eddbee2 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 a94b6b9ef3ee..f0a1969ffbab 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 8e76bfa698da..ca208b7c1a34 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 d624213111b5..3eccd0a4ffac 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 5004032997c7..3f81258f4263 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 e043d35ffb1d..67450dc88874 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 08af81a606d7..3a2d044de64d 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 e77d5b96ea79..9e0a781039b1 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 95ce58e4b926..cdf929d80274 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 2cdd3581fba8..c80f04f966db 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 ea46422ecae7..c659c3bc3bea 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 2b132f9cad0b..98814e75a9d5 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 34a6f0db9715..4033565684d0 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 adfcc16a1806..245c80ef1ccc 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 faf51870ae9b..edda97480d8c 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 53f857102816..b120c8cf9537 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 b8dd09f43b84..e6add5883aaa 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 23493e50c19c..70369034eaad 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 bef4668cbc28..16c352b7a332 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 5e533a415a29..00176d215bae 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 ffd307bf13e6..816537b1ab65 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 2370021da600..ec21e3fcd84b 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 e8272c2c5ad5..0c544119d5ff 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 caa06482b672..7b3ec55dc577 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 b3ab183c57fd..ede82e5c2ed3 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 9d7f550c4fd4..7c8c2d348498 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 213afd59c5ae..e018ac7a8d28 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 8e1685296cac..a3de1d11830c 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 a5a1145295b1..963448a56e73 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 1dd75661ce68..a406d1fa5000 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 042c212e801e..e572e366bdd0 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 8addc3cc628a..86de1da9328c 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 9d67a1cb3ee0..93c8b2aa2290 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 cf68d1e7fa50..5f9e322fbf0b 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 36ef166baaf6..e78a64781518 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 000000000000..e9bb268b9fce --- /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 1dc56c420b67..41c31b1fed5c 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 c0befa37d2a8..6ad4db61cfdc 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 0bdb33ceede7..55b4fea36fec 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 ab59d7c50893..0f651e1eaae3 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 35b11decc43c..59126959bfb5 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 000000000000..7fa22dfa2eb1 --- /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 000000000000..b5fe61c13cb6 --- /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 44aaef29cea5..083fa7df3703 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 711e6a152596..44ed255bb634 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 c322ef8b54f4..464e8dbb5e76 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 8e8202d9c5e6..a28ea11c511e 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 168ccb113b63..1de453b27efe 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 9cb92640ee45..60669590c2f9 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 7e91e25209ee..bf1920d434df 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 0c1f8d709c3b..c1dc7076c77d 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 3621b1fac1b8..97e5556bacd5 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 4f5fed76b416..d2d899180860 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 53aa634aa72e..e27f203306e2 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 1563efa125b8..7d3cacdd67a9 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 a8ca3c699cc4..bffc72cf73e0 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 b55e20d91c54..2c68fd24d1fa 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 c3e4619c72fa..c04b4dfc25e1 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 9c830545f763..51a2d6c55bad 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 83cf8e57a682..e670ff1a3d14 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 df9f7f5865f0..dfaed86b9af0 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 7b29ba580046..0a71649f0e91 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 702ddd0b9ec6..fa2b98801233 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 7f4fde5ef970..06bcc8ed9819 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 0d754ec4308c..99c4016947db 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 61d0823141d2..7e11886fc582 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 f09d488fa6c2..5921d8b07d39 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 416826298bb4..fb0b6a1f1cba 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 0a36b3e9b736..db380f03b5bd 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 cf4c17ceb459..983c41f57c9d 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 558a8935c04f..775c2e5027f8 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 86690db7162c..0fe2cb8864a6 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 26b683c19696..095d0a179846 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 e09043519a86..2c967d26085a 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 6c1282852851..50d95cb88511 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 a3fa0208e2d0..8a79e50527d8 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 06cdf62e53cc..b7dae5d4a9b1 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 2d8989437fb8..4f2aa58b7d29 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 3187036539e0..dc27553c2a3b 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 5a722ea4fabe..004f74cd7e7f 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 a888b0e6242d..23fdd553f9e7 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 b7624499dd36..61d6bcbeabea 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 99665c22df2e..af6985cd9ede 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 5ccb1e7e0ce7..38024a24c546 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 3db4dc2b9c18..48af6182c644 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 c3b10cbe329e..7c3b10a38386 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 0aff493ac874..50935a77a64e 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 1ce1a46fc40b..97f74e805300 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 64dadbb4e4ca..f59a80b2b65a 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 ae149be79dac..f56a9b89423c 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 00b6ae2a406c..000000000000 --- 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 38ac1db8194c..ac9e41fd628f 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 000000000000..76039f065488 --- /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 3842707c613b..a530044ca6ed 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 9f0e1c11c851..41bd23470124 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 078234c19c42..83712b858c25 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 29038616a8bf..7c1de10b20b0 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 b91dc6d05233..5066a83c5f60 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 8f99c0143cd5..1db4468a6ded 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 b8b8494550c8..5fc59b232a4d 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 98590fa795b0..6ac626b70792 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 1fa64003f954..a89da0c84f5b 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 e8647898d9dd..b1b7742692a7 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 31e3f7423103..e4340c7ec322 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 b23fdeca69d8..ec3cf7ca6495 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 208f021e8af4..7ba9e3f9da74 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 8e3a8b40751d..e4cff67f3761 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 5c4c3cbeaf00..2b3adde1d728 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 2618ef6a6906..6599d25f68eb 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 fa9287e6f075..9c4de4a1b84d 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 b672e797fa06..a460dcbdafc5 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 72f3d1c937f3..faf0b40b94d1 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 26306eccfcb6..16cb2c7ca033 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 b65ddb5e786e..228fcd28c785 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 2c61618cd081..c13abe9e31c9 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 4af1d5bff9c7..99db69e612aa 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 35fca66fa869..f4ef61cbbffc 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 bf6d93de2835..78f9273e46a2 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 000000000000..32a10efc785e --- /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 000000000000..2ea45097d3fb --- /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 000000000000..3d33956edcf8 --- /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 c3aa09d9550e..906c51fc0722 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 6b8de51e1d7f..ca702b60356c 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 4a55eeaac65a..bc2abf5c16d5 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 12c72e12665b..141a820b5d1a 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 76cf77f1315f..ed23b092b02e 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 1e1174ad303c..6f201e7cd850 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 a737160ea605..73c7ff8f8c47 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 f6fd22ecd99c..561f32118c22 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 000000000000..23d3339d348c --- /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 a341726bf537..c315c0813eb9 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 695ce79f0595..0bff7f191b1b 100644 --- a/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix +++ b/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix @@ -3,16 +3,16 @@ cabal.mkDerivation (self: { pname = "digestive-functors-heist"; - version = "0.6.2.0"; - sha256 = "03wxdmgwc6qialwhp5zdj3s3a8a8yz6vswfgryjx4izaaq7pdhl1"; + version = "0.6.2.1"; + sha256 = "1hs1qiaakxgv1lyd74cahqphrpqch1wayx0c9zpgjja3bnwjcj8n"; 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 03f34b31b618..f23ee6d06910 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 bf11f9675bcd..0b956680a84f 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 1ed368d24a1f..70995ecb3ce7 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 d36f351fcf60..329722abe8e9 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 848ad5631252..5c8b357593e4 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 b2b58825469d..aaca850c0d7a 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 be5d9fbfe6d4..d23a5ef0228d 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 e682ec474aae..9147b724ba22 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 55a9fc41ed0b..d40952024ef2 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 a88b38650c7d..1a7fc56efd5f 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 e8d0284487af..0854f39efcef 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 ecbac90aa418..3b8c03e2da27 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 06a3e6a09fe5..a7fe5b791f0d 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 5bd90719ac44..cad61e52ee0c 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 dd7fb892fdea..935004a6bb0f 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 c0895ac2938e..06c34bf9acb0 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 6b37b0a30998..4b5dd2b38883 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 a41924dbcfcb..841fae96791c 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 0c9623b11a5c..8b3d2cab677a 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 cc3183b8bda7..22f5953b7e04 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 7d92bcb027ae..7e6262423c6d 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 af6ca841c7a3..cf9f1e099a2a 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 b75793435b36..4730af585697 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 784977000299..8ba4687d3e3b 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 a3bfd8cbafc7..3ba059261794 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 73ba94bcad9d..1b7ef1bcd1dc 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 e877124b9635..f98903d3dc17 100644 --- a/pkgs/development/libraries/haskell/entropy/default.nix +++ b/pkgs/development/libraries/haskell/entropy/default.nix @@ -2,16 +2,13 @@ cabal.mkDerivation (self: { pname = "entropy"; - version = "0.2.1"; - sha256 = "1qp8hvdzfgg2wk7d431qycwbn2zpzlplc1c7dbhimj1had5jscrs"; + version = "0.2.2"; + sha256 = "1zri5qs19cbz9ydbh076q6834pspf2gqn06ssz4hsq6j65cnd9x2"; meta = { - homepage = "http://trac.haskell.org/crypto-api/wiki"; + homepage = "https://github.com/TomMD/entropy"; 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 27a85b1df97f..5b44c9efc62a 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 25d64b3faafc..1a6331bcd6f1 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 7fdae9135013..7ed890c513c5 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 b340591c33ac..2c64598d1d01 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 c8a9849cad1a..a4d0cfd247a1 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 5faf06230f62..5c69969c20d2 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 151ce5b785c8..0f2385a004ff 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 8a928931e3e7..0eca0eb78eec 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 329bb2a42c48..946a808ddc52 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 d349a1f17e36..577f7d4657a5 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 f217db39bc61..2ca255d29997 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 3e60885352ea..bc2821e3e8c5 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 8843062fc258..c9544b2c1f69 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 5f960cbb1f00..0064a7f425a8 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 8ad5c4318f7d..d15906e0be51 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 9938d181d88f..c446ae8545dd 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 7299daddb14c..c367b74f6a3f 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 7417a32745c5..8691d10c684e 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 7b6aa799944b..6a7aa22cef10 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 efb8e9d7894f..145d3c1c203d 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 e9806cfb1fba..8a28d0b27fb1 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 3409079210ba..0cd65bb1905e 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 137846f85f6f..04321d34ffa1 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 a44134344808..46ae27fc0901 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 ea3d9b6fbdf7..299b2e926dbd 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 2a94174f5ed0..7be21dbbf347 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 e46f582c024b..025ed14869f8 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 ac489da34d91..1ef55d105f79 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 2853fbca7685..8fbdb57d48bf 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 44c15b23d4ba..27423ce4ecd4 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 929b717f552b..e14857aaa5b7 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 c5a62b967aa0..043156ab5e1f 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 508075044eca..eff79afa416c 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 18110f3c0f76..8c2f481122bc 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 f4c7bfbb264d..5b7decf9416b 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 6e7450d099ab..342e2a7cd311 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 a8224a85745e..4eaf0dcb7823 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 2db4ea5817cd..ea2495f6586a 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 aef62af9e163..6f5f14585074 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 d0a766940fe8..21a2f0f00eb9 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 8b6dc19653fe..12508a09c63d 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 082032f75a3a..e9d295798b63 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 d241442e616a..9213c534fa3d 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 f1bae4ad9fe0..7c49b956aa98 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 a9c3023c41b5..29d2f92d7bac 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 a4af25459a06..ededea21fcc1 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 2ac665472596..fbbe7d31c2a5 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 27d7860be66c..6ae78cf49b6a 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 6aa16600707a..72f98677ce66 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 134f05afb49a..6f7aea3289e3 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 471c5586fe93..4c085c0ae23b 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 aa727cb9412e..5a654cdd11de 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 e817312f9f61..ed5244d72629 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 be1f53937e1b..677c6c15214b 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 bb7680b34077..756e1a1df978 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 da16347a8ddf..83ee2c810ebd 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 fc141f4780d5..c5d0b335531e 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 64bf08ef5336..fad611798e9d 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 28520ceae0fb..b679ba453fd2 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 63e6c47b5b32..8dfac311a9a5 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 cc261a552355..ffb3f98e8b33 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 b97d168d4121..e92f0c2c9d13 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 88e5839363e7..77a4251259d3 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 14407a038b82..ae62c051ec5e 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 acf6a6c0d4fa..76080574fcc8 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 1e8c406c21b3..a283f229b762 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 90c4a599bc4c..9aa1bdea9514 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 bcd1e22037c0..add910b61936 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 000000000000..2e0181bd1a7b --- /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 000000000000..cf676ab1d6e0 --- /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 bad9ab911759..1918260cc62f 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 280fa347d897..5521e037b4eb 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 84df55723959..7b6ccb696338 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 0bec73765444..6729cbef2aa6 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 949efadea96a..1895a655d92f 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 dd62d57a02ab..1dbbbec550a4 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 a98c3b3ed372..15d32de346df 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 83917cf88919..b319857bac3d 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 c17680efc90a..a5aaf44c3928 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 ff1c893cd0e7..22ad08afe380 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 f1c6f8785262..5a656bc19c78 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 e137f58c11c6..fb7d0d4a00a6 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 1c6a0bfc7d45..de1c0e127597 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 4a9c835e1fb7..8cf1accca9c7 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 7bfe5a8fa957..9551581dadf6 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 d22bd1b186c2..2542e2005865 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 d2ff9c480800..c568b292c3c1 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 306ee1437ba6..1e722a186dc4 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 69653ca2699f..75886f8daadf 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 f77d0ea677fe..96ac397da79c 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 e1494f50693d..83369ac008b7 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 0674ed31659a..592862d49ef1 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 63b615607230..d8bc08b4b33c 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 e7f75fb74d3e..be78bea938cf 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 52defb43e4cb..4aaa5fe5e953 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 b17c5ecc0701..93162ff8cdfd 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 9e2f6188761f..354cd286de00 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 c1ee264ea84a..dbd1a4a0923b 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 000000000000..91a6159784ab --- /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 7745c125e11b..eaf1754b6223 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 f420bad2959c..de8dc75a5faa 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 c4e610d254f1..3062c71dcf15 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 adbabc0734b3..3571c160f6b7 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 3ed061ba1154..6d1c34556f73 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 9cc9d3859d63..c4c064fbf811 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 e56a95437dbe..d1d3f28b0496 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 9e2b9a21bb38..86605ae55a56 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 61465a789058..879ff0affdc7 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 6584a69b4bae..731c63b5378b 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 53f7af3e52ad..35783c7762ef 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 2ca926ffae7f..1d5bc92bf6f1 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 3a731c626231..6eb5f262516f 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 4725ca37fca1..61e580b6293d 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 f48db1d12be3..bec6431b42b3 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 55b88ac1d36a..32e60325acc9 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 e5092ccb1ace..045bb64035c4 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 8bfcde01282e..89d277d1f406 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 fa906583afcf..ee9026bae493 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 a7fc6b7e6e11..d062ec298690 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 000000000000..056e308b4ac3 --- /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 872f2fb394f7..c93aa0411d40 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 3e2f2cca387f..9a56f412fe2b 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 44be8624a41a..dd6c3eb058f2 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 489d4e9cdb3f..6ae0447b1fe6 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 000000000000..acaf8def0046 --- /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 2a8813d72a5f..51db50a75b76 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 68269106e5d4..922130f4f9b9 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 6d7f756c6866..f3c9a8af4eab 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 7e96fd6c6a55..000000000000 --- 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 78% 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 1ce3ceaac825..4c281642277e 100644 --- a/pkgs/development/libraries/haskell/language-c-quote/0.7.1.nix +++ b/pkgs/development/libraries/haskell/language-c-quote/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "language-c-quote"; - version = "0.7.1"; - sha256 = "14gh944wpwg4csxwswr9jlll4p5wc3x1fhbqsfh9lqf98ys7ij3z"; + version = "0.7.2"; + sha256 = "01ki78qh39gbd9md3pq783vx2p86gyzhclci7pcppz2rd3man51m"; buildDepends = [ exceptionMtl exceptionTransformers filepath haskellSrcMeta mainlandPretty mtl srcloc syb symbol @@ -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 aa9cb12412f0..154bc68c3c5c 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 71e514ddbc11..5b638ea9dab4 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 d81d4a818e20..a77040a5578c 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 2ecf3490af66..4571b869e3bd 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 a38099b761b9..da0cafb9ba73 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 5881baf7430b..f409d99987d9 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 07804ef1b7d1..1a907a384f1f 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 75059e705124..b8f0ed37d4cb 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 ef0b46b236d9..4531603214e0 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 000000000000..aa560fbda06f --- /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 0ecf0e37ca2c..a07480551df7 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 64a4906fa597..7402d6f31db3 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 de30698e2e7e..afdd782fe094 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 ea3d4278bcdc..9b9dd8b679e6 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 b8aeeaa2b73a..ac2114b7f373 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 5f438fb40601..3088004d0a88 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 129a7d7c9004..0a03ed45fee6 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 a43b5f0fadec..2d494f4a8969 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 2983313e0cce..7960395eb098 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 03731a91d87a..6109f33f82fe 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 db03a6022dbb..2bcf2037cbeb 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 617d6caf2c9a..06c1b9e2fcae 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 f5046748a0b2..2e29269a9fdf 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 f03b771b8fda..84f0d83a9242 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 3153bb6f6086..590290e76c34 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 f9c1b69706a4..d24bf5719bde 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 18056986cb0f..5dd5f65c9e74 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 b036d638caec..06dcfaa11390 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 6cfbf687e5a6..22018087226e 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 000000000000..5fe26fff7441 --- /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 f810186a62bb..4d0b9fcabeb7 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 0d8e61530495..c4379499fad9 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 4b6431f678c3..ac59d470145b 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 d57d6e5ee1cf..c06809c261dc 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 fb6ead581c62..a58d90fc98bf 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 b651575e0a6e..fb8773372212 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 6430ec3c7606..8692d6267cbe 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 6ded217c4d7e..3fc819542eb4 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 afa31d1a0d5f..39f911dae938 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 4daba276730a..df63e3ec6591 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 652b561de84e..f51fd8c840ae 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 caa30fe6fca0..83b04869e68c 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 96f254d077e3..a0ba1fd9856e 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 d5cb3e9769f4..543578211718 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 d609fc75cd78..fc8fdaef7525 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 05e84b90dd07..d7e6029a4edc 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 dc2ddedc121e..3c91b65efa04 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 427411d41088..b9298325c207 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 5048a4b99686..c10f526acf21 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 349fea712eba..37be70cebcb1 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 000000000000..f965caf2c1e9 --- /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 10404e64f218..f3b00a7efb2c 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 a586b89982c0..14310f50ef6f 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 98cab8421de4..a7d7459b4558 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 eb5df93d5bca..9f85317505c9 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 4ca3e4fb19f0..16fcf155747d 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 8d4c59b959e5..0c4058eb1119 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 bccde70459aa..3e9be2c5e587 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 bd3f7d7edd51..b7f498a35c83 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 b8fb5f9e4efc..3ad4240e2892 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 f48a64221009..02f5c289836e 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 e08c05ac6325..787ac70ffa96 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 47e3b62138aa..ff9ed1ac0bfa 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 91f7042509b9..57550dcb3d86 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 fbc143fbfaf3..d7ab9539e0c8 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 80d9fc05bd82..032592f974ba 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 f15a94082a16..c1bfea43bde6 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 089a34638341..3a461a51f53b 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 e58bf679fdc5..304017d3d240 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 47718bc3468e..840712e34160 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 c709f7b853c5..7aedea7995b7 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 86656974aa89..eaa41944a6bd 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 7d99df9ee1c8..68c7937497c4 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 ba33bc36643b..f66d81f79f45 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 107d4f50f353..557dea081fdb 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 9d2642a487d2..a1a9a36d7382 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 bf9330eb256a..9434d83d7f01 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 7cd500521dfd..dc0c1811e591 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 a4b2f8ac8e93..6f245cf18400 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 a08ff33c0e48..40354c9472ce 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 934bb76dcd42..a50710791dbc 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 72b3ac1c7d5d..81a3e866dc01 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 329317f6834d..f6f4d420e2ab 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 d7e88e882cd8..76f57daca385 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 b55e0c50b4b3..be90f003f7fb 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 6d16100ccc12..c8b9e984eb1c 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 3043da1bb6c9..a3ab241b28ca 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 ce7888cd4b7f..d4f49791d306 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 d11b33e2096b..bbd935eb043f 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 9d0c82f1aed1..56c1a1306964 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 2977a60964cf..5212e6b2847a 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 185e86b02e89..9fb661fd481f 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 37d537185cb6..83283c2317b0 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 81d37e3a2b0c..365ed1968419 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 ee8265950b76..e089c8dce8ea 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 197376d608b0..4287015115c8 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 155e4f09007c..17c046a06e1d 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 e740ca91dba2..62c5b67b0e9a 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 95ef6219dbb7..ecbdbb3aef0a 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 5f6521e45833..b9b10f2e5b0d 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 55bc7f74d297..4245fcf7f40b 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 83a8c2d3faff..14b9f8d70813 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 00d33238c428..f0be81e64ae3 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 3336b8f1c8a4..71e0ddadb59c 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 35f8ae70cfe3..16b47a9c8ae0 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 6e7f44727536..4f38dfcaa12f 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 885ad70f63fa..251db960506d 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 86bbe4e27883..947f75342d45 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 926b4fa4cb60..396f51f69cb7 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 8ca0febfd840..036deebae20d 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 c101ec60a36d..b1be8dd6d035 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 a0ee0e199bb9..45b994026c2f 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 b414c2a70f08..77faceeea923 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/pop3-client/default.nix b/pkgs/development/libraries/haskell/pop3-client/default.nix new file mode 100644 index 000000000000..6656814f64ff --- /dev/null +++ b/pkgs/development/libraries/haskell/pop3-client/default.nix @@ -0,0 +1,14 @@ +{ cabal, mtl, network }: + +cabal.mkDerivation (self: { + pname = "pop3-client"; + version = "0.1.4"; + sha256 = "0kfcfxfwg5rjm7qx9r0ssdvkrvca95hflahrip1hi5wbplf224xv"; + buildDepends = [ mtl network ]; + meta = { + homepage = "https://github.com/tmrudick/haskell-pop3-client/"; + description = "POP3 Client Library"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/postgresql-libpq/default.nix b/pkgs/development/libraries/haskell/postgresql-libpq/default.nix index bba70d7139b5..90a92019f0e1 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 9c30ad00e5c2..81a5f67c45b9 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 df204fa2482f..c55fc0226e9c 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 6d76aeb9bf6f..5fedd0aca292 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 680904992835..af6778ccd141 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 f1baf67bec72..1d9cb4f80620 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 b7b1e209ae9c..df16898ddd3e 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 f141959dcf1a..83398295108b 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 2b225d6a87dc..fa60370f1f5e 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 c4923836bb26..98b65bb59f02 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 446a430ed7c0..8016095a4020 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 253903d3e3fe..b1e6e1d4e303 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 f61cb0f99a30..ea1bb7164c8d 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 fabc39123d07..a4ad760d8ffe 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 e6d0a3f4d80c..8e66b2c3c037 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 4d50729604e0..d75823d6025e 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 985223678cbc..b7c33b6d1a0a 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 37ed0f7ab974..8dd228ad3db3 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 9c9dedde25d9..1104091ae57f 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 707477609b64..acc0285a59a4 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 a4feee31d023..1f4901a4d91d 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 0ba350270505..2182e6410b53 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 d30375f46e83..8694d2399b2b 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 0fbd9d74d19c..ee408fea4805 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 682943e80f14..8d1ee0ffc959 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 60747bbda68b..37fb26208f48 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 8cdd36da0141..5f227d60ca80 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 09e4906da011..e94a233d9f16 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 8fbc2f9e84d0..5a49d2b6407c 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 50f039a3d27a..1dc559e63702 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 ed88e247e5b7..623db0cc48b9 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 3db0f5d40656..8b9e666d6aee 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 3a28e505a82d..df3a7abf13f0 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 138702e1d416..52c28d8b800b 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 a34d90fa9847..2b7f53e4572a 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 961aab9e2f77..f1f6a89dc3d9 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 223c9baedcdd..662d8236c45a 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 9a570d4ca20d..11e02b398b5c 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 e78c7fe2584d..42ee42ba7ef7 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 ca6358baeedb..58106bc8b741 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 22e1dca23ba0..6d7fac51658e 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 82fa24016bc5..67073790d25b 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 538b980b4383..c5389a7b6636 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 bee3cf33d1ae..8a3e740491cb 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 75c94bea23be..3e160130ea8f 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 b81a37f8ee5f..acf9dc712f35 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 03941f57316e..bea9d9f7f043 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 23e8b2b761ef..046fafca43a7 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 f6cb286ff794..66a8838c8d82 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 951288c04aae..c44735eda00b 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 c8c28f0e7749..77bc91051937 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 aca334e20b27..4b2defc79d71 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 c6435cfc8df0..6f2ed95ab636 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 067b7c4cf67d..6c16af12107d 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 000000000000..f8acbf1fda83 --- /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 7de31bcf6567..9baaa89d2d4c 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 26949f5004d7..263adb42f253 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 dcbb09b5613f..4f1367dd559d 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 1a1234413aaa..ded335ca524d 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 0cc3a64ccc8f..dc1f24757af2 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 02df359df868..b19728820aad 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 e2b46cfcbc52..c5cc24cc8da1 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 3e9a5fb250c7..a18df3062e29 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 a624bb140d15..1150ead03941 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 d492b6d25058..802fc8851371 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 d5551d0ef8cd..d4cc135cc62a 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 d90812c21cd5..16ad7ffa44a6 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 9c167eb126be..1e9e1f8c6ccb 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 7eed37f5a40d..28ed4371264b 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 87a3ac1d4633..fcd7a0a872a5 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 af6a6a6e6943..7a7f40c6d833 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 f1d245f9358e..9e8f638c65cf 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 99cb87b7c046..672b2c090ef2 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 9bb3efc65034..3db59020b154 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 ff710b0ea07d..6d82e7e5132d 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/smtp-mail/default.nix b/pkgs/development/libraries/haskell/smtp-mail/default.nix new file mode 100644 index 000000000000..e07ed9e236b3 --- /dev/null +++ b/pkgs/development/libraries/haskell/smtp-mail/default.nix @@ -0,0 +1,19 @@ +{ cabal, base16Bytestring, base64Bytestring, cryptohash, filepath +, mimeMail, network, text +}: + +cabal.mkDerivation (self: { + pname = "smtp-mail"; + version = "0.1.4.3"; + sha256 = "0kpm42n7s3rvkn9i3s8wvkdrq2d85qy422y6p2r4s7nivh6sx1dk"; + buildDepends = [ + base16Bytestring base64Bytestring cryptohash filepath mimeMail + network text + ]; + meta = { + homepage = "http://github.com/jhickner/smtp-mail"; + description = "Simple email sending via SMTP"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/snap/core.nix b/pkgs/development/libraries/haskell/snap/core.nix index 7aa6cfae73e9..a20ec8e7ca5a 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 85a39546e45f..abe4d4cc074b 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 09402c1a5502..e75ae50d6c87 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 7bd2ca8fdbe9..c11dfe4f398f 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 9c7c350c5174..80cdf575d70b 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 311c8b224134..27dd54b29598 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 c9f9ecad73cf..0fb28b53ac94 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 62e30fa33003..ab60774cca40 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 eef8a1505cfc..f652ed001e40 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 b14fd6ebadeb..bc3913f6726d 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 0218db413d5f..4576a447fde4 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 1521763f2bfe..1b1f1ba705bf 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 07bc40d42d68..16dc76220311 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 fc9c7c5027a3..778d333c956c 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 6184a324181f..fe308211ebb5 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 8615f10be80f..492fb6e3557f 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 1174a9740e5b..fc33a979adff 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 7057ede7052e..4057b1f7fb3c 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 d75f133d896a..a3fa76e4a519 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 13d3653ff653..a949474cef12 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 dc36d53f046a..4450308a9107 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 caf8e218b181..455d860ba5e9 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 99239884b0a3..61b34efbe451 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 083f3e06d5b7..915fad7006a4 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 75c31a3971f9..bfc38fb07e89 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 eb5d7303cdd3..78fe1c3930f7 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 ddb219cc3075..efe0956afc0f 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 b37be3680cb7..f1654751f753 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 dc3bdd6a2c35..f8032f8cde41 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 9e50b646e3b7..c092f0c0d15b 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 87d79b6e0610..1d2cea756ffb 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 08c812f74241..e7aafd37264e 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 070279fadfde..b03cb947d27d 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 01cc80c883dd..7caf5908a2dc 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 04e5b7e1b0e7..7638ab3332f2 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 70f1b01db0ac..a37e238ff710 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 5063009b93af..44a16e0bf5ca 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 ddf16ad41e55..4b999a94416d 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 f6ca59529659..7408d0ac5375 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 2f3167ff6280..0cf40a87d417 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 81a5529e9cae..c6a85e27df15 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 2b91c145e8b0..d82a19688782 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 1f78cd4c5115..f61dedb7b8c5 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 f845ca852669..851b28baafea 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 bde48cd3d5e0..32ede2f660b3 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 e48bcb39f09a..42f0beef125d 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 4fbea6c0cc20..3258267f0120 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 089593c5da34..1b290bd310ba 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 4a10c2ff0410..04257960a64c 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 f24b9e1b162f..df93cae198a0 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 000000000000..d5e16e43d3ae --- /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 cb08aabfdeee..24221912025a 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 a4bbc52b1b64..011d791643cc 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 7133c9a144ea..cabc0fe1d0a4 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 ac70e3d2aff7..b944c1e104cc 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 e7d9ade6d401..ebcd608eb6a6 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 31f293ac9e2f..f70e522a2ce4 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 fb9f4f7fd4ca..b9f335e1a5af 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 c9534ef57ed0..8082e77d2824 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 ba467ce6d134..16115809f5b1 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 e64be4197df3..59644d057201 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 6bc6baf36ce4..04fd250dfe9f 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 41569875a9eb..71d0c28e48d7 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 79804b49b2a1..03c2d90ff8da 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 a2a737b01990..ab784807bfa2 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 9bdf7fc97caa..afa0e7eb5d3d 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 8c3de985955e..6bbab990b8a9 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 e8df62c6190f..3475ccb804a0 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 aa7b5224de61..b8a118b56a65 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 6b6a971bf688..da14adfe339b 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 d4108f0a012e..aa848e4aa087 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 4517a5f45126..dc058844247d 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 ad02cca08de6..d802790da9d7 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 50535015a215..fa7c3ff41855 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 7ced3956a8a3..56072676b67b 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 2c6f0ae55947..62232d1aa5a7 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 163852c312ec..c9ab989ed76d 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 c900975e8740..72e0976ceaff 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 951458eb4eb1..e323905f81b6 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 0eb34b9444c4..f3120a61f201 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 f38605c17ad3..6d2e374687fc 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 50675d901ec0..ec1b85248d9c 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 fa06558fc0dd..90441f31867c 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 979fdc57a3be..ee90387b6370 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 80af1951f586..8dff0ffd58fc 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 1db17d844e75..a90381202e1a 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 ea4e66a95fae..ccccf9d95d38 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 a5fef1484ff6..8519ff451b2e 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 d717bd27871a..399ac02e3ce2 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 35097601783a..9742b193e7ba 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 3d3fbdeca45c..22d3af28fd08 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 2344e4606932..474bb1a8b092 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 000000000000..a8f1ae922ee1 --- /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 df0be2ea4776..af4f93c7457a 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 e4726ef011d6..5353895815d9 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 bb2ec05db0bc..05bd2ab09bbd 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 59ebfe3b5e6f..42591158cd7c 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 0928ae0347b1..e627c77bda2b 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 41c6ca0cffec..76ce975b11e8 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 000000000000..a71111282fad --- /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 000000000000..651cd9fe450a --- /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 31c504139bbe..8d0b0bda23d2 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 5b74c74b4904..2aa30d8823ec 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 9b1660404ee2..2521c44bec6e 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 ccabd8cc7fa2..5ab1d4f85464 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 8be1ffee5287..8506e5805022 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 6aed9be5799c..6039e7424772 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 1b34c7b55782..a1cd2783931f 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 636ea7d0259b..2d81a0131766 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 d933d7e009f5..dc8c9dd35bae 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 37a131a32443..2a5c1eb2fc42 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 7d59f7874aa0..c6d440a5d471 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 66173051e8ab..7acc89d6a91c 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 9d9fd8c71caf..8fac71eed4b3 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 c5c06fe93e5c..63add64226d6 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 59220ee3c1ce..591040a95480 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 aac778973be2..3b38db8c1de4 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 e2b223df58b5..3121399b3a90 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 10e9073dcf34..74ec00c58fdd 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 baaa6114ba68..4be1beecafd2 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 a6c534937bab..16f02f877462 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 832cebab1222..2d0f6637171e 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 7594474c0719..deb1090dd4ab 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 fcc9dcc3ecc8..0f3956dfe6e6 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 93f151dcabfb..77670b4f117e 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 57baeee387c5..d2bd35eebd41 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 d13768d5e220..083f269255a0 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 5cfea69b266d..9849d4fab0e5 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 0b63bed127fa..e8abded24381 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 44bb4f411a27..dc030f68059a 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 a8186f517eab..98032d91c8e4 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 7ad6a04c01ce..a1caaef1bc9e 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 a62b52242f79..3a12faf07c9e 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 2875861676ad..27aaad02b357 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 3c369103486a..605339d0811f 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 33527b9affd4..3a72cb8fba0b 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 c5a374eb2d0c..05e13b4a7b33 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 2078c317123f..66196c806acc 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 a1192955540b..b586a6336bca 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 bc6b7b2537ff..9c85223d654b 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 d123a4db7329..48bd32b7c897 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 126ab9b1f087..072e5d8bc1cc 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 d550e4725908..66c1f645267a 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 b21caa38afb3..89bdab65b17d 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 f8f2ca510499..fe40fb785c9a 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 62dc82b10685..ab162988c958 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 ba0af8456856..c93a507e28ba 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 8f9a9ed1a71a..fff50366233b 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 8fac7f9e2b87..b0e720ff4879 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 6719fa20a934..adf11916b90d 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 3506ca89f15a..b395645557b5 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 bb4b686c4566..e69bc2a51275 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 ee68874cbfcd..0ebfeb92bf10 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 ef919fc17210..ff514a9a599b 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 27f700932eb5..8b32b48af873 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 09b0f9e2a16f..b118ce951b0e 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 157eaeaaa2c4..d194b1970c8d 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 030cbe13b0a0..20d414ac6b14 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 5d8a155ea721..3b4f9f8ff326 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 53ebf3709d82..38290c8cd544 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 0995ec4d0c42..5ff1da422efa 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 97d829119082..f69be8ae99e2 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 bb67c04489cb..b283c496a299 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 e6c118ff3e1f..f799194c0f69 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 60f81e7f9846..28f109e8c364 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 5ec59a9690f3..6a917af1fe7a 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 f4355c0a9549..f13b9f7b1d48 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 2835605529e0..bba9e1a13fe4 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 4d1166db2501..abeed295e035 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 3f6c85f1cd6e..c1fa7d78d0a9 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/http_parser/build-shared.patch b/pkgs/development/libraries/http_parser/build-shared.patch new file mode 100644 index 000000000000..5922cdfb5848 --- /dev/null +++ b/pkgs/development/libraries/http_parser/build-shared.patch @@ -0,0 +1,30 @@ +diff -Naur http-parser-2.1-orig/http_parser.gyp http-parser-2.1/http_parser.gyp +--- http-parser-2.1-orig/http_parser.gyp 2013-03-26 18:35:20.000000000 -0400 ++++ http-parser-2.1/http_parser.gyp 2013-05-23 16:47:49.280488341 -0400 +@@ -21,7 +21,7 @@ + }, + 'Release': { + 'defines': [ 'NDEBUG' ], +- 'cflags': [ '-Wall', '-Wextra', '-O3' ], ++ 'cflags': [ '-Wall', '-Wextra', '-O3', '-fPIC' ], + 'msvs_settings': { + 'VCCLCompilerTool': { + 'RuntimeLibrary': 0, # static release +@@ -50,7 +50,7 @@ + 'targets': [ + { + 'target_name': 'http_parser', +- 'type': 'static_library', ++ 'type': 'shared_library', + 'include_dirs': [ '.' ], + 'direct_dependent_settings': { + 'defines': [ 'HTTP_PARSER_STRICT=0' ], +@@ -73,7 +73,7 @@ + + { + 'target_name': 'http_parser_strict', +- 'type': 'static_library', ++ 'type': 'shared_library', + 'include_dirs': [ '.' ], + 'direct_dependent_settings': { + 'defines': [ 'HTTP_PARSER_STRICT=1' ], diff --git a/pkgs/development/libraries/http_parser/default.nix b/pkgs/development/libraries/http_parser/default.nix new file mode 100644 index 000000000000..09371e4efb87 --- /dev/null +++ b/pkgs/development/libraries/http_parser/default.nix @@ -0,0 +1,50 @@ +{ stdenv, fetchurl, gyp, utillinux, python }: + +let + version = "2.1"; +in stdenv.mkDerivation { + name = "http-parser-${version}"; + + src = fetchurl { + url = "https://github.com/joyent/http-parser/archive/v${version}.tar.gz"; + sha256 = "16a2w5z4g2bma25fqcrkpidqzlq8a2jxkk93ajl721q85406j105"; + }; + + patches = [ ./build-shared.patch ]; + + configurePhase = "gyp -f make --depth=`pwd` http_parser.gyp"; + + buildFlags = [ "BUILDTYPE=Release" ]; + + buildInputs = [ gyp ] ++ (stdenv.lib.optional stdenv.isLinux utillinux) ++ stdenv.lib.optional stdenv.isDarwin python; + + doCheck = !stdenv.isDarwin; + + checkPhase = '' + out/Release/test-nonstrict + out/Release/test-strict + ''; + + installPhase = '' + mkdir -p $out/lib + mv out/Release/${if stdenv.isDarwin then "*.dylib" else "lib.target/*"} $out/lib + + mkdir -p $out/include + mv http_parser.h $out/include + ''; + + postFixup = if stdenv.isDarwin then '' + install_name_tool -id $out/lib/libhttp_parser.dylib $out/lib/libhttp_parser.dylib + install_name_tool -id $out/lib/libhttp_parser_strict.dylib $out/lib/libhttp_parser_strict.dylib + '' else null; + + meta = { + description = "An HTTP message parser written in C"; + + homepage = https://github.com/joyent/http-parser; + + license = stdenv.lib.licenses.mit; + + maintainer = [ stdenv.lib.maintainers.shlevy ]; + }; +} diff --git a/pkgs/development/libraries/jansson/default.nix b/pkgs/development/libraries/jansson/default.nix new file mode 100644 index 000000000000..a1f9983abe2c --- /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/ldns/default.nix b/pkgs/development/libraries/ldns/default.nix index a357fccca16f..8479551d28d0 100644 --- a/pkgs/development/libraries/ldns/default.nix +++ b/pkgs/development/libraries/ldns/default.nix @@ -1,10 +1,11 @@ {stdenv, fetchurl, openssl, perl}: -stdenv.mkDerivation { - name = "ldns-1.6.11"; +stdenv.mkDerivation rec { + name = "ldns-1.6.16"; + src = fetchurl { - url = "http://www.nlnetlabs.nl/downloads/ldns/ldns-1.6.11.tar.gz"; - sha256 = "1248c9gkgfmjdmpp3lfd56vvln94ii54kbxa5iykxvcxivmbi4b8"; + url = "http://www.nlnetlabs.nl/downloads/ldns/${name}.tar.gz"; + sha256 = "15gn9m95r6sq2n55dw4r87p2aljb5lvy1w0y0br70wbr0p5zkci4"; }; patchPhase = '' @@ -13,7 +14,7 @@ stdenv.mkDerivation { buildInputs = [ openssl perl ]; - configureFlags = [ "--with-ssl=${openssl}" ]; + configureFlags = [ "--with-ssl=${openssl}" "--with-drill" ]; meta = { description = "Library with the aim of simplifying DNS programming in C"; diff --git a/pkgs/development/libraries/leveldb/default.nix b/pkgs/development/libraries/leveldb/default.nix new file mode 100644 index 000000000000..12846dfbe8b5 --- /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 64d769fab75b..851601fe9639 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 4b233437adbf..8443ddaa6062 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 b57ea63fde75..710f6bd87009 100644 --- a/pkgs/development/libraries/libcanberra/default.nix +++ b/pkgs/development/libraries/libcanberra/default.nix @@ -14,6 +14,10 @@ stdenv.mkDerivation rec { configureFlags = "--disable-oss"; + passthru = { + gtkModule = "/lib/gtk-2.0/"; + }; + meta = { description = "An implementation of the XDG Sound Theme and Name Specifications"; diff --git a/pkgs/development/libraries/libcello/default.nix b/pkgs/development/libraries/libcello/default.nix new file mode 100644 index 000000000000..4a7bc56568e2 --- /dev/null +++ b/pkgs/development/libraries/libcello/default.nix @@ -0,0 +1,16 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation rec { + name = "libcello-0.9.2"; + + src = fetchurl { + url = "http://libcello.org/static/${name}.tar.gz"; + sha256 = "cd82639cb9b133119fd89a77a5a505a55ea5fcc8decfc53bee0725358ec8bad0"; + }; + + meta = { + homepage = "http://libcello.org/"; + description = "Higher level programming in C"; + license = "BSD"; + }; +} diff --git a/pkgs/development/libraries/libdbusmenu-qt/default.nix b/pkgs/development/libraries/libdbusmenu-qt/default.nix index 6fa6ca4b6f81..d49f4cc6a722 100644 --- a/pkgs/development/libraries/libdbusmenu-qt/default.nix +++ b/pkgs/development/libraries/libdbusmenu-qt/default.nix @@ -2,7 +2,7 @@ let baseName = "libdbusmenu-qt"; - v = "0.9.0"; + v = "0.9.2"; homepage = "http://launchpad.net/${baseName}"; name = "${baseName}-${v}"; in @@ -12,7 +12,7 @@ stdenv.mkDerivation { src = fetchurl { url = "${homepage}/trunk/${v}/+download/${name}.tar.bz2"; - sha256 = "0xdicb3fmwgbyhc6cpcmdkwysdg18m5rcqc3izpwv6brq4aq4787"; + sha256 = "1v0ri5g9xw2z64ik0kx0ra01v8rpjn2kxprrxppkls1wvav1qv5f"; }; buildInputs = [ qt4 ]; diff --git a/pkgs/development/libraries/libftdi/default.nix b/pkgs/development/libraries/libftdi/default.nix index 6805434dcecf..ef7a67b7fcd4 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/git.nix b/pkgs/development/libraries/libgcrypt/git.nix new file mode 100644 index 000000000000..bf917464343e --- /dev/null +++ b/pkgs/development/libraries/libgcrypt/git.nix @@ -0,0 +1,48 @@ +{ fetchgit, stdenv, libgpgerror, autoconf, automake, libtool, transfig, ghostscript, texinfo }: + +stdenv.mkDerivation rec { + name = "libgcrypt-git-20130524"; + + src = fetchgit { + url = git://git.gnupg.org/libgcrypt.git; + rev = "99b18aa53"; + sha256 = "1rhbpxqrkfszlv8jvw8s4apwklal07k8zxv5q555l7binc1j1j3z"; + }; + + nativeBuildInputs = [ autoconf automake libtool transfig ghostscript texinfo ]; + + propagatedBuildInputs = [ libgpgerror ]; + + preConfigure = '' + sh autogen.sh + ''; + + preBuild = '' + (cd doc; make stamp-vti) + ''; + + doCheck = true; + + # For some reason the tests don't find `libgpg-error.so'. + checkPhase = '' + LD_LIBRARY_PATH="${libgpgerror}/lib:$LD_LIBRARY_PATH" \ + make check + ''; + + meta = { + description = "GNU Libgcrypt, a general-pupose cryptographic library"; + + longDescription = '' + GNU Libgcrypt is a general purpose cryptographic library based on + the code from GnuPG. It provides functions for all + cryptographic building blocks: symmetric ciphers, hash + algorithms, MACs, public key algorithms, large integer + functions, random numbers and a lot of supporting functions. + ''; + + license = "LGPLv2+"; + + homepage = https://www.gnu.org/software/libgcrypt/; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/libraries/libgphoto2/2.4.nix b/pkgs/development/libraries/libgphoto2/2.4.nix new file mode 100644 index 000000000000..3edc8d0ac6ca --- /dev/null +++ b/pkgs/development/libraries/libgphoto2/2.4.nix @@ -0,0 +1,30 @@ +{stdenv, fetchurl, pkgconfig, libusb, libtool, libexif, libjpeg, gettext}: + +stdenv.mkDerivation rec { + name = "libgphoto2-2.4.14"; + + src = fetchurl { + url = "mirror://sourceforge/gphoto/${name}.tar.bz2"; + sha256 = "14h20s0kwqr1nsj90dgjwzs0r3h7z1cpmnivrikd0rrg4m2jvcsr"; + }; + + nativeBuildInputs = [ pkgconfig gettext ]; + buildInputs = [ libtool libjpeg ]; + + # These are mentioned in the Requires line of libgphoto's pkg-config file. + propagatedBuildInputs = [ libusb libexif ]; + + meta = { + homepage = http://www.gphoto.org/proj/libgphoto2/; + description = "A library for accessing digital cameras"; + longDescription = '' + This is the library backend for gphoto2. It contains the code for PTP, + MTP, and other vendor specific protocols for controlling and transferring data + from digital cameras. + ''; + # XXX: the homepage claims LGPL, but several src files are lgpl21Plus + license = stdenv.lib.licenses.lgpl21Plus; + platforms = with stdenv.lib.platforms; unix; + maintainers = with stdenv.lib.maintainers; [ jcumming ]; + }; +} diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix index 4a45804789b8..3edc8d0ac6ca 100644 --- a/pkgs/development/libraries/libgphoto2/default.nix +++ b/pkgs/development/libraries/libgphoto2/default.nix @@ -1,20 +1,18 @@ -{ stdenv, fetchurl, pkgconfig, libusb1, libtool, libexif, libjpeg, gettext, libxml2 }: +{stdenv, fetchurl, pkgconfig, libusb, libtool, libexif, libjpeg, gettext}: stdenv.mkDerivation rec { - name = "libgphoto2-2.5.2"; + name = "libgphoto2-2.4.14"; src = fetchurl { url = "mirror://sourceforge/gphoto/${name}.tar.bz2"; - sha256 = "0f1818l1vs5fbmrihzyv3qasddbqi3r01jik5crrxddwalsi2bd3"; + sha256 = "14h20s0kwqr1nsj90dgjwzs0r3h7z1cpmnivrikd0rrg4m2jvcsr"; }; - + nativeBuildInputs = [ pkgconfig gettext ]; - buildInputs = [ libtool libjpeg libxml2 ]; + buildInputs = [ libtool libjpeg ]; # These are mentioned in the Requires line of libgphoto's pkg-config file. - propagatedBuildInputs = [ libusb1 libexif ]; - - NIX_CFLAGS_COMPILE = "-I${libxml2}/include/libxml2"; # bogus detection again + propagatedBuildInputs = [ libusb libexif ]; meta = { homepage = http://www.gphoto.org/proj/libgphoto2/; @@ -22,10 +20,10 @@ stdenv.mkDerivation rec { longDescription = '' This is the library backend for gphoto2. It contains the code for PTP, MTP, and other vendor specific protocols for controlling and transferring data - from digital cameras. + from digital cameras. ''; # XXX: the homepage claims LGPL, but several src files are lgpl21Plus - license = stdenv.lib.licenses.lgpl21Plus; + license = stdenv.lib.licenses.lgpl21Plus; platforms = with stdenv.lib.platforms; unix; maintainers = with stdenv.lib.maintainers; [ jcumming ]; }; diff --git a/pkgs/development/libraries/libp11/default.nix b/pkgs/development/libraries/libp11/default.nix index acfca9bf8885..4f1bd7de3d95 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/libpcap/default.nix b/pkgs/development/libraries/libpcap/default.nix index 73a7cd2e4bb5..87e2a6416547 100644 --- a/pkgs/development/libraries/libpcap/default.nix +++ b/pkgs/development/libraries/libpcap/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, flex, bison }: stdenv.mkDerivation rec { - name = "libpcap-1.2.1"; + name = "libpcap-1.4.0"; src = fetchurl { url = "http://www.tcpdump.org/release/${name}.tar.gz"; - sha256 = "1gfy00zv6blplw3405q46khmjhdnp6ylblvygjjjk5skgvpscdd1"; + sha256 = "01klphfqxvkyjvic0hmc10qmiicqz6pv6kvb9s00kaz8f57jlskw"; }; nativeBuildInputs = [ flex bison ]; diff --git a/pkgs/development/libraries/libssh2/default.nix b/pkgs/development/libraries/libssh2/default.nix index a0723d956717..93377429e7ea 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/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix index 291ca560c03d..a7e514a5780f 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/pcl/default.nix b/pkgs/development/libraries/pcl/default.nix new file mode 100644 index 000000000000..1a3484c2ee5e --- /dev/null +++ b/pkgs/development/libraries/pcl/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, cmake, qhull, flann, boost, vtk, eigen, pkgconfig, qt4, libusb1 }: + +stdenv.mkDerivation { + name = "pcl-1.6.0"; + + buildInputs = [ cmake qhull flann boost vtk eigen pkgconfig qt4 libusb1 ]; + + src = fetchurl { + url = mirror://sourceforge/pointclouds/PCL-1.6.0-Source.tar.bz2; + sha256 = "0ip3djcjgynlr9vac6jlcw6kxhg2lm8fc0aqk747a6l0rqvllf1x"; + }; + + enableParallelBuilding = true; + + meta = { + homepage = http://pointclouds.org/; + description = "Open project for 2D/3D image and point cloud processing"; + license = "BSD"; + maintainers = with stdenv.lib.maintainers; [viric]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/development/libraries/pdf2htmlex/default.nix b/pkgs/development/libraries/pdf2htmlex/default.nix new file mode 100644 index 000000000000..597385aa9fa3 --- /dev/null +++ b/pkgs/development/libraries/pdf2htmlex/default.nix @@ -0,0 +1,27 @@ +{stdenv, fetchurl, cmake, poppler, fontforge, unzip, pkgconfig, python}: + +stdenv.mkDerivation rec { + version = "0.8.1"; + name = "pdf2htmlex-${version}"; + + src = fetchurl { + url = "https://github.com/coolwanglu/pdf2htmlEX/archive/v${version}.zip"; + sha256 = "0v8x03vq46ng9s27ryn76lcsjgpxgak6062jnx59lnyz856wvp8a"; + }; + + buildInputs = [ + cmake + unzip + poppler + fontforge + pkgconfig + python + ]; + + meta = with stdenv.lib; { + description = "Convert PDF to HTML without losing text or format. "; + license = licenses.gpl3; + maintainers = [ maintainers.iElectric ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/pdf2htmlex/pdf2xml.patch b/pkgs/development/libraries/pdf2htmlex/pdf2xml.patch new file mode 100644 index 000000000000..596a3aea6749 --- /dev/null +++ b/pkgs/development/libraries/pdf2htmlex/pdf2xml.patch @@ -0,0 +1,48 @@ +diff -rc pdf2xml/pdf2xml/Makefile.linux pdf2xml-new/pdf2xml/Makefile.linux +*** pdf2xml/Makefile.linux 2008-02-07 17:43:10.000000000 +0100 +--- pdf2xml-new/Makefile.linux 2010-08-25 15:41:23.000000000 +0200 +*************** +*** 30,36 **** + + + # Executable name +! PDFTOXMLEXE=pdftoxml.exe + + # Main target + all: pdftoxmlEXE +--- 30,36 ---- + + + # Executable name +! PDFTOXMLEXE=pdftoxml + + # Main target + all: pdftoxmlEXE +diff -rc pdf2xml/pdf2xml/src/pdftoxml.cc pdf2xml-new/pdf2xml/src/pdftoxml.cc +*** pdf2xml/src/pdftoxml.cc 2010-04-26 10:58:01.000000000 +0200 +--- pdf2xml-new/src/pdftoxml.cc 2010-08-25 15:36:15.000000000 +0200 +*************** +*** 11,21 **** + // + //=========================================================================== + + #include +- #include + #include + #include +! #include + #include "parseargs.h" + #include "GString.h" + #include "gmem.h" +--- 11,21 ---- + // + //=========================================================================== + ++ #include + #include + #include + #include +! #include + #include "parseargs.h" + #include "GString.h" + #include "gmem.h" diff --git a/pkgs/development/libraries/php-xcache/default.nix b/pkgs/development/libraries/php-xcache/default.nix index b1d1bde358a8..5f175aa72ff1 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/pkcs11helper/default.nix b/pkgs/development/libraries/pkcs11helper/default.nix new file mode 100644 index 000000000000..5443df89704d --- /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/soprano/default.nix b/pkgs/development/libraries/soprano/default.nix index c5fac00be14d..8ca16ff72c7f 100644 --- a/pkgs/development/libraries/soprano/default.nix +++ b/pkgs/development/libraries/soprano/default.nix @@ -2,11 +2,11 @@ , pkgconfig }: stdenv.mkDerivation rec { - name = "soprano-2.9.0"; + name = "soprano-2.9.2"; src = fetchurl { url = "mirror://sourceforge/soprano/${name}.tar.bz2"; - sha256 = "1sz4d1rqvdhfmbf7afdwdd49ynvjwawhym3qwbld83nydqw274xk"; + sha256 = "105xlng1ka0661gk2ap39rjjy7znp670df0c5569x04vppgd45g1"; }; patches = [ ./find-virtuoso.patch ]; diff --git a/pkgs/development/libraries/strigi/default.nix b/pkgs/development/libraries/strigi/default.nix index 465a5d80ae04..fc8dc123032a 100644 --- a/pkgs/development/libraries/strigi/default.nix +++ b/pkgs/development/libraries/strigi/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "strigi-${version}"; - version = "0.7.5"; + version = "0.7.8"; src = fetchurl { url = "http://www.vandenoever.info/software/strigi/${name}.tar.bz2"; - sha256 = "16qqnlh0dy3r92shzm2q36h5qi3m06pihr4h5cq944hpvqz5w7qi"; + sha256 = "12grxzqwnvbyqw7q1gnz42lypadxmq89vk2qpxczmpmc4nk63r23"; }; includeAllQtDirs = true; diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index 1634be1363ae..25deb9eb3516 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -5,18 +5,22 @@ assert readline != null; let system = stdenv.system; arch = if system == "i686-linux" then "ia32" else if system == "x86_64-linux" || system == "x86_64-darwin" then "x64" else ""; - version = "3.11.10.22"; + version = "3.14.5.9"; in assert arch != ""; -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "v8-${version}"; + src = fetchsvn { url = "http://v8.googlecode.com/svn/tags/${version}"; - sha256 = "1bm3hg4pa17xvs8s895bwklxpaihl3f3vzghdg55s1wd0y4dj96j"; + sha256 = "18qp5qp5xrb6f00w01cklz358yrl54pks963f5rwvwz82d8sfyqr"; + name = "v8-${version}-src"; }; + patches = [ ./fix-GetLocalizedMessage-usage.patch ]; + configurePhase = '' mkdir build/gyp ln -sv ${gyp}/bin/gyp build/gyp/gyp @@ -44,4 +48,9 @@ stdenv.mkDerivation rec { "mv -v out/${arch}.release/lib.target/libv8.so $out/lib"} mv -v include $out/ ''; + + postFixup = if stdenv.isDarwin then '' + install_name_tool -change /usr/local/lib/libv8.dylib $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.gcc.gcc}/lib/libgcc_s.1.dylib $out/bin/d8 + install_name_tool -id $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.gcc.gcc}/lib/libgcc_s.1.dylib $out/lib/libv8.dylib + '' else null; } diff --git a/pkgs/development/libraries/v8/fix-GetLocalizedMessage-usage.patch b/pkgs/development/libraries/v8/fix-GetLocalizedMessage-usage.patch new file mode 100644 index 000000000000..3bc0fff4d509 --- /dev/null +++ b/pkgs/development/libraries/v8/fix-GetLocalizedMessage-usage.patch @@ -0,0 +1,27 @@ +From dbe142c4eda0f15fad9fa85743dd11b81292fa8f Mon Sep 17 00:00:00 2001 +From: Timothy J Fontaine +Date: Thu, 23 May 2013 13:57:59 -0700 +Subject: [PATCH] v8: fix GetLocalizedMessage usage + +As is the backport of the abort on uncaught exception wouldn't compile +because we it was passing in `this` when it was unnecessary. +--- + deps/v8/src/isolate.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/isolate.cc b/src/isolate.cc +index 04a438b..5a5293e 100644 +--- a/src/isolate.cc ++++ b/src/isolate.cc +@@ -1161,7 +1161,7 @@ void Isolate::DoThrow(Object* exception, MessageLocation* location) { + (report_exception || can_be_caught_externally)) { + fatal_exception_depth++; + fprintf(stderr, "%s\n\nFROM\n", +- *MessageHandler::GetLocalizedMessage(this, message_obj)); ++ *MessageHandler::GetLocalizedMessage(message_obj)); + PrintCurrentStackTrace(stderr); + OS::Abort(); + } +-- +1.8.1.6 + diff --git a/pkgs/development/libraries/vtk/default.nix b/pkgs/development/libraries/vtk/default.nix index 9e4816cab0af..e8f42e9f7f5f 100644 --- a/pkgs/development/libraries/vtk/default.nix +++ b/pkgs/development/libraries/vtk/default.nix @@ -16,12 +16,20 @@ stdenv.mkDerivation rec { url = "${meta.homepage}files/release/${majorVersion}/vtk-${version}.tar.gz"; md5 = "a0363f78910f466ba8f1bd5ab5437cb9"; }; + buildInputs = [ cmake mesa libX11 xproto libXt ] ++ optional useQt4 qt4; - cmakeFlags = optional useQt4 + # Shared libraries don't work, because of rpath troubles with the current + # nixpkgs camke approach. It wants to call a binary at build time, just + # built and requiring one of the shared objects. + # At least, we use -fPIC for other packages to be able to use this in shared + # objects. + cmakeFlags = [ "-DCMAKE_C_FLAGS=-fPIC" "-DCMAKE_CXX_FLAGS=-fPIC" ] ++ optional useQt4 [ "-DVTK_USE_QT:BOOL=ON" ]; + enableParallelBuilding = true; + meta = { description = "Open source libraries for 3D computer graphics, image processing and visualization"; homepage = http://www.vtk.org/; diff --git a/pkgs/development/libraries/wildmidi/default.nix b/pkgs/development/libraries/wildmidi/default.nix new file mode 100644 index 000000000000..85e5726f8636 --- /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/x264/default.nix b/pkgs/development/libraries/x264/default.nix index a5e045d27d6d..9f53d36bb63c 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/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix index 0d35e6c3c2a6..24bb1d2d93a0 100644 --- a/pkgs/development/mobile/titaniumenv/build-app.nix +++ b/pkgs/development/mobile/titaniumenv/build-app.nix @@ -1,5 +1,5 @@ {stdenv, androidsdk, titaniumsdk, xcodewrapper}: -{ appId, name, src, target, androidPlatformVersions ? [ "8" ] +{ appId, name, appName ? null, src, target, androidPlatformVersions ? [ "8" ] , release ? false, androidKeyStore ? null, androidKeyAlias ? null, androidKeyStorePassword ? null , iosKeyFile ? null, iosCertificateName ? null, iosCertificate ? null, iosCertificatePassword ? null, iosDistribute ? false }: @@ -14,6 +14,8 @@ let }; deleteKeychain = "security delete-keychain $keychainName"; + + _appName = if appName == null then name else appName; in stdenv.mkDerivation { name = stdenv.lib.replaceChars [" "] [""] name; @@ -28,9 +30,9 @@ stdenv.mkDerivation { ${if target == "android" then if release then - ''${titaniumsdk}/mobilesdk/*/*/android/builder.py distribute "${name}" ${androidsdkComposition}/libexec/android-sdk-* $(pwd) ${appId} ${androidKeyStore} ${androidKeyStorePassword} ${androidKeyAlias} $out'' + ''${titaniumsdk}/mobilesdk/*/*/android/builder.py distribute "${_appName}" ${androidsdkComposition}/libexec/android-sdk-* $(pwd) ${appId} ${androidKeyStore} ${androidKeyStorePassword} ${androidKeyAlias} $out'' else - ''${titaniumsdk}/mobilesdk/*/*/android/builder.py build "${name}" ${androidsdkComposition}/libexec/android-sdk-* $(pwd) ${appId}'' + ''${titaniumsdk}/mobilesdk/*/*/android/builder.py build "${_appName}" ${androidsdkComposition}/libexec/android-sdk-* $(pwd) ${appId}'' else if target == "iphone" then if iosDistribute then '' @@ -53,7 +55,7 @@ stdenv.mkDerivation { cp ${iosKeyFile} "$HOME/Library/MobileDevice/Provisioning Profiles/$provisioningId.mobileprovision" fi - ${titaniumsdk}/mobilesdk/*/*/iphone/builder.py distribute 6.0 $(pwd) ${appId} "${name}" "$provisioningId" "${iosCertificateName}" $out universal "$HOME/Library/Keychains/$keychainName" + ${titaniumsdk}/mobilesdk/*/*/iphone/builder.py distribute 6.0 $(pwd) ${appId} "${_appName}" "$provisioningId" "${iosCertificateName}" $out universal "$HOME/Library/Keychains/$keychainName" # Remove our generated keychain @@ -81,7 +83,7 @@ stdenv.mkDerivation { cp ${iosKeyFile} "$HOME/Library/MobileDevice/Provisioning Profiles/$provisioningId.mobileprovision" fi - ${titaniumsdk}/mobilesdk/*/*/iphone/builder.py adhoc 6.0 $(pwd) ${appId} "${name}" "$provisioningId" "${iosCertificateName}" universal "$HOME/Library/Keychains/$keychainName" + ${titaniumsdk}/mobilesdk/*/*/iphone/builder.py adhoc 6.0 $(pwd) ${appId} "${_appName}" "$provisioningId" "${iosCertificateName}" universal "$HOME/Library/Keychains/$keychainName" # Remove our generated keychain @@ -96,7 +98,7 @@ stdenv.mkDerivation { cp -av * $out cd $out - ${titaniumsdk}/mobilesdk/*/*/iphone/builder.py build 6.0 $(pwd) ${appId} "${name}" universal + ${titaniumsdk}/mobilesdk/*/*/iphone/builder.py build 6.0 $(pwd) ${appId} "${_appName}" universal '' else throw "Target: ${target} is not supported!"} diff --git a/pkgs/development/mobile/titaniumenv/examples/default.nix b/pkgs/development/mobile/titaniumenv/examples/default.nix index 71ed7f618b53..9a5736b37acd 100644 --- a/pkgs/development/mobile/titaniumenv/examples/default.nix +++ b/pkgs/development/mobile/titaniumenv/examples/default.nix @@ -27,12 +27,14 @@ rec { }; simulate_kitchensink_iphone = import ./simulate-kitchensink { + inherit (pkgs_darwin_x86_64) stdenv; inherit (pkgs_darwin_x86_64.titaniumenv) xcodeenv; kitchensink = kitchensink_iphone; device = "iPhone"; }; simulate_kitchensink_ipad = import ./simulate-kitchensink { + inherit (pkgs_darwin_x86_64) stdenv; inherit (pkgs_darwin_x86_64.titaniumenv) xcodeenv; kitchensink = kitchensink_iphone; device = "iPad"; diff --git a/pkgs/development/mobile/titaniumenv/examples/emulate-kitchensink/default.nix b/pkgs/development/mobile/titaniumenv/examples/emulate-kitchensink/default.nix index 5e518df57cfc..5187b0e02387 100644 --- a/pkgs/development/mobile/titaniumenv/examples/emulate-kitchensink/default.nix +++ b/pkgs/development/mobile/titaniumenv/examples/emulate-kitchensink/default.nix @@ -1,7 +1,7 @@ {androidenv, kitchensink}: androidenv.emulateApp { - name = "kitchensink"; + name = "emulate-${kitchensink.name}"; app = kitchensink; platformVersion = "16"; useGoogleAPIs = true; diff --git a/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix b/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix index f557760dca0d..b195bfcae7a2 100644 --- a/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix +++ b/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix @@ -1,7 +1,8 @@ {titaniumenv, fetchgit, target, androidPlatformVersions ? [ "11" ]}: titaniumenv.buildApp { - name = "KitchenSink"; + name = "KitchenSink-${target}"; + appName = "KitchenSink"; appId = "com.appcelerator.kitchensink"; src = fetchgit { url = https://github.com/appcelerator/KitchenSink.git; diff --git a/pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix b/pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix index 70ec534f6ae2..a5ab8d59a743 100644 --- a/pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix +++ b/pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix @@ -1,7 +1,8 @@ -{xcodeenv, kitchensink, device}: +{stdenv, xcodeenv, kitchensink, device}: xcodeenv.simulateApp { - name = "kitchensink"; + name = "simulate-${kitchensink.name}-${stdenv.lib.replaceChars [" " "(" ")"] ["_" "" ""] device}"; + appName = "KitchenSink"; app = kitchensink; inherit device; baseDir = "build/iphone/build/Debug-iphonesimulator"; diff --git a/pkgs/development/mobile/xcodeenv/simulate-app.nix b/pkgs/development/mobile/xcodeenv/simulate-app.nix index e3eff458d272..96f70ea38325 100644 --- a/pkgs/development/mobile/xcodeenv/simulate-app.nix +++ b/pkgs/development/mobile/xcodeenv/simulate-app.nix @@ -1,6 +1,9 @@ {stdenv, xcodewrapper}: -{name, app, device ? "iPhone", baseDir ? ""}: +{name, appName ? null, app, device ? "iPhone", baseDir ? ""}: +let + _appName = if appName == null then name else appName; +in stdenv.mkDerivation { name = stdenv.lib.replaceChars [" "] [""] name; buildCommand = '' @@ -8,8 +11,8 @@ stdenv.mkDerivation { cat > $out/bin/run-test-simulator << "EOF" #! ${stdenv.shell} -e - cd '${app}/${baseDir}/${name}.app' - "$(readlink "${xcodewrapper}/bin/iPhone Simulator")" -SimulateApplication './${name}' -SimulateDevice '${device}' + cd "${app}/${baseDir}/${_appName}.app" + "$(readlink "${xcodewrapper}/bin/iPhone Simulator")" -SimulateApplication './${_appName}' -SimulateDevice '${device}' EOF chmod +x $out/bin/run-test-simulator ''; diff --git a/pkgs/development/python-modules/gyp/no-darwin-cflags.patch b/pkgs/development/python-modules/gyp/no-darwin-cflags.patch new file mode 100644 index 000000000000..d81ea0d1c12a --- /dev/null +++ b/pkgs/development/python-modules/gyp/no-darwin-cflags.patch @@ -0,0 +1,53 @@ +Index: gyp/pylib/gyp/xcode_emulation.py +=================================================================== +--- gyp/pylib/gyp/xcode_emulation.py (revision 1635) ++++ gyp/pylib/gyp/xcode_emulation.py (working copy) +@@ -280,9 +280,6 @@ + if self._Test('GCC_CHAR_IS_UNSIGNED_CHAR', 'YES', default='NO'): + cflags.append('-funsigned-char') + +- if self._Test('GCC_CW_ASM_SYNTAX', 'YES', default='YES'): +- cflags.append('-fasm-blocks') +- + if 'GCC_DYNAMIC_NO_PIC' in self._Settings(): + if self._Settings()['GCC_DYNAMIC_NO_PIC'] == 'YES': + cflags.append('-mdynamic-no-pic') +@@ -292,9 +289,6 @@ + # mdynamic-no-pic by default for executable and possibly static lib + # according to mento + +- if self._Test('GCC_ENABLE_PASCAL_STRINGS', 'YES', default='YES'): +- cflags.append('-mpascal-strings') +- + self._Appendf(cflags, 'GCC_OPTIMIZATION_LEVEL', '-O%s', default='s') + + if self._Test('GCC_GENERATE_DEBUGGING_SYMBOLS', 'YES', default='YES'): +@@ -311,12 +305,6 @@ + if self._Test('GCC_SYMBOLS_PRIVATE_EXTERN', 'YES', default='NO'): + cflags.append('-fvisibility=hidden') + +- if self._Test('GCC_TREAT_WARNINGS_AS_ERRORS', 'YES', default='NO'): +- cflags.append('-Werror') +- +- if self._Test('GCC_WARN_ABOUT_MISSING_NEWLINE', 'YES', default='NO'): +- cflags.append('-Wnewline-eof') +- + self._AppendPlatformVersionMinFlags(cflags) + + # TODO: +@@ -334,7 +322,6 @@ + # TODO: Supporting fat binaries will be annoying. + self._WarnUnimplemented('ARCHS') + archs = ['i386'] +- cflags.append('-arch ' + archs[0]) + + if archs[0] in ('i386', 'x86_64'): + if self._Test('GCC_ENABLE_SSE3_EXTENSIONS', 'YES', default='NO'): +@@ -570,7 +557,6 @@ + # TODO: Supporting fat binaries will be annoying. + self._WarnUnimplemented('ARCHS') + archs = ['i386'] +- ldflags.append('-arch ' + archs[0]) + + # Xcode adds the product directory by default. + ldflags.append('-L' + product_dir) diff --git a/pkgs/development/python-modules/gyp/no-xcode.patch b/pkgs/development/python-modules/gyp/no-xcode.patch new file mode 100644 index 000000000000..951be7b005ac --- /dev/null +++ b/pkgs/development/python-modules/gyp/no-xcode.patch @@ -0,0 +1,66 @@ +Index: pylib/gyp/xcode_emulation.py +diff --git a/pylib/gyp/xcode_emulation.py b/pylib/gyp/xcode_emulation.py +index b2aab986a427d5285d70558bf97f0a42bfe1556e..20592c73fae660009aac621097cf3c4fb61d6cb6 100644 +--- a/pylib/gyp/xcode_emulation.py ++++ b/pylib/gyp/xcode_emulation.py +@@ -236,8 +236,14 @@ class XcodeSettings(object): + if sdk_root.startswith('/'): + return sdk_root + if sdk_root not in XcodeSettings._sdk_path_cache: +- XcodeSettings._sdk_path_cache[sdk_root] = self._GetSdkVersionInfoItem( +- sdk_root, 'Path') ++ try: ++ XcodeSettings._sdk_path_cache[sdk_root] = self._GetSdkVersionInfoItem( ++ sdk_root, 'Path') ++ except: ++ # if this fails it's because xcodebuild failed, which means ++ # the user is probably on a CLT-only system, where there ++ # is no valid SDK root ++ XcodeSettings._sdk_path_cache[sdk_root] = None + return XcodeSettings._sdk_path_cache[sdk_root] + + def _AppendPlatformVersionMinFlags(self, lst): +@@ -340,10 +346,11 @@ class XcodeSettings(object): + + cflags += self._Settings().get('WARNING_CFLAGS', []) + +- config = self.spec['configurations'][self.configname] +- framework_dirs = config.get('mac_framework_dirs', []) +- for directory in framework_dirs: +- cflags.append('-F' + directory.replace('$(SDKROOT)', sdk_root)) ++ if sdk_root: ++ config = self.spec['configurations'][self.configname] ++ framework_dirs = config.get('mac_framework_dirs', []) ++ for directory in framework_dirs: ++ cflags.append('-F' + directory.replace('$(SDKROOT)', sdk_root)) + + self.configname = None + return cflags +@@ -573,10 +580,11 @@ class XcodeSettings(object): + for rpath in self._Settings().get('LD_RUNPATH_SEARCH_PATHS', []): + ldflags.append('-Wl,-rpath,' + rpath) + +- config = self.spec['configurations'][self.configname] +- framework_dirs = config.get('mac_framework_dirs', []) +- for directory in framework_dirs: +- ldflags.append('-F' + directory.replace('$(SDKROOT)', self._SdkPath())) ++ if self._SdkPath(): ++ config = self.spec['configurations'][self.configname] ++ framework_dirs = config.get('mac_framework_dirs', []) ++ for directory in framework_dirs: ++ ldflags.append('-F' + directory.replace('$(SDKROOT)', self._SdkPath())) + + self.configname = None + return ldflags +@@ -701,7 +709,10 @@ class XcodeSettings(object): + l = '-l' + m.group(1) + else: + l = library +- return l.replace('$(SDKROOT)', self._SdkPath()) ++ if self._SdkPath(): ++ return l.replace('$(SDKROOT)', self._SdkPath()) ++ else: ++ return l + + def AdjustLibraries(self, libraries): + """Transforms entries like 'Cocoa.framework' in libraries into entries like diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix new file mode 100644 index 000000000000..b5b8f8408aa5 --- /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 new file mode 100644 index 000000000000..b28c4d9296fa --- /dev/null +++ b/pkgs/development/tools/build-managers/buildbot-slave/default.nix @@ -0,0 +1,66 @@ +{ stdenv, buildPythonPackage, fetchurl, coreutils, twisted }: + +buildPythonPackage (rec { + name = "buildbot-slave-0.8.7p1"; + namePrefix = ""; + + src = fetchurl { + url = "http://buildbot.googlecode.com/files/${name}.tar.gz"; + sha256 = "1p7a0srab6ifljh9vi25awvxfrxljj9s0hi1jipiiykyhjihgnxv"; + }; + + patchPhase = '' + substituteInPlace buildslave/scripts/logwatcher.py --replace /usr/bin/tail ${coreutils}/bin/tail + ''; + + propagatedBuildInputs = [ twisted ]; + + # What's up with this?! 'trial' should be 'test', no? + # + # running tests + # usage: setup.py [global_opts] cmd1 [cmd1_opts] [cmd2 [cmd2_opts] ...] + # or: setup.py --help [cmd1 cmd2 ...] + # or: setup.py --help-commands + # or: setup.py cmd --help + # + # error: invalid command 'trial' + doCheck = false; + + postInstall = '' + mkdir -p "$out/share/man/man1" + cp docs/buildslave.1 "$out/share/man/man1" + ''; + + meta = with stdenv.lib; { + homepage = http://buildbot.net/; + + license = "GPLv2+"; + + description = "Continuous integration system that automates the build/test cycle"; + + longDescription = + '' The BuildBot is a system to automate the compile/test cycle + required by most software projects to validate code changes. By + automatically rebuilding and testing the tree each time something + has changed, build problems are pinpointed quickly, before other + developers are inconvenienced by the failure. The guilty + developer can be identified and harassed without human + intervention. By running the builds on a variety of platforms, + developers who do not have the facilities to test their changes + everywhere before checkin will at least know shortly afterwards + whether they have broken the build or not. Warning counts, lint + checks, image size, compile time, and other build parameters can + be tracked over time, are more visible, and are therefore easier + to improve. + + The overall goal is to reduce tree breakage and provide a platform + to run tests or code-quality checks that are too annoying or + pedantic for any human to waste their time with. Developers get + immediate (and potentially public) feedback about their changes, + 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 71862ec1cf75..8058c8dbd96f 100644 --- a/pkgs/development/tools/build-managers/buildbot/default.nix +++ b/pkgs/development/tools/build-managers/buildbot/default.nix @@ -1,12 +1,20 @@ -{ fetchurl, stdenv, buildPythonPackage, twisted, texinfo }: +{ stdenv, buildPythonPackage, fetchurl, twisted, dateutil, jinja2 +, sqlalchemy , sqlalchemy_migrate +, enableDebugClient ? false, pygobject ? null, pyGtkGlade ? null +}: + +# enableDebugClient enables "buildbot debugclient", a Gtk-based debug control +# panel. Its mostly for developers. + +assert enableDebugClient -> pygobject != null && pyGtkGlade != null; buildPythonPackage (rec { - name = "buildbot-0.7.11p3"; + name = "buildbot-0.8.7p1"; namePrefix = ""; src = fetchurl { - url = "mirror://sourceforge/buildbot/${name}.tar.gz"; - sha256 = "0h77ijf5iqvc8bnfxpsh3hvpr7wj23pkcywd3hcyphv1wwlhmhjv"; + url = "http://buildbot.googlecode.com/files/${name}.tar.gz"; + sha256 = "0xjpk8510fhryl1g4mczz319h62il8hw9rh1rzvsfmffgf43zvld"; }; patchPhase = @@ -19,25 +27,35 @@ buildPythonPackage (rec { done ''; - buildInputs = [ texinfo ]; - propagatedBuildInputs = [ twisted ]; + buildInputs = [ ]; - # FIXME: Some tests fail. + propagatedBuildInputs = + [ twisted dateutil jinja2 sqlalchemy sqlalchemy_migrate + ] ++ stdenv.lib.optional enableDebugClient [ pygobject pyGtkGlade ]; + + # What's up with this?! 'trial' should be 'test', no? + # + # running tests + # usage: setup.py [global_opts] cmd1 [cmd1_opts] [cmd2 [cmd2_opts] ...] + # or: setup.py --help [cmd1 cmd2 ...] + # or: setup.py --help-commands + # or: setup.py cmd --help + # + # error: invalid command 'trial' doCheck = false; - postInstall = - '' mkdir -p "$out/share/info" - make -C docs buildbot.info - cp -v "docs/buildbot.info"* "$out/share/info" - ''; + postInstall = '' + mkdir -p "$out/share/man/man1" + cp docs/buildbot.1 "$out/share/man/man1" + ''; - meta = { + meta = with stdenv.lib; { homepage = http://buildbot.net/; license = "GPLv2+"; # Of course, we don't really need that on NixOS. :-) - description = "BuildBot, a system to automate the software compile/test cycle"; + description = "Continuous integration system that automates the build/test cycle"; longDescription = '' The BuildBot is a system to automate the compile/test cycle @@ -62,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 000000000000..c4a8b83a7cf1 --- /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 f65df4b5ad05..cfda3b66704a 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 a294680607d2..968efe2260b0 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 a618b546f00c..12907a64d214 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 a5a63f6c90aa..95890f5bd43f 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 88c6e045e531..811ffd2855da 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 c9e7b810866a..8a57dd851c2d 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 94758e3eff4a..d39544342b3a 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 cd36d5f58e9c..88f5d0baee67 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 78cb968ff050..17d191064816 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 4487715cdc51..5bb298e739ad 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 c48a6d6a61db..4676850fd938 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 3ec96e3fb2ae..881328d875b6 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 ae7ded65655a..d213c5392a8f 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 f00708bb55f1..a3d885c60084 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 2e158abaf898..c05368c39808 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 d3c373ae4df7..f1e1f639e80d 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 44f95543c850..7b3953b07168 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 efbf48322b34..4443637def47 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 29c78329f957..ea61fd9b6ed4 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 41b77e22b46c..814c2774cb27 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 8bcd07dc2afb..4bd47b8decd4 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 f2b3d9d17cf4..4928c40e1291 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 9025d5d97aa0..62a03cae14ef 100644 --- a/pkgs/development/tools/haskell/timeplot/default.nix +++ b/pkgs/development/tools/haskell/timeplot/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "timeplot"; - version = "1.0.19"; - sha256 = "1mwhrcjavx56z3msdf5zqvqlx5m3hbcw85f22h8p9wvfgn79aydx"; + version = "1.0.20"; + sha256 = "0zlpqfd1l1ss9jjjb967a7jnn1h560ygv8zfiikcx6iagsjmysh2"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -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 749fbb6978d9..d24d22f350ad 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 6de37716579b..ea981ad423b0 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 0cf3904f6d4f..69c956ef1de5 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/misc/cpphs/default.nix b/pkgs/development/tools/misc/cpphs/default.nix index 3406c708851e..2e419f67eb05 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/openocd/default.nix b/pkgs/development/tools/misc/openocd/default.nix index 5c0b1a3b101e..c87bd9d55354 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 07896dd100f6..8dce23aa9593 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 fe7b0ba31503..675f8f7f2af6 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 000000000000..43ff8df70d27 --- /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 25f66e9cd7ea..85d2c7a47934 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 f1964e815f67..82d998c2fcbc 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 92db61e08a20..7dc17cd4153a 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 2ec395d463f2..5d10dbd69951 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 920c5fd9cc28..bbe413d478ff 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 3635b2487877..3fb843e69557 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 a32de50e61eb..cdcaead86356 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 85087bfc9a47..9011db12c7dd 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 52c4775267c2..d342d3381c82 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 cc5c60a3d43b..401c4d1475ce 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 41532651c995..d64d8983e9cb 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 60b8d253659e..fdc483fe5714 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 b1ba0b165dd7..decc992809a2 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 cb47eaa8bdb2..b1f752ae35f5 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/development/web/nodejs/build-node-package.nix b/pkgs/development/web/nodejs/build-node-package.nix index e90e9446846c..5c75513496bd 100644 --- a/pkgs/development/web/nodejs/build-node-package.nix +++ b/pkgs/development/web/nodejs/build-node-package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation ({ buildPhase = '' runHook preBuild - ${nodejs}/bin/npm --registry http://www.example.com --nodedir=${sources} install ${src} ${npmFlags} + npm --registry http://www.example.com --nodedir=${sources} install ${src} ${npmFlags} runHook postBuild ''; @@ -47,4 +47,10 @@ stdenv.mkDerivation ({ preFixup = '' find $out -type f -print0 | xargs -0 sed -i 's|${src}|${src.name}|g' ''; -} // args) +} // args // { + # Run the node setup hook when this package is a build input + propagatedNativeBuildInputs = (args.propagatedNativeBuildInputs or []) ++ [ nodejs ]; + + # Make buildNodePackage useful with --run-env + nativeBuildInputs = (args.nativeBuildInputs or []) ++ deps; +} ) diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix index f9c3d9d27d3e..064284da1f5b 100644 --- a/pkgs/development/web/nodejs/default.nix +++ b/pkgs/development/web/nodejs/default.nix @@ -1,54 +1,57 @@ -{ stdenv, fetchurl, openssl, python, zlib, v8, utillinux }: +{ stdenv, fetchurl, openssl, python, zlib, v8, utillinux, http_parser, c-ares, pkgconfig, runCommand }: -stdenv.mkDerivation rec { - version = "0.8.23"; +let + dtrace = runCommand "dtrace-native" {} '' + mkdir -p $out/bin + ln -sv /usr/sbin/dtrace $out/bin + ''; + + version = "0.10.8"; + + # !!! Should we also do shared libuv? + deps = { + inherit v8 openssl zlib; + cares = c-ares; + http-parser = http_parser; + }; + + sharedConfigureFlags = name: [ + "--shared-${name}" + "--shared-${name}-includes=${builtins.getAttr name deps}/include" + "--shared-${name}-libpath=${builtins.getAttr name deps}/lib" + ]; + + inherit (stdenv.lib) concatMap optional optionals maintainers licenses platforms; +in stdenv.mkDerivation { name = "nodejs-${version}"; src = fetchurl { url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz"; - sha256 = "17gdvv0q95v5dn9mbwrm3pxcchfgmlwa7pamwsam9hpdi9ik491q"; + sha256 = "0m43y7ipd6d89dl97nvrwkx1zss3fdb9835509dyziycr1kggxpd"; }; - configureFlags = [ - "--openssl-includes=${openssl}/include" - "--openssl-libpath=${openssl}/lib" - ] - ++ (if !stdenv.isDarwin then [ # Shared V8 is broken on Mac OS X. Who can fix V8 on Darwin makes me very happy, but I gave up studying python-gyp. - "--shared-v8" - "--shared-v8-includes=${v8}/includes" - "--shared-v8-libpath=${v8}/lib" - ] else []); - - #patches = stdenv.lib.optional stdenv.isDarwin ./no-arch-flag.patch; - - # Expose the host compiler on darwin, which is the only compiler capable of building it - preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' - export OLDPATH=$PATH - export PATH=/usr/bin:$PATH - ''; + configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps); prePatch = '' - sed -e 's|^#!/usr/bin/env python$|#!${python}/bin/python|g' -i tools/{*.py,waf-light,node-waf} configure + sed -e 's|^#!/usr/bin/env python$|#!${python}/bin/python|g' -i configure ''; - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' - export PATH=$OLDPATH - '' + '' - sed -e 's|^#!/usr/bin/env node$|#!'$out'/bin/node|' -i $out/lib/node_modules/npm/bin/npm-cli.js - '' /*+ stdenv.lib.optionalString stdenv.isDarwin '' - install_name_tool -change libv8.dylib ${v8}/lib/libv8.dylib $out/bin/node - ''*/; + patches = if stdenv.isDarwin then [ ./no-xcode.patch ] else null; - buildInputs = [ python openssl zlib ] - ++ stdenv.lib.optional stdenv.isLinux utillinux - ++ stdenv.lib.optional (!stdenv.isDarwin) v8; + postPatch = if stdenv.isDarwin then '' + (cd tools/gyp; patch -Np1 -i ${../../python-modules/gyp/no-darwin-cflags.patch}) + '' else null; + + buildInputs = [ python ] + ++ (optional stdenv.isLinux utillinux) + ++ optionals stdenv.isDarwin [ pkgconfig openssl dtrace ]; setupHook = ./setup-hook.sh; - meta = with stdenv.lib; { + meta = { description = "Event-driven I/O framework for the V8 JavaScript engine"; homepage = http://nodejs.org; license = licenses.mit; - maintainers = [ maintainers.goibhniu ]; + maintainers = [ maintainers.goibhniu maintainers.shlevy ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/web/nodejs/no-arch-flag.patch b/pkgs/development/web/nodejs/no-arch-flag.patch deleted file mode 100644 index bbe96c0c5527..000000000000 --- a/pkgs/development/web/nodejs/no-arch-flag.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Naur node-v0.6.10-orig/wscript node-v0.6.10/wscript ---- node-v0.6.10-orig/wscript 2012-02-02 19:56:42.000000000 -0500 -+++ node-v0.6.10/wscript 2012-02-25 14:18:50.000000000 -0500 -@@ -443,17 +443,6 @@ - if sys.platform.startswith("darwin"): - # used by platform_darwin_*.cc - conf.env.append_value('LINKFLAGS', ['-framework','Carbon']) -- # cross compile for architecture specified by DEST_CPU -- if 'DEST_CPU' in conf.env: -- arch = conf.env['DEST_CPU'] -- # map supported_archs to GCC names: -- arch_mappings = {'ia32': 'i386', 'x64': 'x86_64'} -- if arch in arch_mappings: -- arch = arch_mappings[arch] -- flags = ['-arch', arch] -- conf.env.append_value('CCFLAGS', flags) -- conf.env.append_value('CXXFLAGS', flags) -- conf.env.append_value('LINKFLAGS', flags) - if 'DEST_CPU' in conf.env: - arch = conf.env['DEST_CPU'] - # TODO: -m32 is only available on 64 bit machines, so check host type diff --git a/pkgs/development/web/nodejs/no-xcode.patch b/pkgs/development/web/nodejs/no-xcode.patch new file mode 100644 index 000000000000..47a37bfaf3ca --- /dev/null +++ b/pkgs/development/web/nodejs/no-xcode.patch @@ -0,0 +1,78 @@ +diff --git a/tools/gyp/pylib/gyp/xcode_emulation.py b/tools/gyp/pylib/gyp/xcode_emulation.py +index 806f92b..5256856 100644 +--- a/tools/gyp/pylib/gyp/xcode_emulation.py ++++ b/tools/gyp/pylib/gyp/xcode_emulation.py +@@ -224,8 +224,7 @@ class XcodeSettings(object): + + def _GetSdkVersionInfoItem(self, sdk, infoitem): + job = subprocess.Popen(['xcodebuild', '-version', '-sdk', sdk, infoitem], +- stdout=subprocess.PIPE, +- stderr=subprocess.STDOUT) ++ stdout=subprocess.PIPE) + out = job.communicate()[0] + if job.returncode != 0: + sys.stderr.write(out + '\n') +@@ -234,9 +233,17 @@ class XcodeSettings(object): + + def _SdkPath(self): + sdk_root = self.GetPerTargetSetting('SDKROOT', default='macosx') ++ if sdk_root.startswith('/'): ++ return sdk_root + if sdk_root not in XcodeSettings._sdk_path_cache: +- XcodeSettings._sdk_path_cache[sdk_root] = self._GetSdkVersionInfoItem( +- sdk_root, 'Path') ++ try: ++ XcodeSettings._sdk_path_cache[sdk_root] = self._GetSdkVersionInfoItem( ++ sdk_root, 'Path') ++ except: ++ # if this fails it's because xcodebuild failed, which means ++ # the user is probably on a CLT-only system, where there ++ # is no valid SDK root ++ XcodeSettings._sdk_path_cache[sdk_root] = None + return XcodeSettings._sdk_path_cache[sdk_root] + + def _AppendPlatformVersionMinFlags(self, lst): +@@ -339,10 +346,11 @@ class XcodeSettings(object): + + cflags += self._Settings().get('WARNING_CFLAGS', []) + +- config = self.spec['configurations'][self.configname] +- framework_dirs = config.get('mac_framework_dirs', []) +- for directory in framework_dirs: +- cflags.append('-F' + directory.replace('$(SDKROOT)', sdk_root)) ++ if 'SDKROOT' in self._Settings(): ++ config = self.spec['configurations'][self.configname] ++ framework_dirs = config.get('mac_framework_dirs', []) ++ for directory in framework_dirs: ++ cflags.append('-F' + directory.replace('$(SDKROOT)', sdk_root)) + + self.configname = None + return cflags +@@ -572,10 +580,11 @@ class XcodeSettings(object): + for rpath in self._Settings().get('LD_RUNPATH_SEARCH_PATHS', []): + ldflags.append('-Wl,-rpath,' + rpath) + +- config = self.spec['configurations'][self.configname] +- framework_dirs = config.get('mac_framework_dirs', []) +- for directory in framework_dirs: +- ldflags.append('-F' + directory.replace('$(SDKROOT)', self._SdkPath())) ++ if 'SDKROOT' in self._Settings(): ++ config = self.spec['configurations'][self.configname] ++ framework_dirs = config.get('mac_framework_dirs', []) ++ for directory in framework_dirs: ++ ldflags.append('-F' + directory.replace('$(SDKROOT)', self._SdkPath())) + + self.configname = None + return ldflags +@@ -700,7 +709,10 @@ class XcodeSettings(object): + l = '-l' + m.group(1) + else: + l = library +- return l.replace('$(SDKROOT)', self._SdkPath()) ++ if self._SdkPath(): ++ return l.replace('$(SDKROOT)', self._SdkPath()) ++ else: ++ return l + + def AdjustLibraries(self, libraries): + """Transforms entries like 'Cocoa.framework' in libraries into entries like diff --git a/pkgs/games/LambdaHack/default.nix b/pkgs/games/LambdaHack/default.nix index 5e6596d19ddf..48c4809e5cd9 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 92c7a17d7d96..0e2abf6d7c77 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/uqm/3dovideo.nix b/pkgs/games/uqm/3dovideo.nix new file mode 100644 index 000000000000..4aab9aed42c3 --- /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 a9fe9d596c78..1f82c75f9cf0 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 a35b44e9f6ee..bfa61169efb1 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 6d026efa005a..e861203fb159 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,8 +27,8 @@ ludo = "Ludovic Courtès "; marcweber = "Marc Weber "; mornfall = "Petr Ročkai "; - the-kenny = "Moritz Ulrich "; neznalek = "Vladimír Čunát "; + offline = "Jaka Hudoklin "; orbitz = "Malcolm Matalka "; page = "Carles Pagès "; phreedom = "Evgeny Egorochkin "; @@ -43,6 +44,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 32390b0d192f..19e5081009de 100644 --- a/pkgs/lib/misc.nix +++ b/pkgs/lib/misc.nix @@ -317,6 +317,45 @@ 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: + # + # {version ? "2.x"} : + # + # mkDerivation (mergeAttrsByVersion "package-name" version + # { # version specific settings + # "git" = { src = ..; preConfigre = "autogen.sh"; buildInputs = [automake autoconf libtool]; }; + # "2.x" = { src = ..; }; + # } + # { // shared settings + # buildInputs = [ common build inputs ]; + # meta = { .. } + # } + # ) + # + # Please note that e.g. Eelco Dolstra usually prefers having one file for + # each version. On the other hand there are valuable additional design goals + # - readability + # - do it once only + # - try to avoid duplication + # + # Marc Weber and Michael Raskin sometimes prefer keeping older + # versions around for testing and regression tests - as long as its cheap to + # do so. + # + # Very often it just happens that the "shared" code is the bigger part. + # Then using this function might be appropriate. + # + # Be aware that its easy to cause recompilations in all versions when using + # this function - also if derivations get too complex splitting into multiple + # files is the way to go. + # + # See misc.nix -> versionedDerivation + # discussion: nixpkgs: pull/310 + mergeAttrsByVersion = name: version: attrsByVersion: base: + mergeAttrsByFuncDefaultsClean [ { name = "${name}-${version}"; } base (maybeAttr version (throw "bad version ${version} for ${name}") attrsByVersion)]; + # 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) diff --git a/pkgs/misc/lilypond/default.nix b/pkgs/misc/lilypond/default.nix index 65575af4c392..6d5d87faad6e 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/misc.nix b/pkgs/misc/misc.nix index df4a0ce81023..87be974ca969 100644 --- a/pkgs/misc/misc.nix +++ b/pkgs/misc/misc.nix @@ -6,6 +6,10 @@ in { + # description see mergeAttrsByVersion in lib/misc.nix + versionedDerivation = name: version: attrsByVersion: base: + pkgs.stdenv.mkDerivation (stdenv.lib.mergeAttrsByVersion name version attrsByVersion base); + /* Usage example creating a derivation installing ruby, sup and a lib: diff --git a/pkgs/misc/my-env/default.nix b/pkgs/misc/my-env/default.nix index e89a8ebb230d..ac2dc7f8cda5 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/os-specific/linux/apparmor/capability.patch b/pkgs/os-specific/linux/apparmor/capability.patch new file mode 100644 index 000000000000..c8f2b511d957 --- /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 8a7d2b9e4581..da71eb8c7095 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/batman-adv/batctl.nix b/pkgs/os-specific/linux/batman-adv/batctl.nix new file mode 100644 index 000000000000..2ff9d214bbb4 --- /dev/null +++ b/pkgs/os-specific/linux/batman-adv/batctl.nix @@ -0,0 +1,25 @@ +{stdenv, fetchurl}: + +let + ver = "2013.2.0"; +in +stdenv.mkDerivation rec { + name = "batctl-${ver}"; + + src = fetchurl { + url = "http://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz"; + sha1 = "0ba6520c813c9dd2e59e6205e8ea2e60a0c85f52"; + }; + + preBuild = '' + makeFlags=PREFIX=$out + ''; + + meta = { + homepage = http://www.open-mesh.org/projects/batman-adv/wiki/Wiki; + description = "B.A.T.M.A.N. routing protocol in a linux kernel module for layer 2, control tool"; + license = "GPLv2"; + maintainers = with stdenv.lib.maintainers; [viric]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/os-specific/linux/batman-adv/default.nix b/pkgs/os-specific/linux/batman-adv/default.nix new file mode 100644 index 000000000000..693f00677016 --- /dev/null +++ b/pkgs/os-specific/linux/batman-adv/default.nix @@ -0,0 +1,24 @@ +{stdenv, fetchurl, kernelDev }: + +stdenv.mkDerivation rec { + name = "batman-adv-2013.2.0"; + + src = fetchurl { + url = "http://downloads.open-mesh.org/batman/releases/${name}/${name}.tar.gz"; + sha1 = "7d2aff2ad118cbc5452de43f7e9da8374521ec0e"; + }; + + preBuild = '' + makeFlags="KERNELPATH=${kernelDev}/lib/modules/${kernelDev.modDirVersion}/build" + sed -i -e "s,INSTALL_MOD_DIR=,INSTALL_MOD_PATH=$out INSTALL_MOD_DIR=," \ + -e /depmod/d Makefile + ''; + + meta = { + homepage = http://www.open-mesh.org/projects/batman-adv/wiki/Wiki; + description = "B.A.T.M.A.N. routing protocol in a linux kernel module for layer 2"; + license = "GPLv2"; + maintainers = with stdenv.lib.maintainers; [viric]; + platforms = with stdenv.lib.platforms; linux; + }; +} 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 f6173fcf5f53..8567dadec50d 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,8 @@ 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; + platforms = stdenv.lib.platforms.linux; 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 42c89217ba38..1f9bffae6d29 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.75"; + 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 = "08b4ibyxihsy36n0grg08iywxi23f29s15l3h0sa1dssxxhr1kf9"; + 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 ef62fae3f528..b3c478c5086a 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 0bfb4cc8482b..aba9ded03664 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.42"; + 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 = "189rpb5jd073x0fhkh1yqmgg759lpmdj0ldysq57sibs4prb0km2"; + 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 ac49774b8185..8f77334901dd 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 1f39fac8ec94..6681438edd59 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 b4873b099eae..cd5156c3e50d 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 b425f2792b4b..cf88544abd5a 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 0c5109c9834a..73146d8b67d2 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 000000000000..4ca8235f3aea --- /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 000000000000..48250141e82a --- /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 7c8b526b4c37..cc0382b58f4e 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 000000000000..8b0b9289327a --- /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 c0ba9d885543..c1e60a79082a 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 660676865b07..809ae316516c 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 eae62c9e1973..db6f04674a08 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.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/sysklogd/systemd.patch b/pkgs/os-specific/linux/sysklogd/systemd.patch index ecdf2b57ebf2..0a7fb166bd75 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/sysvinit/default.nix b/pkgs/os-specific/linux/sysvinit/default.nix index 99aebd11667c..7b4ecbb027e1 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/servers/dict/dictd-wiktionary.nix b/pkgs/servers/dict/dictd-wiktionary.nix new file mode 100644 index 000000000000..48aaf187605e --- /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 000000000000..063868ddc6e8 --- /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 000000000000..8a0210e7254f --- /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 000000000000..6a88427c5da1 --- /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 463840fcf4ca..f967a7aaa2a8 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 000000000000..8329a9a05c95 --- /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 d99cff6b667b..612db162e5c5 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/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index 1992164b3d1c..777fb31ac971 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "redis-2.6.9"; + name = "redis-2.6.13"; src = fetchurl { url = "http://redis.googlecode.com/files/${name}.tar.gz"; - sha256 = "12bl3inq7xr2lqlqbxjxa3v9s5v7xn2pxlbm72ivxbiq43zpx5jd"; + sha256 = "0j79a5vmdy0c1df89ymqk37kz8q2iqlzg81qwnz0djjqdiikk51v"; }; makeFlags = "PREFIX=$(out)"; @@ -16,7 +16,6 @@ stdenv.mkDerivation rec { homepage = http://redis.io; description = "An open source, advanced key-value store"; license = "BSD"; - platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/servers/sql/mysql51/default.nix b/pkgs/servers/sql/mysql51/default.nix index c6392589bb6f..b0f125faef7a 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 81514494c078..898acc1ba493 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/shells/ipython/default.nix b/pkgs/shells/ipython/default.nix index 82ca13185b3c..84ca7f04e7e2 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 2cfcf35f86cb..c5b45743c343 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 000000000000..b446b06f987c --- /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 000000000000..d06ef2c83662 --- /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 000000000000..05150e131e36 --- /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 24308cdb651c..b8b7510b882b 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 a657234e577c..3732e5b17565 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 6dd0639c607e..000000000000 --- 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 a9892cc780ed..000000000000 --- 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 3abb1ba25d32..000000000000 --- 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 a42c6aa7a7ec..a091142db249 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 1c113ddefbe3..000000000000 --- 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 4f4d235008bf..712cd32d9c33 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 5ef6db7ae47a..3e6902a183d5 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 a5d2d20968a8..370ce4fc1a17 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/misc/parcellite/default.nix b/pkgs/tools/misc/parcellite/default.nix new file mode 100644 index 000000000000..04ff98b5e7bb --- /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/ahcpd/default.nix b/pkgs/tools/networking/ahcpd/default.nix new file mode 100644 index 000000000000..635d94a3e864 --- /dev/null +++ b/pkgs/tools/networking/ahcpd/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "ahcpd-0.53"; + + src = fetchurl { + url = "http://www.pps.univ-paris-diderot.fr/~jch/software/files/${name}.tar.gz"; + sha256 = "0lhdmky3zdyk51hclv2lrhw3hzymbdc8bw2khs3rnaibgn0jwqm4"; + }; + + preBuild = '' + makeFlags="PREFIX=$out ETCDIR=$out/etc" + sed -i -e s,etc,$out/etc, Makefile + ''; + + meta = { + homepage = "http://www.pps.univ-paris-diderot.fr/~jch/software/ahcp/"; + description = "Autoconfiguration protocol for IPv6 and dual-stack IPv6/IPv4 networks"; + license = "MIT"; + }; +} diff --git a/pkgs/tools/networking/babeld/default.nix b/pkgs/tools/networking/babeld/default.nix new file mode 100644 index 000000000000..6f773cd1f7d3 --- /dev/null +++ b/pkgs/tools/networking/babeld/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "babeld-1.4.1"; + + src = fetchurl { + url = "http://www.pps.univ-paris-diderot.fr/~jch/software/files/${name}.tar.gz"; + sha256 = "0ykyvg9kkbv5pnkivcv9ncdcsb8bp3gfxv8swpq9jc7bh9aa2ckp"; + }; + + preBuild = '' + makeFlags="PREFIX=$out ETCDIR=$out/etc" + ''; + + meta = { + homepage = "http://www.pps.univ-paris-diderot.fr/~jch/software/babel/"; + description = "Loop-avoiding distance-vector routing protocol"; + license = "MIT"; + }; +} diff --git a/pkgs/tools/networking/chrony/default.nix b/pkgs/tools/networking/chrony/default.nix new file mode 100644 index 000000000000..d7fe07570574 --- /dev/null +++ b/pkgs/tools/networking/chrony/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, libcap, readline }: + +assert stdenv.isLinux -> libcap != null; + +stdenv.mkDerivation rec { + name = "chrony-1.27"; + + src = fetchurl { + url = "http://download.tuxfamily.org/chrony/${name}.tar.gz"; + sha256 = "17dfhcm5mrkg8ids0ajwscryr7fm7664kz10ygsa1ac047p3aj6l"; + }; + + buildInputs = [ readline ] ++ stdenv.lib.optional stdenv.isLinux libcap; + + 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 eb93c9ef4f66..f9439f1b42aa 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 6f5a0b3950bf..3072ba3bd4fc 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/megatools/default.nix b/pkgs/tools/networking/megatools/default.nix new file mode 100644 index 000000000000..25dbd634c8c0 --- /dev/null +++ b/pkgs/tools/networking/megatools/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, glib, curl, pkgconfig, fuse, glib_networking, makeWrapper +, gsettings_desktop_schemas }: + +stdenv.mkDerivation rec { + name = "megatools-1.9.91"; + + src = fetchurl { + url = "http://megatools.megous.com/builds/${name}.tar.gz"; + sha256 = "0hb83wqsn6mggcmk871hl8cski5x0hxz9dhaka42115s4mdfbl1i"; + }; + + buildInputs = [ glib curl pkgconfig fuse makeWrapper ]; + + postInstall = '' + for a in $out/bin/*; do + wrapProgram "$a" \ + --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \ + --prefix XDG_DATA_DIRS : "${gsettings_desktop_schemas}/share" + + done + ''; + + meta = { + description = "Command line client for Mega.co.nz"; + homepage = http://megatools.megous.com/; + license = "GPLv2+"; + maintainers = [ stdenv.lib.maintainers.viric ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/tools/networking/mosh/default.nix b/pkgs/tools/networking/mosh/default.nix index e5d9a656494e..f9562f7eff60 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 7470c07d9377..45dcb087bd76 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 8f6058d20783..1f874c70ddc8 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 000000000000..15da0236172b --- /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/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix index 1310fb7d0473..0db7c4b688f8 100644 --- a/pkgs/tools/networking/openvpn/default.nix +++ b/pkgs/tools/networking/openvpn/default.nix @@ -1,35 +1,41 @@ -{stdenv, fetchurl, iproute, lzo, openssl}: +{ stdenv, fetchurl, iproute, lzo, openssl, pam }: stdenv.mkDerivation rec { - name = "openvpn-2.2.2"; + name = "openvpn-2.3.1"; src = fetchurl { url = "http://swupdate.openvpn.net/community/releases/${name}.tar.gz"; - sha256 = "005cpvdvh8pvsn3bc96lrznlkcccbz5jqa62hipb58rf1qk8pjjl"; + sha256 = "0g7vf3f6z0h4kdqlqr8jd0gapi0ains6xcvlvfy8cicxnf2psbdx"; }; - buildInputs = [ iproute lzo openssl ]; + buildInputs = [ iproute lzo openssl pam ]; configureFlags = '' --enable-password-save --enable-iproute2 - --with-iproute-path=${iproute}/sbin/ip + --enable-systemd + IPROUTE=${iproute}/sbin/ip + ''; + + preConfigure = '' + substituteInPlace ./src/openvpn/console.c \ + --replace /bin/systemd-ask-password /run/current-system/sw/bin/systemd-ask-password ''; postInstall = '' mkdir -p $out/share/doc/openvpn/examples - cp -r sample-config-files/ $out/share/doc/openvpn/examples - cp -r sample-keys/ $out/share/doc/openvpn/examples - cp -r easy-rsa/ $out/share/doc/openvpn/examples - rm -r $out/share/doc/openvpn/examples/easy-rsa/Windows - cp -r sample-scripts/ $out/share/doc/openvpn/examples + cp -r sample/sample-config-files/ $out/share/doc/openvpn/examples + cp -r sample/sample-keys/ $out/share/doc/openvpn/examples + cp -r sample/sample-scripts/ $out/share/doc/openvpn/examples ''; - meta = { - description="OpenVPN is a robust and highly flexible tunneling application compatible with many OSes."; - homepage="http://openvpn.net/"; - license = "GPLv2"; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + enableParallelBuilding = true; + + meta = { + description = "A robust and highly flexible tunneling application"; + homepage = http://openvpn.net/; + license = "GPLv2"; + maintainers = [ stdenv.lib.maintainers.viric ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/oslrd/default.nix b/pkgs/tools/networking/oslrd/default.nix new file mode 100644 index 000000000000..18fdae2a44f8 --- /dev/null +++ b/pkgs/tools/networking/oslrd/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, bison, flex }: + +stdenv.mkDerivation rec { + name = "olsrd-0.6.5.4"; + + src = fetchurl { + url = "http://www.olsr.org/releases/0.6/${name}.tar.bz2"; + sha256 = "757327b9a22b066bd0cab2a8e1cdd1c462f474bb99864a175388aa5f0c70504c"; + }; + + buildInputs = [ bison flex ]; + + preConfigure = '' + makeFlags="prefix=$out ETCDIR=$out/etc" + ''; + + meta = { + description = "An adhoc wireless mesh routing daemon"; + license = "BSD"; + homepage = "http://olsr.org/"; + maintainers = with stdenv.lib.maintainers; [viric]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/tools/networking/pwnat/default.nix b/pkgs/tools/networking/pwnat/default.nix new file mode 100644 index 000000000000..63919edd5054 --- /dev/null +++ b/pkgs/tools/networking/pwnat/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "pwnat-0.3-beta"; + + src = fetchurl { + url = "http://samy.pl/pwnat/${name}.tgz"; + sha256 = "18ihs6wk7zni2w0pqip7i61hyi6n60v5rgj6z7j543fgy4afmmnm"; + }; + + installPhase = '' + mkdir -p $out/bin $out/share/pwnat + cp pwnat $out/bin + cp README* COPYING* $out/share/pwnat + ''; + + meta = { + homepage = http://samy.pl/pwnat/; + description = "ICMP NAT to NAT client-server communication"; + license = "GPLv3+"; + maintainers = with stdenv.lib.maintainers; [viric]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/tools/networking/tcpdump/default.nix index b4b96a549e14..f987d6fa6bac 100644 --- a/pkgs/tools/networking/tcpdump/default.nix +++ b/pkgs/tools/networking/tcpdump/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libpcap, enableStatic ? false }: stdenv.mkDerivation rec { - name = "tcpdump-4.2.1"; + name = "tcpdump-4.4.0"; src = fetchurl { url = "http://www.tcpdump.org/release/${name}.tar.gz"; - sha256 = "1zwv9zp169dwqwwwi6lfd3fhiayiq81ijqmwi0pfdvw63skfjmsl"; + sha256 = "1g9h2p31xwpdg88v7wv9hc8calq8sjs25800vzd9i45q5knln9qj"; }; buildInputs = [ libpcap ]; diff --git a/pkgs/tools/networking/tinc/default.nix b/pkgs/tools/networking/tinc/default.nix index bcfb584da1b7..dd6bfb82aab0 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/networking/udptunnel/default.nix b/pkgs/tools/networking/udptunnel/default.nix new file mode 100644 index 000000000000..88ee926e4065 --- /dev/null +++ b/pkgs/tools/networking/udptunnel/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation { + name = "udptunnel-19"; + + src = fetchurl { + url = http://udptunnel.googlecode.com/files/udptunnel-r19.tar.gz; + sha1 = "51edec3b63b659229bcf92f6157568d3b074ede0"; + }; + + installPhase = '' + ensureDir $out/bin $out/share/udptunnel + cp udptunnel $out/bin + cp README COPYING* $out/share/udptunnel + ''; + + meta = { + homepage = http://code.google.com/p/udptunnel/; + description = "Tunnels TCP over UDP packets"; + license = "GPLv3+"; + maintainers = with stdenv.lib.maintainers; [viric]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index e8255ccb2966..55f783d792f0 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 ba680cb8ba43..b94e2e50a40c 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 000000000000..e18b68c7593f --- /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/system/vboot_reference/default.nix b/pkgs/tools/system/vboot_reference/default.nix new file mode 100644 index 000000000000..4c3c58b35cdd --- /dev/null +++ b/pkgs/tools/system/vboot_reference/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchgit, pkgconfig, libuuid, openssl }: + +let + arch = if stdenv.system == "x86_64-linux" then "x86_64" + else if stdenv.system == "i686-linux" then "x86" + else throw "vboot_reference for: ${stdenv.system} not supported!"; + + version = "20130507"; + checkout = "25/50225/2"; +in stdenv.mkDerivation { + name = "vboot_reference-${version}"; + + src = fetchgit { + url = "http://git.chromium.org/git/chromiumos/platform/vboot_reference.git"; + rev = "refs/changes/${checkout}"; + sha256 = "00qhwhh5ygrcfm9is8hrk1spqdvfs6aa744h10jbr03zics5bvac"; + }; + + buildInputs = [ pkgconfig openssl ] ++ + (if libuuid == null + then [] + else [ (stdenv.lib.overrideDerivation libuuid + (args: { configureFlags = args.configureFlags + " --enable-static"; })) ]); + + buildPhase = '' + make ARCH=${arch} `pwd`/build/cgpt/cgpt + make ARCH=${arch} `pwd`/build/utility/vbutil_kernel + make ARCH=${arch} `pwd`/build/utility/vbutil_key + make ARCH=${arch} `pwd`/build/utility/vbutil_keyblock + make ARCH=${arch} `pwd`/build/utility/vbutil_firmware + ''; + + installPhase = '' + ensureDir $out/bin + cp build/cgpt/cgpt $out/bin + cp build/utility/vbutil_kernel $out/bin + cp build/utility/vbutil_key $out/bin + cp build/utility/vbutil_keyblock $out/bin + cp build/utility/vbutil_firmware $out/bin + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1f0fbfb27a8a..17460b294313 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -187,6 +187,7 @@ let inherit lib config stdenvAdapters; inherit (lib) lowPrio hiPrio appendToName makeOverridable; + inherit (misc) versionedDerivation; # Applying this to an attribute set will cause nix-env to look # inside the set for derivations. @@ -384,6 +385,8 @@ let aespipe = callPackage ../tools/security/aespipe { }; + ahcpd = callPackage ../tools/networking/ahcpd { }; + aircrackng = callPackage ../tools/networking/aircrack-ng { }; analog = callPackage ../tools/admin/analog {}; @@ -476,6 +479,8 @@ let azureus = callPackage ../tools/networking/p2p/azureus { }; + babeld = callPackage ../tools/networking/babeld { }; + banner = callPackage ../games/banner {}; barcode = callPackage ../tools/graphics/barcode {}; @@ -580,6 +585,8 @@ let chkrootkit = callPackage ../tools/security/chkrootkit { }; + chrony = callPackage ../tools/networking/chrony { }; + cksfv = callPackage ../tools/networking/cksfv { }; ciopfs = callPackage ../tools/filesystems/ciopfs { }; @@ -798,7 +805,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 {}; @@ -955,6 +965,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 { }; @@ -1147,6 +1161,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 { }; @@ -1159,6 +1175,8 @@ let mdbtools_git = callPackage ../tools/misc/mdbtools/git.nix { }; + megatools = callPackage ../tools/networking/megatools { }; + minecraft = callPackage ../games/minecraft { }; minetest = callPackage ../games/minetest { }; @@ -1260,6 +1278,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; }; @@ -1345,6 +1365,8 @@ let optipng = callPackage ../tools/graphics/optipng { }; + oslrd = callPackage ../tools/networking/oslrd { }; + ossec = callPackage ../tools/security/ossec {}; otpw = callPackage ../os-specific/linux/otpw { }; @@ -1359,6 +1381,8 @@ let parallel = callPackage ../tools/misc/parallel { }; + parcellite = callPackage ../tools/misc/parcellite { }; + patchutils = callPackage ../tools/text/patchutils { }; parted = callPackage ../tools/misc/parted { hurd = null; }; @@ -1466,6 +1490,8 @@ let pwgen = callPackage ../tools/security/pwgen { }; + pwnat = callPackage ../tools/networking/pwnat { }; + pydb = callPackage ../development/tools/pydb { }; pystringtemplate = callPackage ../development/python-modules/stringtemplate { }; @@ -1706,6 +1732,8 @@ let udftools = callPackage ../tools/filesystems/udftools {}; + udptunnel = callPackage ../tools/networking/udptunnel { }; + ufraw = callPackage ../applications/graphics/ufraw { }; unetbootin = callPackage ../tools/cd-dvd/unetbootin { }; @@ -1726,6 +1754,8 @@ let vde2 = callPackage ../tools/networking/vde2 { }; + vboot_reference = callPackage ../tools/system/vboot_reference { }; + verilog = callPackage ../applications/science/electronics/verilog {}; vfdecrypt = callPackage ../tools/misc/vfdecrypt { }; @@ -2517,9 +2547,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 { }; @@ -2592,6 +2624,10 @@ let else stdenv; }; + mentorToolchains = recurseIntoAttrs ( + callPackage_i686 ../development/compilers/mentor {} + ); + mitscheme = callPackage ../development/compilers/mit-scheme { }; mlton = callPackage ../development/compilers/mlton { }; @@ -2866,8 +2902,8 @@ let }; erlangR14B04 = callPackage ../development/interpreters/erlang/R14B04.nix { }; - erlangR15B02 = callPackage ../development/interpreters/erlang/R15B02.nix { }; - erlang = erlangR15B02; + erlangR15B03 = callPackage ../development/interpreters/erlang/R15B03.nix { }; + erlang = erlangR15B03; groovy = callPackage ../development/interpreters/groovy { }; @@ -3111,6 +3147,11 @@ let bison = callPackage ../development/tools/parsing/bison { }; buildbot = callPackage ../development/tools/build-managers/buildbot { + inherit (pythonPackages) twisted jinja2 sqlalchemy sqlalchemy_migrate; + dateutil = pythonPackages.dateutil_1_5; + }; + + buildbotSlave = callPackage ../development/tools/build-managers/buildbot-slave { inherit (pythonPackages) twisted; }; @@ -3323,6 +3364,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 { }; @@ -3407,6 +3450,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 { }; @@ -3528,6 +3573,8 @@ let bwidget = callPackage ../development/libraries/bwidget { }; + c-ares = callPackage ../development/libraries/c-ares { }; + caelum = callPackage ../development/libraries/caelum { }; scmccid = callPackage ../development/libraries/scmccid { }; @@ -3781,6 +3828,8 @@ let giblib = callPackage ../development/libraries/giblib { }; + libgit2 = callPackage ../development/libraries/git2 { }; + glew = callPackage ../development/libraries/glew { }; glfw = callPackage ../development/libraries/glfw { }; @@ -4047,6 +4096,8 @@ let hsqldb = callPackage ../development/libraries/java/hsqldb { }; + http_parser = callPackage ../development/libraries/http_parser { inherit (pythonPackages) gyp; }; + hunspell = callPackage ../development/libraries/hunspell { }; hwloc = callPackage ../development/libraries/hwloc { @@ -4101,6 +4152,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 +4182,8 @@ let lesstif93 = callPackage ../development/libraries/lesstif-0.93 { }; + leveldb = callPackage ../development/libraries/leveldb { }; + levmar = callPackage ../development/libraries/levmar { }; leptonica = callPackage ../development/libraries/leptonica { }; @@ -4161,10 +4216,14 @@ let libbluray = callPackage ../development/libraries/libbluray { }; + libbs2b = callPackage ../development/libraries/audio/libbs2b { }; + libcaca = callPackage ../development/libraries/libcaca { }; libcanberra = callPackage ../development/libraries/libcanberra { }; + libcello = callPackage ../development/libraries/libcello {}; + libcdaudio = callPackage ../development/libraries/libcdaudio { }; libcddb = callPackage ../development/libraries/libcddb { }; @@ -4294,12 +4353,16 @@ let libgcrypt = callPackage ../development/libraries/libgcrypt { }; + libgcrypt_git = lowPrio (callPackage ../development/libraries/libgcrypt/git.nix { }); + libgdiplus = callPackage ../development/libraries/libgdiplus { }; libgpgerror = callPackage ../development/libraries/libgpg-error { }; libgphoto2 = callPackage ../development/libraries/libgphoto2 { }; + libgphoto2_4 = callPackage ../development/libraries/libgphoto2/2.4.nix { }; + libgpod = callPackage ../development/libraries/libgpod { inherit (pkgs.pythonPackages) mutagen; }; @@ -4815,12 +4878,18 @@ let pangoxsl = callPackage ../development/libraries/pangoxsl { }; + pcl = callPackage ../development/libraries/pcl { + vtk = vtkWithQt4; + }; + pcre = callPackage ../development/libraries/pcre { unicodeSupport = config.pcre.unicode or true; }; pdf2xml = callPackage ../development/libraries/pdf2xml {} ; + pdf2htmlex = callPackage ../development/libraries/pdf2htmlex {} ; + phonon = callPackage ../development/libraries/phonon { }; phonon_backend_gstreamer = callPackage ../development/libraries/phonon-backend-gstreamer { }; @@ -4829,6 +4898,8 @@ let physfs = callPackage ../development/libraries/physfs { }; + pkcs11helper = callPackage ../development/libraries/pkcs11helper { }; + plib = callPackage ../development/libraries/plib { }; pocketsphinx = callPackage ../development/libraries/pocketsphinx { }; @@ -5180,6 +5251,8 @@ let inherit libpng; }; + wildmidi = callPackage ../development/libraries/wildmidi { }; + wvstreams = callPackage ../development/libraries/wvstreams { }; wxGTK = wxGTK28; @@ -5412,6 +5485,8 @@ let pygobject = pythonPackages.pygobject; + pygobject3 = pythonPackages.pygobject3; + pygtk = pythonPackages.pygtk; pyGtkGlade = pythonPackages.pyGtkGlade; @@ -5486,6 +5561,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 { }; @@ -5597,6 +5676,8 @@ let gdSupport = true; }; + munin = callPackage ../servers/monitoring/munin { }; + nagiosPluginsOfficial = callPackage ../servers/monitoring/nagios/plugins/official { }; net_snmp = callPackage ../servers/monitoring/net-snmp { }; @@ -5759,9 +5840,14 @@ let b43FirmwareCutter = callPackage ../os-specific/linux/firmware/b43-firmware-cutter { }; + batctl = callPackage ../os-specific/linux/batman-adv/batctl.nix { }; + 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; @@ -5955,6 +6041,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 @@ -6026,6 +6120,8 @@ let acpi_call = callPackage ../os-specific/linux/acpi-call {}; + batman_adv = callPackage ../os-specific/linux/batman-adv {}; + bbswitch = callPackage ../os-specific/linux/bbswitch {}; ati_drivers_x11 = callPackage ../os-specific/linux/ati-drivers { }; @@ -6096,6 +6192,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 { }; @@ -6127,6 +6225,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); @@ -6535,6 +6634,8 @@ 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 { }; @@ -7109,12 +7210,12 @@ let firefox19Wrapper = lowPrio (wrapFirefox { browser = firefox19Pkgs.firefox; }); - firefox20Pkgs = callPackage ../applications/networking/browsers/firefox/20.0.nix { + firefox21Pkgs = callPackage ../applications/networking/browsers/firefox/21.0.nix { inherit (gnome) libIDL; inherit (pythonPackages) pysqlite; }; - firefox20Wrapper = lowPrio (wrapFirefox { browser = firefox20Pkgs.firefox; }); + firefox21Wrapper = lowPrio (wrapFirefox { browser = firefox21Pkgs.firefox; }); flac = callPackage ../applications/audio/flac { }; @@ -7216,14 +7317,12 @@ let inherit (gnome) libglade scrollkeeper; }; - gnunet08 = callPackage ../applications/networking/p2p/gnunet/0.8.nix { - inherit (gnome) libglade; - guile = guile_1_8; - gtkSupport = config.gnunet.gtkSupport or true; - }; - gnunet = callPackage ../applications/networking/p2p/gnunet { }; + gnunet_svn = lowPrio (callPackage ../applications/networking/p2p/gnunet/svn.nix { + libgcrypt = libgcrypt_git; + }); + gocr = callPackage ../applications/graphics/gocr { }; gobby5 = callPackage ../applications/editors/gobby { @@ -7544,6 +7643,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; @@ -7765,6 +7866,8 @@ let qemuImage = callPackage ../applications/virtualization/qemu/linux-img { }; + qmmp = callPackage ../applications/audio/qmmp { }; + qsampler = callPackage ../applications/audio/qsampler { }; qsynth = callPackage ../applications/audio/qsynth { }; @@ -7843,7 +7946,11 @@ let skype_call_recorder = callPackage ../applications/networking/instant-messengers/skype-call-recorder { }; - st = callPackage ../applications/misc/st { }; + st = callPackage ../applications/misc/st { + conf = config.st.conf or null; + }; + + sxiv = callPackage ../applications/graphics/sxiv { }; bittorrentSync = callPackage ../applications/networking/bittorrentsync { }; @@ -8151,6 +8258,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 { }; @@ -8191,7 +8299,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 { }; @@ -8591,12 +8701,14 @@ let boost = boost149; eigen = eigen2; libotr = libotr_3_2; + libgphoto2 = libgphoto2_4; }) ../desktops/kde-4.7; kde48 = kdePackagesFor (pkgs.kde48 // { boost = boost149; eigen = eigen2; libotr = libotr_3_2; + libgphoto2 = libgphoto2_4; }) ../desktops/kde-4.8; kde410 = kdePackagesFor (pkgs.kde410 // { @@ -8615,6 +8727,8 @@ let in kde4 // { inherit kde4; + wrapper = callPackage ../build-support/kdewrapper {}; + recurseForRelease = true; akunambol = callPackage ../applications/networking/sync/akunambol { }; @@ -8699,6 +8813,8 @@ let rekonq = callPackage ../applications/networking/browsers/rekonq { }; + kwebkitpart = callPackage ../applications/networking/browsers/kwebkitpart { }; + rsibreak = callPackage ../applications/misc/rsibreak { }; semnotes = callPackage ../applications/misc/semnotes { }; @@ -8905,6 +9021,8 @@ let ### SCIENCE / ELECTRONICS + eagle = callPackage_i686 ../applications/science/electronics/eagle { }; + caneda = callPackage ../applications/science/electronics/caneda { }; gtkwave = callPackage ../applications/science/electronics/gtkwave { }; @@ -8934,6 +9052,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 { @@ -9002,17 +9125,7 @@ let freestyle = callPackage ../misc/freestyle { }; - gajim = builderDefsPackage (import ../applications/networking/instant-messengers/gajim) { - inherit perl intltool pyGtkGlade gettext pkgconfig makeWrapper pygobject - pyopenssl gtkspell libsexy pycrypto aspell pythonDBus pythonSexy - docutils gtk farstream gst_plugins_bad gstreamer gst_ffmpeg gst_python; - dbus = dbus.libs; - inherit (gnome) libglade; - inherit (xlibs) libXScrnSaver libXt xproto libXext xextproto libX11 - scrnsaverproto; - inherit (pythonPackages) pyasn1; - python = pythonFull; - }; + gajim = callPackage ../applications/networking/instant-messengers/gajim { }; gensgs = callPackage_i686 ../misc/emulators/gens-gs { }; @@ -9041,7 +9154,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 { }; @@ -9063,10 +9176,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 58b48b06ffeb..10b0347127e2 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 cff0c664d75e..9f99a49dd6d4 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 {}; @@ -1478,6 +1558,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); poolConduit = callPackage ../development/libraries/haskell/pool-conduit {}; + pop3client = callPackage ../development/libraries/haskell/pop3-client {}; + postgresqlLibpq = callPackage ../development/libraries/haskell/postgresql-libpq { inherit (pkgs) postgresql; }; @@ -1613,6 +1695,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 {}; @@ -1645,6 +1729,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); smallcheck = callPackage ../development/libraries/haskell/smallcheck {}; + smtpMail = callPackage ../development/libraries/haskell/smtp-mail {}; + snap = callPackage ../development/libraries/haskell/snap/snap.nix {}; snapCore = callPackage ../development/libraries/haskell/snap/core.nix {}; @@ -1777,6 +1863,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 +1948,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 +1966,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 +2225,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-generated.nix b/pkgs/top-level/node-packages-generated.nix new file mode 100644 index 000000000000..a185eaee1d0e --- /dev/null +++ b/pkgs/top-level/node-packages-generated.nix @@ -0,0 +1,1904 @@ +[ + { + baseName = "abbrev"; + version = "1.0.4"; + fullName = "abbrev-1"; + hash = "8dc0f480571a4a19e74f1abd4f31f6a70f94953d1ccafa16ed1a544a19a6f3a8"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "amdefine"; + version = "0.0.5"; + fullName = "amdefine-*"; + hash = "7d7a691c9742d4c9aaa8036b823823e45a676dec6897f2e072b90c7d37722fc1"; + patchLatest = false; + topLevel = true; + dependencies = [ + ]; + } + { + baseName = "amdefine"; + version = "0.0.5"; + fullName = "amdefine->=0.0.4"; + hash = "7d7a691c9742d4c9aaa8036b823823e45a676dec6897f2e072b90c7d37722fc1"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "ansi-remover"; + version = "0.0.2"; + fullName = "ansi-remover-*"; + hash = "cda72261ea8d6b830892764d69eff8d926be852fc91ad3b8b5b258d606400bc7"; + patchLatest = false; + topLevel = true; + dependencies = [ + ]; + } + { + baseName = "ansi"; + version = "0.1.2"; + fullName = "ansi-~0.1.2"; + hash = "6f2288b1db642eb822578f4ee70bf26bf97173cc7d3f10f496070fb96250006b"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "asn1"; + version = "0.1.11"; + fullName = "asn1-0.1.11"; + hash = "7206eadc8a9344e484bcce979e22a12c9fa64c1395aa0544b8b767808b268f43"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "assert"; + version = "0.4.9"; + fullName = "assert-*"; + hash = "976a12385f7286d123734fabc7355bbeecd2532daccfada02909818b905abeeb"; + patchLatest = false; + topLevel = true; + dependencies = [ + { name = "util"; range = ">= 0.4.9"; } + ]; + } + { + baseName = "assert-plus"; + version = "0.1.2"; + fullName = "assert-plus-0.1.2"; + hash = "bd62e853460024d1e35d3f76065f4c856a271e55ef1ce684f3033314b7377c61"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "async"; + version = "0.2.9"; + fullName = "async-*"; + hash = "7215c94b63ccaa543b4b75c5dd9b820fd4839e1f9616b08a0334a8ac74939c53"; + patchLatest = false; + topLevel = true; + dependencies = [ + ]; + } + { + baseName = "async"; + version = "0.2.9"; + fullName = "async-~0.2.7"; + hash = "7215c94b63ccaa543b4b75c5dd9b820fd4839e1f9616b08a0334a8ac74939c53"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "aws-sdk"; + version = "1.2.0"; + fullName = "aws-sdk-*"; + hash = "e2d4b32fba387b8f099c4180579b67554f875895a69e4c1ddb0a28546db9ba4c"; + patchLatest = true; + topLevel = true; + dependencies = [ + { name = "xml2js"; range = "0.2.4"; } + { name = "xmlbuilder"; range = "*"; } + ]; + } + { + baseName = "aws-sdk"; + version = "0.9.7-pre.8"; + fullName = "aws-sdk-0.9.7-pre.8"; + hash = "d3854275981fff76153f79c62745d8d6c59018861729766908c920fff95ea422"; + patchLatest = true; + topLevel = false; + dependencies = [ + { name = "xml2js"; range = "0.2.4"; } + { name = "xmlbuilder"; range = "*"; } + ]; + } + { + baseName = "aws-sign"; + version = "0.3.0"; + fullName = "aws-sign-~0.3.0"; + hash = "5acca27ed2b1b9f081e4dd230e03808b6a038f8a4afa698db985320efe6dda5e"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "backbone"; + version = "1.0.0"; + fullName = "backbone-*"; + hash = "6c66edc5134bb531b33a7f140c75c4a65cdc21711eed64c29300a84cba84f3a7"; + patchLatest = false; + topLevel = true; + dependencies = [ + { name = "underscore"; range = ">=1.4.3"; } + ]; + } + { + baseName = "backoff"; + version = "2.1.0"; + fullName = "backoff-2.1.0"; + hash = "d1f5bf32f2f5954f6259582ead30fc8a769db35bac9900c94593b77f915cee0d"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "block-stream"; + version = "0.0.6"; + fullName = "block-stream-*"; + hash = "2fc365b42b8601c8ee150d453f6cc762a01054b7fb28bdfcfcbce7c97e93601b"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "inherits"; range = "~1.0.0"; } + ]; + } + { + baseName = "boom"; + version = "0.4.2"; + fullName = "boom-0.4.x"; + hash = "294e022990269e7fa1e3015862d2d24847cc83c3e68d214dad5a2d0d3826a08f"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "hoek"; range = "0.9.x"; } + ]; + } + { + baseName = "browserchannel"; + version = "1.0.4"; + fullName = "browserchannel-*"; + hash = "516add6af10f887500c5eaae7347ce92c0101a6bea1a67d5221a674d07bc7999"; + patchLatest = false; + topLevel = true; + dependencies = [ + { name = "hat"; range = "*"; } + { name = "connect"; range = "~2"; } + { name = "request"; range = "~2"; } + ]; + } + { + baseName = "buffer-crc32"; + version = "0.2.1"; + fullName = "buffer-crc32-0.2.1"; + hash = "b6ea96d57411e37c15e18fb8ca600656399912ce16355f9af3c662f765507f01"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "buffertools"; + version = "1.1.1"; + fullName = "buffertools-*"; + hash = "f5962aec81246077a46ee075072d40fa533c31ada7a0ec18e1ff3600af2d8f3f"; + patchLatest = false; + topLevel = true; + dependencies = [ + ]; + } + { + baseName = "bunyan"; + version = "0.21.1"; + fullName = "bunyan-0.21.1"; + hash = "95dca2405dcbe5b700e15d7c89b2a64fb21a097fb7ada5c274979f2057adcbef"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "mv"; range = "0.0.5"; } + { name = "dtrace-provider"; range = "0.2.8"; } + ]; + } + { + baseName = "bytes"; + version = "0.2.0"; + fullName = "bytes-0.2.0"; + hash = "e70bd4dccc886a5cf1c925092b4acd7a262a9da3e1b51ccde10a3fcd0a328465"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "clone"; + version = "0.1.5"; + fullName = "clone-0.1.5"; + hash = "9fd586470ccc3fa585dcccad730b5e6fa9c471b49acdb38d724c110777a287d9"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "clone"; + version = "0.1.6"; + fullName = "clone-0.1.6"; + hash = "9849c9faa2549d982106d3b43862dc4ceb308563badcd3ff59e30655d54e897a"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "coffee-script"; + version = "1.6.2"; + fullName = "coffee-script-*"; + hash = "92785ad77e5d689fc7bfc62f3b519e65b77509457dda7a332ee1efd6cf9f08d6"; + patchLatest = false; + topLevel = true; + dependencies = [ + ]; + } + { + baseName = "combined-stream"; + version = "0.0.4"; + fullName = "combined-stream-~0.0.4"; + hash = "2502ed7a4406db1a65b09cae3106221051d6af20d3f1d7e8cc38cfc72a36432c"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "delayed-stream"; range = "0.0.5"; } + ]; + } + { + baseName = "commander"; + version = "0.5.1"; + fullName = "commander-0.5.1"; + hash = "91042851d0731b28a5e7c342e5cbce7723a7243d31ae378fa86c45ca9493a924"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "commander"; + version = "0.6.1"; + fullName = "commander-0.6.1"; + hash = "7b7fdd1bc4d16f6776169a64f133d629efe2e3a7cd338b1d0884ee909abbd729"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "connect"; + version = "2.7.10"; + fullName = "connect-2.7.10"; + hash = "b1d9cf6b2932578618537a95471f9c0ae451e2ed8033647e420b4c67b1d28b3d"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "qs"; range = "0.6.5"; } + { name = "formidable"; range = "1.0.14"; } + { name = "cookie-signature"; range = "1.0.1"; } + { name = "buffer-crc32"; range = "0.2.1"; } + { name = "cookie"; range = "0.0.5"; } + { name = "send"; range = "0.1.0"; } + { name = "bytes"; range = "0.2.0"; } + { name = "fresh"; range = "0.1.0"; } + { name = "pause"; range = "0.0.1"; } + { name = "debug"; range = "*"; } + ]; + } + { + baseName = "connect"; + version = "2.7.10"; + fullName = "connect-~2"; + hash = "b1d9cf6b2932578618537a95471f9c0ae451e2ed8033647e420b4c67b1d28b3d"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "qs"; range = "0.6.5"; } + { name = "formidable"; range = "1.0.14"; } + { name = "cookie-signature"; range = "1.0.1"; } + { name = "buffer-crc32"; range = "0.2.1"; } + { name = "cookie"; range = "0.0.5"; } + { name = "send"; range = "0.1.0"; } + { name = "bytes"; range = "0.2.0"; } + { name = "fresh"; range = "0.1.0"; } + { name = "pause"; range = "0.0.1"; } + { name = "debug"; range = "*"; } + ]; + } + { + baseName = "cookie"; + version = "0.0.5"; + fullName = "cookie-0.0.5"; + hash = "17938b21dcd85f09994b85484abb5aeddc4e92c61d1b599b764bbaaa7ad6adee"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "cookie"; + version = "0.1.0"; + fullName = "cookie-0.1.0"; + hash = "aff5d22a617d744319cc70e42fc4ab11bcbcf924244af565495fa799c0639650"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "cookie-jar"; + version = "0.3.0"; + fullName = "cookie-jar-~0.3.0"; + hash = "c7bac7739b9ceb194f431a4a9ac1a0ba4ffd4a60492c61dd1925dbcdb9030746"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "cookie-signature"; + version = "1.0.1"; + fullName = "cookie-signature-1.0.1"; + hash = "e2ea4f290fdcfe82d8fb76991fee4106d4ae1f5d5a2f8b8d91442e047c538c8e"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "cryptiles"; + version = "0.2.1"; + fullName = "cryptiles-0.2.x"; + hash = "a7ad8087bf6abbbfa0ae159756c04326a490f373212f6f2fd0f3a1f63f475892"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "boom"; range = "0.4.x"; } + ]; + } + { + baseName = "ctype"; + version = "0.5.0"; + fullName = "ctype-0.5.0"; + hash = "50157e6c5e44d1c833bfc239a7a337ee08fd6f3c5a15f7ef5cee5571a86b0378"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "ctype"; + version = "0.5.2"; + fullName = "ctype-0.5.2"; + hash = "4a7224a74f19dc6a1206fa1c04ae1a4ab795cd4ba842466e2f511fa714f82c60"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "debug"; + version = "0.7.2"; + fullName = "debug-*"; + hash = "f9142856b1c2652a11e50f2aca068edbad7598f50d9e6d003b8ee85b2a333d63"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "debug"; + version = "0.7.2"; + fullName = "debug-~0.7.0"; + hash = "f9142856b1c2652a11e50f2aca068edbad7598f50d9e6d003b8ee85b2a333d63"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "deep-equal"; + version = "0.0.0"; + fullName = "deep-equal-0.0.0"; + hash = "6a5666d4bfa5d2786a9f86ede2eaa8252f783edb9d78e69cba645f7cb6e153b8"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "delayed-stream"; + version = "0.0.5"; + fullName = "delayed-stream-0.0.5"; + hash = "f40e440dac0f853577d5225d7bd4b2026ea1447a724f4ba1096e29983ee595dd"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "diff"; + version = "1.0.2"; + fullName = "diff-1.0.2"; + hash = "5de1d8c3f2bfc447a7e664cadd4aca2ef4952a43256310cc51a36b30b5be3045"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "dtrace-provider"; + version = "0.2.8"; + fullName = "dtrace-provider-0.2.8"; + hash = "200941239983fa0953415cf28e96d9347c50218d31280604cfc9252e448e714c"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "escape-html"; + version = "0.0.1"; + fullName = "escape-html-*"; + hash = "03c24a492f80659c25f788809ae64277408a4c12594cff62f89db4b3259c6b58"; + patchLatest = false; + topLevel = true; + dependencies = [ + ]; + } + { + baseName = "events.node"; + version = "0.4.9"; + fullName = "events.node->= 0.4.0"; + hash = "aedaf9faa7a33f16e2bf1754ed988a836570d00064748a8c1c8ee48805b9f0b6"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "express"; + version = "3.2.5"; + fullName = "express-*"; + hash = "f09dce2d0610795af88fe903242557526be269f27912b63309e3b3329218e20b"; + patchLatest = false; + topLevel = true; + dependencies = [ + { name = "connect"; range = "2.7.10"; } + { name = "commander"; range = "0.6.1"; } + { name = "range-parser"; range = "0.0.4"; } + { name = "mkdirp"; range = "0.3.4"; } + { name = "cookie"; range = "0.1.0"; } + { name = "buffer-crc32"; range = "0.2.1"; } + { name = "fresh"; range = "0.1.0"; } + { name = "methods"; range = "0.0.1"; } + { name = "send"; range = "0.1.0"; } + { name = "cookie-signature"; range = "1.0.1"; } + { name = "debug"; range = "*"; } + ]; + } + { + baseName = "extend"; + version = "1.1.3"; + fullName = "extend-*"; + hash = "0b27709829110f2e84926ebe3494b82df6e79ad49a618ad3444e4edf62b57a57"; + patchLatest = false; + topLevel = true; + dependencies = [ + ]; + } + { + baseName = "extsprintf"; + version = "1.0.0"; + fullName = "extsprintf-1.0.0"; + hash = "9cae7f1f192e5f35746e13047ab4c13e8b5b686469feeaec301ba7d370df5670"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "extsprintf"; + version = "1.0.2"; + fullName = "extsprintf-1.0.2"; + hash = "ea000cf3e51cba7fac7fb1e425ddb79bf46f3ce40955955bf35fd487184a04ab"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "faye-websocket"; + version = "0.6.0"; + fullName = "faye-websocket-*"; + hash = "192f09ecd1c52fc357d2ad3ae3121be35556b7b09e30ce74117d80b9dbae3f60"; + patchLatest = false; + topLevel = true; + dependencies = [ + { name = "websocket-driver"; range = ">=0.2.0"; } + ]; + } + { + baseName = "faye-websocket"; + version = "0.4.4"; + fullName = "faye-websocket-0.4.4"; + hash = "c682f6269bcaba0667ef4ae0ecb0b662e35ea6338b075e25ebce9e13019bc3a2"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "forever-agent"; + version = "0.5.0"; + fullName = "forever-agent-~0.5.0"; + hash = "0a7eda1f87f3cfa7fad8ba655a642992033b38a1929becfa0bfcab8241b7d78b"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "form-data"; + version = "0.0.8"; + fullName = "form-data-0.0.8"; + hash = "cf7d5669259ec4c5474b9c2100127ba065a4757ff33b878a1d99509b8e448220"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "combined-stream"; range = "~0.0.4"; } + { name = "mime"; range = "~1.2.2"; } + { name = "async"; range = "~0.2.7"; } + ]; + } + { + baseName = "form-data"; + version = "0.0.10"; + fullName = "form-data-~0.0.3"; + hash = "d49669b81c27dd6c7e359ee9892880c6741dae6c325b617ab3eb5a78bf103822"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "combined-stream"; range = "~0.0.4"; } + { name = "mime"; range = "~1.2.2"; } + { name = "async"; range = "~0.2.7"; } + ]; + } + { + baseName = "formidable"; + version = "1.0.13"; + fullName = "formidable-1.0.13"; + hash = "c3c7c6ecdd4b1ad9ec9b1c273d8dd1db2bc12f9a699c233d3885fcded58ceec6"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "formidable"; + version = "1.0.14"; + fullName = "formidable-1.0.14"; + hash = "b36e58f659fd0d7c734b4ab2c611fa6e40bd988c2237a29d25025460f18f7ea1"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "fresh"; + version = "0.1.0"; + fullName = "fresh-0.1.0"; + hash = "c402fbd25e26c0167bf288e1ba791716808bfaa5de32b76ae68e8e8a3d7e2b33"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "fstream"; + version = "0.1.22"; + fullName = "fstream-0"; + hash = "2ace3993d34cbf5e97bcb9c7eec3f011fa2041ce66cb688e39e747285084496a"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "rimraf"; range = "2"; } + { name = "mkdirp"; range = "0.3"; } + { name = "graceful-fs"; range = "~1.2.0"; } + { name = "inherits"; range = "~1.0.0"; } + ]; + } + { + baseName = "fstream"; + version = "0.1.22"; + fullName = "fstream-~0.1.8"; + hash = "2ace3993d34cbf5e97bcb9c7eec3f011fa2041ce66cb688e39e747285084496a"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "rimraf"; range = "2"; } + { name = "mkdirp"; range = "0.3"; } + { name = "graceful-fs"; range = "~1.2.0"; } + { name = "inherits"; range = "~1.0.0"; } + ]; + } + { + baseName = "glob"; + version = "3.2.1"; + fullName = "glob-3"; + hash = "a457c2115213ce2cb59582ddc3a25eb3ae7490af687e412111c0032f72966f51"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "minimatch"; range = "~0.2.11"; } + { name = "graceful-fs"; range = "~1.2.0"; } + { name = "inherits"; range = "1"; } + ]; + } + { + baseName = "glob"; + version = "3.2.1"; + fullName = "glob-3.2.1"; + hash = "a457c2115213ce2cb59582ddc3a25eb3ae7490af687e412111c0032f72966f51"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "minimatch"; range = "~0.2.11"; } + { name = "graceful-fs"; range = "~1.2.0"; } + { name = "inherits"; range = "1"; } + ]; + } + { + baseName = "graceful-fs"; + version = "1.2.1"; + fullName = "graceful-fs-1"; + hash = "eeef3c36c6a6476059a7e7a32d0b87e62133b11392c540f5c8c68c87f65c7c59"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "graceful-fs"; + version = "1.2.1"; + fullName = "graceful-fs-~1"; + hash = "eeef3c36c6a6476059a7e7a32d0b87e62133b11392c540f5c8c68c87f65c7c59"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "graceful-fs"; + version = "1.2.1"; + fullName = "graceful-fs-~1.2.0"; + hash = "eeef3c36c6a6476059a7e7a32d0b87e62133b11392c540f5c8c68c87f65c7c59"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "growl"; + version = "1.7.0"; + fullName = "growl-1.7.x"; + hash = "52a6e9edae2fd5a66ddb87c52a398a17ee697eb0e8e1480e9506a6dcdbf3ffcf"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "hat"; + version = "0.0.3"; + fullName = "hat-*"; + hash = "7bf52b3b020ca333a42eb67411090912b21abb6ac746d587022a0955b16e5f5c"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "hawk"; + version = "0.13.1"; + fullName = "hawk-~0.13.0"; + hash = "659e5ada1e9dc44a634e07899937d5eaeaa1c06658f181ca187f7f6faa0c592a"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "hoek"; range = "0.8.x"; } + { name = "boom"; range = "0.4.x"; } + { name = "cryptiles"; range = "0.2.x"; } + { name = "sntp"; range = "0.2.x"; } + ]; + } + { + baseName = "hoek"; + version = "0.8.5"; + fullName = "hoek-0.8.x"; + hash = "637e524cd4b48b66db137d6fa93cbe254f112ce638ea9fd399bab73591ede965"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "hoek"; + version = "0.9.1"; + fullName = "hoek-0.9.x"; + hash = "34480468d2e85781ecdd7134523b4d6fea978d333edd2bcb828edd33bbbe8a3f"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "htdigest"; + version = "1.0.7"; + fullName = "htdigest-1.0.7"; + hash = "10fb047addf1c4f1089a26389066d5ff8f5ffa1ccce272a701bb4c2a30d90c58"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "commander"; range = "0.5.1"; } + ]; + } + { + baseName = "htpasswd"; + version = "1.1.0"; + fullName = "htpasswd-1.1.0"; + hash = "cee9c0a525e717e3565ba6ffea8a64c480bc8a9e7800cb9bfc385d1a8e713ec9"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "commander"; range = "0.5.1"; } + ]; + } + { + baseName = "http-auth"; + version = "1.2.7"; + fullName = "http-auth-1.2.7"; + hash = "874dbb5907d03602f31eae959a0927a3112da8e868231d9a2119bb50d2fe63d2"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "node-uuid"; range = "1.2.0"; } + { name = "htpasswd"; range = "1.1.0"; } + { name = "htdigest"; range = "1.0.7"; } + ]; + } + { + baseName = "http-signature"; + version = "0.9.11"; + fullName = "http-signature-0.9.11"; + hash = "44b89f3c1917bf02723a5720f08fbe47448e0370a5d3498d1be860eaf28beb3b"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "assert-plus"; range = "0.1.2"; } + { name = "asn1"; range = "0.1.11"; } + { name = "ctype"; range = "0.5.2"; } + ]; + } + { + baseName = "http-signature"; + version = "0.9.11"; + fullName = "http-signature-~0.9.11"; + hash = "44b89f3c1917bf02723a5720f08fbe47448e0370a5d3498d1be860eaf28beb3b"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "assert-plus"; range = "0.1.2"; } + { name = "asn1"; range = "0.1.11"; } + { name = "ctype"; range = "0.5.2"; } + ]; + } + { + baseName = "inherits"; + version = "1.0.0"; + fullName = "inherits-1"; + hash = "2be196fa6bc6a0c65fecd737af457589ef88b22a95d5dc31aab01d92ace48186"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "inherits"; + version = "1.0.0"; + fullName = "inherits-1.x"; + hash = "2be196fa6bc6a0c65fecd737af457589ef88b22a95d5dc31aab01d92ace48186"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "inherits"; + version = "1.0.0"; + fullName = "inherits-~1.0.0"; + hash = "2be196fa6bc6a0c65fecd737af457589ef88b22a95d5dc31aab01d92ace48186"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "jade"; + version = "0.26.3"; + fullName = "jade-0.26.3"; + hash = "ea314287eb192b6987f7bb9d7010bf2c35ff6288f125fa00796ad93bdba14d0b"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "commander"; range = "0.6.1"; } + { name = "mkdirp"; range = "0.3.0"; } + ]; + } + { + baseName = "jayschema"; + version = "0.1.5"; + fullName = "jayschema-*"; + hash = "66e17d82f0b24d882321d42da2f094ab2b14df8a3f558b88867800e672f5c80d"; + patchLatest = false; + topLevel = true; + dependencies = [ + ]; + } + { + baseName = "json-schema"; + version = "0.2.2"; + fullName = "json-schema-0.2.2"; + hash = "41b873a8fb542caf337ec17ad5593761e8db5ce8e33f4074b733b34ec656f0e8"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "json-stringify-safe"; + version = "4.0.0"; + fullName = "json-stringify-safe-~4.0.0"; + hash = "2461befc8dab37d1d83927ab4bf4aa68b162a35b5a85c1a90c70f86500091b60"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "jsontool"; + version = "5.1.3"; + fullName = "jsontool-*"; + hash = "097889f294920e43c2a8f8d9156971860c67c61ecfe5a1e411c4d641e521985c"; + patchLatest = false; + topLevel = true; + dependencies = [ + ]; + } + { + baseName = "jsprim"; + version = "0.3.0"; + fullName = "jsprim-0.3.0"; + hash = "0fd12872374ee55cc0c005a1590ef65def0e96de04734a753e0d1480c3ffc4bd"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "extsprintf"; range = "1.0.0"; } + { name = "json-schema"; range = "0.2.2"; } + { name = "verror"; range = "1.3.3"; } + ]; + } + { + baseName = "keep-alive-agent"; + version = "0.0.1"; + fullName = "keep-alive-agent-0.0.1"; + hash = "481f10eeb5b9759ad28d9556f30c1747a5e71fbbad55fb130b96eacc7ac1c7a1"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "knox"; + version = "0.8.2"; + fullName = "knox-*"; + hash = "e4842cb834f27dc859fc6ab2389f7d0702f6cc6ecff469b89729dd33c33c0afd"; + patchLatest = false; + topLevel = true; + dependencies = [ + { name = "mime"; range = "*"; } + { name = "xml2js"; range = "0.2.x"; } + { name = "debug"; range = "~0.7.0"; } + { name = "stream-counter"; range = "~0.1.0"; } + ]; + } + { + baseName = "lru-cache"; + version = "2.3.0"; + fullName = "lru-cache-2"; + hash = "fbb1a14e0314095b7999a3a7489c92983f3d95b188857af697487ac8a778e942"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "lru-cache"; + version = "2.2.0"; + fullName = "lru-cache-2.2.0"; + hash = "bdfb66f74cc4097f3bfd6062b2edbb7790d709f414c7d0f3419241840b1bffed"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "lru-cache"; + version = "2.3.0"; + fullName = "lru-cache-2.3.0"; + hash = "fbb1a14e0314095b7999a3a7489c92983f3d95b188857af697487ac8a778e942"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "methods"; + version = "0.0.1"; + fullName = "methods-0.0.1"; + hash = "2f7e32954dff5991dd8220e8f5dcdd32aeec5ec56ce9f7235872444af51b3adb"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "mime"; + version = "1.2.9"; + fullName = "mime-*"; + hash = "60120b9859a92a94480a76327a9406b4a72a34f2317bc7fa33dcb99b9c72678a"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "mime"; + version = "1.2.6"; + fullName = "mime-1.2.6"; + hash = "7460134d6b4686d64fd1e7b878d34e2bdd258ad29b6665cf62e6d92659e81591"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "mime"; + version = "1.2.9"; + fullName = "mime-1.2.9"; + hash = "60120b9859a92a94480a76327a9406b4a72a34f2317bc7fa33dcb99b9c72678a"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "mime"; + version = "1.2.9"; + fullName = "mime-~1.2.2"; + hash = "60120b9859a92a94480a76327a9406b4a72a34f2317bc7fa33dcb99b9c72678a"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "mime"; + version = "1.2.9"; + fullName = "mime-~1.2.7"; + hash = "60120b9859a92a94480a76327a9406b4a72a34f2317bc7fa33dcb99b9c72678a"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "mime"; + version = "1.2.9"; + fullName = "mime-~1.2.9"; + hash = "60120b9859a92a94480a76327a9406b4a72a34f2317bc7fa33dcb99b9c72678a"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "minimatch"; + version = "0.2.12"; + fullName = "minimatch-0"; + hash = "205cff8b4ba926e86ff0e6f7f566553906113892028083ea221989a42500c246"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "lru-cache"; range = "2"; } + { name = "sigmund"; range = "~1.0.0"; } + ]; + } + { + baseName = "minimatch"; + version = "0.2.12"; + fullName = "minimatch-~0.2.11"; + hash = "205cff8b4ba926e86ff0e6f7f566553906113892028083ea221989a42500c246"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "lru-cache"; range = "2"; } + { name = "sigmund"; range = "~1.0.0"; } + ]; + } + { + baseName = "mkdirp"; + version = "0.3.5"; + fullName = "mkdirp-0"; + hash = "8ae9c5107acb41110106224f5e7be2b50b00d15d062ea7941301c111b863fd26"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "mkdirp"; + version = "0.3.5"; + fullName = "mkdirp-0.3"; + hash = "8ae9c5107acb41110106224f5e7be2b50b00d15d062ea7941301c111b863fd26"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "mkdirp"; + version = "0.3.0"; + fullName = "mkdirp-0.3.0"; + hash = "708366e3a89c976ae8418056f2c5f784147b9310e8093f9bb7246d2f55f7c27d"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "mkdirp"; + version = "0.3.3"; + fullName = "mkdirp-0.3.3"; + hash = "b67a12855b7522c3cfb767e36b95f4eaaf9d423c5bd01f7f0449172259957df9"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "mkdirp"; + version = "0.3.4"; + fullName = "mkdirp-0.3.4"; + hash = "f87444f2376c56bf47846f3b885aae926c5d9504328923b166794b78c0e08425"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "mocha"; + version = "1.10.0"; + fullName = "mocha-*"; + hash = "d19c4fdcddb6498d0f303c3e5fd85401888a269f36ccdfcc92763dcc9e80bf97"; + patchLatest = false; + topLevel = true; + dependencies = [ + { name = "commander"; range = "0.6.1"; } + { name = "growl"; range = "1.7.x"; } + { name = "jade"; range = "0.26.3"; } + { name = "diff"; range = "1.0.2"; } + { name = "debug"; range = "*"; } + { name = "mkdirp"; range = "0.3.3"; } + { name = "ms"; range = "0.3.0"; } + { name = "glob"; range = "3.2.1"; } + ]; + } + { + baseName = "ms"; + version = "0.3.0"; + fullName = "ms-0.3.0"; + hash = "f72eab0186a6dabbbea7118f83d4e2c01119e427f6671096a0c7ed522abe07f2"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "mv"; + version = "0.0.5"; + fullName = "mv-0.0.5"; + hash = "6ddbf4770ffd02170a8fc492cee418ad92ce2f1e2eb4c549febac1f60e6533b9"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "negotiator"; + version = "0.2.5"; + fullName = "negotiator-0.2.5"; + hash = "37f567acba03ef7748802c4f6b41ca7e57a3fb556c4435cda515028c73d76542"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "nijs"; + version = "0.0.5"; + fullName = "nijs-*"; + hash = "c5e9f93f240757e1ab2d0ad341384db6e0b73ab2616ae9832d1ed772eaebd408"; + patchLatest = false; + topLevel = true; + dependencies = [ + { name = "optparse"; range = ">= 1.0.3"; } + ]; + } + { + baseName = "node-expat"; + version = "2.0.0"; + fullName = "node-expat-*"; + hash = "9d5b7efd708fc546f5c17e98f4ee322abafaaa02fbb6c281f651d10d9523c83f"; + patchLatest = false; + topLevel = true; + dependencies = [ + ]; + } + { + baseName = "node-gyp"; + version = "0.9.6"; + fullName = "node-gyp-*"; + hash = "937090ffd7de10079861ef562d0282dd4100873aa7bba7de9cd6ea7982b41b0b"; + patchLatest = false; + topLevel = true; + dependencies = [ + { name = "glob"; range = "3"; } + { name = "graceful-fs"; range = "1"; } + { name = "fstream"; range = "0"; } + { name = "minimatch"; range = "0"; } + { name = "mkdirp"; range = "0"; } + { name = "nopt"; range = "2"; } + { name = "npmlog"; range = "0"; } + { name = "osenv"; range = "0"; } + { name = "request"; range = ">= 2 && <= 2.14"; } + { name = "rimraf"; range = "2"; } + { name = "semver"; range = "1"; } + { name = "tar"; range = "0"; } + { name = "which"; range = "1"; } + ]; + } + { + baseName = "node-uuid"; + version = "1.4.0"; + fullName = "node-uuid-*"; + hash = "87a1944b5334351ddd1d3e44d2e423ebfc027e858111efb72324054092cfd1bc"; + patchLatest = false; + topLevel = true; + dependencies = [ + ]; + } + { + baseName = "node-uuid"; + version = "1.2.0"; + fullName = "node-uuid-1.2.0"; + hash = "96d3ce178ea0825d27a855630de74243a577dc988512512eea572829b208a3d2"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "node-uuid"; + version = "1.3.3"; + fullName = "node-uuid-1.3.3"; + hash = "a3fbccc904944a9c8eadc59e55aaac908cc458569f539b50077d9672a84587a8"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "node-uuid"; + version = "1.4.0"; + fullName = "node-uuid-1.4.0"; + hash = "87a1944b5334351ddd1d3e44d2e423ebfc027e858111efb72324054092cfd1bc"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "node-uuid"; + version = "1.4.0"; + fullName = "node-uuid-~1.4.0"; + hash = "87a1944b5334351ddd1d3e44d2e423ebfc027e858111efb72324054092cfd1bc"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "nopt"; + version = "2.1.1"; + fullName = "nopt-2"; + hash = "a7a84f3fe51cb8fb97c678bc73130b53d6782ee90dc0e9b15ae39630ce2fa203"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "abbrev"; range = "1"; } + ]; + } + { + baseName = "nopt"; + version = "2.0.0"; + fullName = "nopt-2.0.0"; + hash = "112e9bea8b745a2e5a59d239e6f6f02e720e080ab8cdca89b6b8f0143ae718b5"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "abbrev"; range = "1"; } + ]; + } + { + baseName = "npm2nix"; + version = "1.2.0"; + fullName = "npm2nix-*"; + hash = "b79bd319e4030704bb41078dbbec0db9eebb984966c6bd3cad55ba4c76ec622c"; + patchLatest = false; + topLevel = true; + dependencies = [ + { name = "semver"; range = "1"; } + ]; + } + { + baseName = "npmlog"; + version = "0.0.2"; + fullName = "npmlog-0"; + hash = "ce98d4d3380390c0259695cce407e2e96d2970c5caee1461a62ecbd38e8caed4"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "ansi"; range = "~0.1.2"; } + ]; + } + { + baseName = "oauth-sign"; + version = "0.3.0"; + fullName = "oauth-sign-~0.3.0"; + hash = "a202acb9ea84ef53e6a82a6ee5113328cd4bfd68d6ba04d15f1da933660b087e"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "once"; + version = "1.1.1"; + fullName = "once-1.1.1"; + hash = "3fdc1a246f2522991fd9a6554a93c012c3192ea99918fdd893a2d4f2d546fe93"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "optimist"; + version = "0.5.0"; + fullName = "optimist-*"; + hash = "b0c4b65a456618f179946e0b0641643b9d70ea5d884afa5bbf94419f740b1ccf"; + patchLatest = false; + topLevel = true; + dependencies = [ + { name = "wordwrap"; range = "~0.0.2"; } + ]; + } + { + baseName = "optparse"; + version = "1.0.4"; + fullName = "optparse-*"; + hash = "8413ed6a2318ffecdb428181a6966013d1853ff62644afcbcff682c1efc9367a"; + patchLatest = false; + topLevel = true; + dependencies = [ + ]; + } + { + baseName = "optparse"; + version = "1.0.4"; + fullName = "optparse->= 1.0.3"; + hash = "8413ed6a2318ffecdb428181a6966013d1853ff62644afcbcff682c1efc9367a"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "osenv"; + version = "0.0.3"; + fullName = "osenv-0"; + hash = "aafbb23637b7338c9025f9da336f31f96674d7926c30f209e4d93ce16d5251c4"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "pause"; + version = "0.0.1"; + fullName = "pause-0.0.1"; + hash = "d37b84046db0c28c9768be649e8f02bd991ede34b276b5dba7bade23b523235e"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "posix-getopt"; + version = "1.0.0"; + fullName = "posix-getopt-1.0.0"; + hash = "134cea188854422ab047db9ebfcb7e2610f0a239fe27382b55c10894c4f5ba9d"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "qs"; + version = "0.5.5"; + fullName = "qs-0.5.5"; + hash = "8ed820b83bf4aff299422dc406c7a52793e05f510803cc1cc2da7de1528837f1"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "qs"; + version = "0.6.5"; + fullName = "qs-0.6.5"; + hash = "293e5dfd16bfe0aee8b3fe130abb951ac9c8c084d1103f7d81c4e5c312b2940d"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "qs"; + version = "0.6.5"; + fullName = "qs-~0.6.0"; + hash = "293e5dfd16bfe0aee8b3fe130abb951ac9c8c084d1103f7d81c4e5c312b2940d"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "range-parser"; + version = "0.0.4"; + fullName = "range-parser-0.0.4"; + hash = "8e1bcce3544330b51644ea0cb4d25f0daa4b43008a75da27e285635f4ac4b1ce"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "rbytes"; + version = "0.0.2"; + fullName = "rbytes-*"; + hash = "0fd4697be996ee12c65f8fb13b2edc7a554d22c31d1a344539bc611ce73b69aa"; + patchLatest = false; + topLevel = true; + dependencies = [ + ]; + } + { + baseName = "readable-stream"; + version = "1.0.2"; + fullName = "readable-stream-~1.0.2"; + hash = "45a918b25f0799f87d7144dbbb7d2b5974dc079fcb1a2149a305d080f1155754"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "request"; + version = "2.12.0"; + fullName = "request->= 2 && <= 2.14"; + hash = "a26790d2179da11a644d5deaa2ae5d37472bf0e73355fde02ea5923106308997"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "form-data"; range = "~0.0.3"; } + { name = "mime"; range = "~1.2.7"; } + ]; + } + { + baseName = "request"; + version = "2.21.0"; + fullName = "request-~2"; + hash = "fe31c3119bc4423f07aa7c9849cb642d5ad22bdf2a2700eab56fb83fa8ed429c"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "qs"; range = "~0.6.0"; } + { name = "json-stringify-safe"; range = "~4.0.0"; } + { name = "forever-agent"; range = "~0.5.0"; } + { name = "tunnel-agent"; range = "~0.3.0"; } + { name = "http-signature"; range = "~0.9.11"; } + { name = "hawk"; range = "~0.13.0"; } + { name = "aws-sign"; range = "~0.3.0"; } + { name = "oauth-sign"; range = "~0.3.0"; } + { name = "cookie-jar"; range = "~0.3.0"; } + { name = "node-uuid"; range = "~1.4.0"; } + { name = "mime"; range = "~1.2.9"; } + { name = "form-data"; range = "0.0.8"; } + ]; + } + { + baseName = "restify"; + version = "2.4.1"; + fullName = "restify-2.4.1"; + hash = "b46ed86ef17f1896a4dd961de8cc8ec96b57b7f44ef7421f3804764289f5b563"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "assert-plus"; range = "0.1.2"; } + { name = "backoff"; range = "2.1.0"; } + { name = "bunyan"; range = "0.21.1"; } + { name = "deep-equal"; range = "0.0.0"; } + { name = "formidable"; range = "1.0.13"; } + { name = "http-signature"; range = "0.9.11"; } + { name = "keep-alive-agent"; range = "0.0.1"; } + { name = "lru-cache"; range = "2.3.0"; } + { name = "mime"; range = "1.2.9"; } + { name = "negotiator"; range = "0.2.5"; } + { name = "node-uuid"; range = "1.4.0"; } + { name = "once"; range = "1.1.1"; } + { name = "qs"; range = "0.5.5"; } + { name = "semver"; range = "1.1.4"; } + { name = "spdy"; range = "1.7.1"; } + { name = "verror"; range = "1.3.6"; } + { name = "dtrace-provider"; range = "0.2.8"; } + ]; + } + { + baseName = "rimraf"; + version = "2.1.4"; + fullName = "rimraf-2"; + hash = "093154365aab3c09aea8e83dda7c5a7fd785c787ebbf1fcdc415cb5f74d1acac"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "graceful-fs"; range = "~1"; } + ]; + } + { + baseName = "s3http"; + version = "0.0.1"; + fullName = "s3http-*"; + hash = "7140a0ee6df9fb90fd74aa0b68b73f899c6d8e2eaa2de89fde3f634e9bf10dba"; + patchLatest = false; + topLevel = true; + dependencies = [ + { name = "aws-sdk"; range = "0.9.7-pre.8"; } + { name = "commander"; range = "0.5.1"; } + { name = "http-auth"; range = "1.2.7"; } + ]; + } + { + baseName = "sax"; + version = "0.5.2"; + fullName = "sax-0.5.2"; + hash = "6bb7cd44e9dfea598997d4ba9d3279dafe75bed7b45904561ca9eb4d85cfd953"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "sax"; + version = "0.5.4"; + fullName = "sax->=0.4.2"; + hash = "5c4f074b559f56a7170663142e4ccbcf8cbef229ad7eb787b6c6e0b79ddb936a"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "semver"; + version = "1.1.4"; + fullName = "semver-*"; + hash = "59c0180521d0d4cee57caa5f6ef190500b04099bfa5786edb3e21e364ae8e989"; + patchLatest = false; + topLevel = true; + dependencies = [ + ]; + } + { + baseName = "semver"; + version = "1.1.4"; + fullName = "semver-1"; + hash = "59c0180521d0d4cee57caa5f6ef190500b04099bfa5786edb3e21e364ae8e989"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "semver"; + version = "1.1.4"; + fullName = "semver-1.1.4"; + hash = "59c0180521d0d4cee57caa5f6ef190500b04099bfa5786edb3e21e364ae8e989"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "send"; + version = "0.1.0"; + fullName = "send-0.1.0"; + hash = "28b5a6ec41b5072521eb792cc901b92cdbb6b743c578d7008727dbbd3eb717de"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "debug"; range = "*"; } + { name = "mime"; range = "1.2.6"; } + { name = "fresh"; range = "0.1.0"; } + { name = "range-parser"; range = "0.0.4"; } + ]; + } + { + baseName = "sigmund"; + version = "1.0.0"; + fullName = "sigmund-~1.0.0"; + hash = "ddf823295db284ac4720b9d40f381d7375dc0b05881b98269346b33fe9835e25"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "smartdc"; + version = "7.0.0-rc2"; + fullName = "smartdc-*"; + hash = "239433d13dbbfd6461cf34743d628bdb39d061ca562e15901528acc52dda8d46"; + patchLatest = false; + topLevel = true; + dependencies = [ + { name = "assert-plus"; range = "0.1.2"; } + { name = "lru-cache"; range = "2.2.0"; } + { name = "nopt"; range = "2.0.0"; } + { name = "restify"; range = "2.4.1"; } + { name = "bunyan"; range = "0.21.1"; } + { name = "clone"; range = "0.1.6"; } + { name = "smartdc-auth"; range = "1.0.0"; } + ]; + } + { + baseName = "smartdc-auth"; + version = "1.0.0"; + fullName = "smartdc-auth-1.0.0"; + hash = "7611510ac66507398f6e371b25068c7ad193ecd69a3031fdfca0e3c652cfdcbf"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "assert-plus"; range = "0.1.2"; } + { name = "clone"; range = "0.1.5"; } + { name = "ssh-agent"; range = "0.2.1"; } + { name = "once"; range = "1.1.1"; } + { name = "vasync"; range = "1.3.3"; } + ]; + } + { + baseName = "sntp"; + version = "0.2.4"; + fullName = "sntp-0.2.x"; + hash = "1f91a8d60fd48751e4b169885f530012ce2a8223ed29006abcee175f2b10d779"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "hoek"; range = "0.9.x"; } + ]; + } + { + baseName = "sockjs"; + version = "0.3.7"; + fullName = "sockjs-*"; + hash = "711a6c41e6a7b2a9cd0dc44abc7407f09729d400be450d94887391997b07a1a5"; + patchLatest = false; + topLevel = true; + dependencies = [ + { name = "node-uuid"; range = "1.3.3"; } + { name = "faye-websocket"; range = "0.4.4"; } + ]; + } + { + baseName = "source-map"; + version = "0.1.22"; + fullName = "source-map-*"; + hash = "6ebe1b2b3c730e5e206a34a25192aa43307b84dfe3aaaafd71c5c6b6a02a4700"; + patchLatest = false; + topLevel = true; + dependencies = [ + { name = "amdefine"; range = ">=0.0.4"; } + ]; + } + { + baseName = "spdy"; + version = "1.7.1"; + fullName = "spdy-1.7.1"; + hash = "d90516bb6b6cf39fb52face8ec332be98de116ce84d7d400fbb19529a30fa678"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "ssh-agent"; + version = "0.2.1"; + fullName = "ssh-agent-0.2.1"; + hash = "b420d5816d4a8a242a8d1454f064954eab8fec9856310e867a2e7f1b2432f934"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "ctype"; range = "0.5.0"; } + { name = "posix-getopt"; range = "1.0.0"; } + ]; + } + { + baseName = "stream-counter"; + version = "0.1.0"; + fullName = "stream-counter-~0.1.0"; + hash = "8c51bd894bf905ec607654a1d7d3fe4fdc4763ccec4d37723cb8d0a0fd7cb69c"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "readable-stream"; range = "~1.0.2"; } + ]; + } + { + baseName = "swig"; + version = "0.13.5"; + fullName = "swig-*"; + hash = "d1cc435c623829e5672df45c14a878304a41bec2b2c6b2a13bb956aeed22d1c9"; + patchLatest = false; + topLevel = true; + dependencies = [ + { name = "underscore"; range = ">=1.1.7"; } + ]; + } + { + baseName = "tar"; + version = "0.1.17"; + fullName = "tar-0"; + hash = "577832975440eba0a9293244d53fa2c383e5c27ec2f68e3defde0cc23910b978"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "inherits"; range = "1.x"; } + { name = "block-stream"; range = "*"; } + { name = "fstream"; range = "~0.1.8"; } + ]; + } + { + baseName = "temp"; + version = "0.5.0"; + fullName = "temp-*"; + hash = "082285c060c7519b9d8a6dbc1a51e3caa7de43a807d3f7cec4eab220ad1207be"; + patchLatest = false; + topLevel = true; + dependencies = [ + ]; + } + { + baseName = "tunnel-agent"; + version = "0.3.0"; + fullName = "tunnel-agent-~0.3.0"; + hash = "5b23c1d29e85143e213ba5aca118419ab42d25774da92e816074a73f423bcabd"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "underscore"; + version = "1.4.4"; + fullName = "underscore-*"; + hash = "a848a28193850d58d7b98249d70844bc7f35a7d8b6b5ed75e08e829aa6e763d3"; + patchLatest = false; + topLevel = true; + dependencies = [ + ]; + } + { + baseName = "underscore"; + version = "1.4.4"; + fullName = "underscore->=1.1.7"; + hash = "a848a28193850d58d7b98249d70844bc7f35a7d8b6b5ed75e08e829aa6e763d3"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "underscore"; + version = "1.4.4"; + fullName = "underscore->=1.4.3"; + hash = "a848a28193850d58d7b98249d70844bc7f35a7d8b6b5ed75e08e829aa6e763d3"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "util"; + version = "0.4.9"; + fullName = "util->= 0.4.9"; + hash = "30ecc26c9e749650562c1ef20bc3f1a0d8d7c109134b510be34526d1ceae90e5"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "events.node"; range = ">= 0.4.0"; } + ]; + } + { + baseName = "vasync"; + version = "1.3.3"; + fullName = "vasync-1.3.3"; + hash = "603d15b81e25b6a634d7ff2025487b3460a60d0d7e1a1ed02e66faff5ef7b699"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "jsprim"; range = "0.3.0"; } + { name = "verror"; range = "1.1.0"; } + ]; + } + { + baseName = "verror"; + version = "1.1.0"; + fullName = "verror-1.1.0"; + hash = "ac0fc2dfbcdfc3440c281cf272d902ec74bf2abdf2f9c9eb5c0c3505dc6646d7"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "extsprintf"; range = "1.0.0"; } + ]; + } + { + baseName = "verror"; + version = "1.3.3"; + fullName = "verror-1.3.3"; + hash = "9b3e9307cb5a788c1a4c6706ed32582893ffcd64dc55a14a153be1ea15bb916a"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "extsprintf"; range = "1.0.0"; } + ]; + } + { + baseName = "verror"; + version = "1.3.6"; + fullName = "verror-1.3.6"; + hash = "96135dd5fef7b75bfe26513658ca3fc1ab38e17a9bec522fc5ec6e54b6b63f89"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "extsprintf"; range = "1.0.2"; } + ]; + } + { + baseName = "websocket-driver"; + version = "0.2.1"; + fullName = "websocket-driver->=0.2.0"; + hash = "8aab2b32695fecd2bca57d95bc51f0eb8a9a5bb298187a8fe3a84cd2cd8e3dc7"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "which"; + version = "1.0.5"; + fullName = "which-1"; + hash = "e26f39d7b152c700636472ab4da57bfb9af17972c49a9e2a06f9ff347d8fad42"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "wordwrap"; + version = "0.0.2"; + fullName = "wordwrap-~0.0.2"; + hash = "66a2fa688509738922c3ad62a6159fe3c93268bd3bca2bff24df4bc02cc31582"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "wu"; + version = "0.1.8"; + fullName = "wu-*"; + hash = "2400d0ca7da862a9063a6a8d914bb4e585f81a5121b0fda8e40b1f6e782c72c6"; + patchLatest = false; + topLevel = true; + dependencies = [ + ]; + } + { + baseName = "xml2js"; + version = "0.2.4"; + fullName = "xml2js-0.2.4"; + hash = "8daebb075fc7c564d84221a0cef7825ac824db8e312f873daee59a6adf38da28"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "sax"; range = ">=0.4.2"; } + ]; + } + { + baseName = "xml2js"; + version = "0.2.7"; + fullName = "xml2js-0.2.x"; + hash = "ab3ae8402a8af36d93e1aa6e83102e365b82f03e605d1b8b8361dacc95e52397"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "sax"; range = "0.5.2"; } + ]; + } + { + baseName = "xmlbuilder"; + version = "0.4.2"; + fullName = "xmlbuilder-*"; + hash = "3137e5bf9db1f114767f8ba56be753f2a9f512e38a2df64d7677ae3c9318a0fe"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } +] diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json new file mode 100644 index 000000000000..516754fdef52 --- /dev/null +++ b/pkgs/top-level/node-packages.json @@ -0,0 +1,36 @@ +[ + "async" +, "assert" +, "mocha" +, "jayschema" +, "underscore" +, "extend" +, "express" +, "s3http" +, "aws-sdk" +, "nijs" +, "amdefine" +, "smartdc" +, "optparse" +, "jsontool" +, "swig" +, "coffee-script" +, "escape-html" +, "buffertools" +, "wu" +, "source-map" +, "knox" +, "node-expat" +, "optimist" +, "temp" +, "faye-websocket" +, "node-uuid" +, "rbytes" +, "sockjs" +, "backbone" +, "browserchannel" +, "node-gyp" +, "semver" +, "npm2nix" +, "ansi-remover" +] diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix index 01cebccf1bcf..e38cd3e69364 100644 --- a/pkgs/top-level/node-packages.nix +++ b/pkgs/top-level/node-packages.nix @@ -1,1780 +1,48 @@ { pkgs, stdenv, nodejs, fetchurl, neededNatives }: -let self = { - buildNodePackage = import ../development/web/nodejs/build-node-package.nix { - inherit stdenv nodejs neededNatives; - inherit (pkgs) runCommand; - }; - - patchLatest = srcAttrs: - let src = fetchurl srcAttrs; in - pkgs.runCommand src.name {} '' - mkdir unpack - cd unpack - tar xf ${src} - mv */ package 2>/dev/null || true - sed -i -e "s/: \"latest\"/: \"*\"/" package/package.json - tar cf $out * - ''; - - "abbrev" = self."abbrev-1"; - - "abbrev-1" = self.buildNodePackage rec { - name = "abbrev-1.0.4"; - src = fetchurl { - url = "http://registry.npmjs.org/abbrev/-/${name}.tgz"; - sha256 = "8dc0f480571a4a19e74f1abd4f31f6a70f94953d1ccafa16ed1a544a19a6f3a8"; - }; - deps = [ - - ]; - }; - - "active-x-obfuscator" = self."active-x-obfuscator-0.0.1"; - - "active-x-obfuscator-0.0.1" = self.buildNodePackage rec { - name = "active-x-obfuscator-0.0.1"; - src = fetchurl { - url = "http://registry.npmjs.org/active-x-obfuscator/-/${name}.tgz"; - sha256 = "069cc18a0e7790ec106b267d28b47c691220f119a8daec925dd47f06866ce1c6"; - }; - deps = [ - self."zeparser-0.0.5" - ]; - }; - - amdefine = "amdefine-0.0.4"; - - "amdefine->=0.0.4" = self."amdefine-0.0.4"; - - "amdefine-0.0.4" = self.buildNodePackage rec { - name = "amdefine-0.0.4"; - src = fetchurl { - url = "http://registry.npmjs.org/amdefine/-/${name}.tgz"; - sha256 = "10sdb85mb6fvkglqwg7icdh58sng9pm8655npmsbv18gsbcnmbg4"; - }; - deps = [ - - ]; - }; - - "ansi" = self."ansi-~0.1.2"; - - "ansi-~0.1.2" = self.buildNodePackage rec { - name = "ansi-0.1.2"; - src = fetchurl { - url = "http://registry.npmjs.org/ansi/-/${name}.tgz"; - sha256 = "6f2288b1db642eb822578f4ee70bf26bf97173cc7d3f10f496070fb96250006b"; - }; - deps = [ - - ]; - }; - - "asn1" = self."asn1-0.1.11"; - - "asn1-0.1.11" = self.buildNodePackage rec { - name = "asn1-0.1.11"; - src = fetchurl { - url = "http://registry.npmjs.org/asn1/-/${name}.tgz"; - sha256 = "7206eadc8a9344e484bcce979e22a12c9fa64c1395aa0544b8b767808b268f43"; - }; - deps = [ - - ]; - }; - - "async" = self."async-0.1.22"; - - "async-0.1.22" = self.buildNodePackage rec { - name = "async-0.1.22"; - src = fetchurl { - url = "http://registry.npmjs.org/async/-/${name}.tgz"; - sha256 = "6fd2750cd519a754b0e32ef3423e64768055129e00a95d9297005bda29fdef18"; - }; - deps = [ - - ]; - }; - - "aws-sdk" = self."aws-sdk-*"; - - "aws-sdk-git" = self.buildNodePackage rec { - name = "aws-sdk-0.9.8-pre7b687a0c262ac129fd6eaffeb02de09ee7e6a87c"; - src = self.patchLatest { - url = "https://github.com/aws/aws-sdk-js/archive/7b687a0c262ac129fd6eaffeb02de09ee7e6a87c.tar.gz"; - sha256 = "1pn43wxi3xz4kjyxf8j7zil5frhd1zpqja8szamgll2pxxnpnr3i"; - name = "${name}.tgz"; - }; - deps = [ - self."xml2js-0.2.4" - self."xmlbuilder" - ]; - }; - - "aws-sdk-*" = self.buildNodePackage rec { - name = "aws-sdk-0.9.7-pre.8"; - src = self.patchLatest { - url = "http://registry.npmjs.org/aws-sdk/-/${name}.tgz"; - sha256 = "d3854275981fff76153f79c62745d8d6c59018861729766908c920fff95ea422"; - }; - deps = [ - self."xml2js-0.2.4" - self."xmlbuilder" - ]; - }; - - "backbone" = self."backbone-0.9.2"; - - "backbone-0.9.2" = self.buildNodePackage rec { - name = "backbone-0.9.2"; - src = fetchurl { - url = "http://registry.npmjs.org/backbone/-/${name}.tgz"; - sha256 = "0a5ebc8d32949ea2870a684e8430a8b4dec75a163ecf2740eb5fb4865393bb32"; - }; - deps = [ - self."underscore->=1.3.1" - ]; - }; - - "bindings" = self."bindings-1"; - - "bindings-1" = self.buildNodePackage rec { - name = "bindings-1.0.0"; - src = fetchurl { - url = "http://registry.npmjs.org/bindings/-/${name}.tgz"; - sha256 = "cb211ac856d135af5ee864762fae9e554225a613ea1fd815c20b8fdd1679c9ed"; - }; - deps = [ - - ]; - }; - - "block-stream" = self."block-stream-*"; - - "block-stream-*" = self.buildNodePackage rec { - name = "block-stream-0.0.6"; - src = fetchurl { - url = "http://registry.npmjs.org/block-stream/-/${name}.tgz"; - sha256 = "2fc365b42b8601c8ee150d453f6cc762a01054b7fb28bdfcfcbce7c97e93601b"; - }; - deps = [ - self."inherits-~1.0.0" - ]; - }; - - "browserchannel" = self."browserchannel-0.4.1"; - - "browserchannel-0.4.1" = self.buildNodePackage rec { - name = "browserchannel-0.4.1"; - src = fetchurl { - url = "http://registry.npmjs.org/browserchannel/-/${name}.tgz"; - sha256 = "f5d038347cee6802bb6f30f53bcf2adf196d241505b77ffca3d5f8a76a109c5f"; - }; - deps = [ - self."coffee-script-~1" - self."hat" - self."connect-~1.7" - self."timerstub" - self."request-~2" - ]; - }; - - "bson" = self."bson-0.1.5"; - - "bson-0.1.5" = self.buildNodePackage rec { - name = "bson-0.1.5"; - src = fetchurl { - url = "http://registry.npmjs.org/bson/-/${name}.tgz"; - sha256 = "58af4a1697b015190b40c2a7e5743f9d4494887ef98dfe2f58f24c70f2d31150"; - }; - deps = [ - - ]; - }; - - "buffer-crc32" = self."buffer-crc32-0.2.1"; - - "buffer-crc32-0.2.1" = self.buildNodePackage rec { - name = "buffer-crc32-0.2.1"; - src = fetchurl { - url = "http://registry.npmjs.org/buffer-crc32/-/${name}.tgz"; - sha256 = "b6ea96d57411e37c15e18fb8ca600656399912ce16355f9af3c662f765507f01"; - }; - deps = [ - - ]; - }; - - "buffertools" = self."buffertools-~1"; - - "buffertools-~1" = self.buildNodePackage rec { - name = "buffertools-1.1.0"; - src = fetchurl { - url = "http://registry.npmjs.org/buffertools/-/${name}.tgz"; - sha256 = "a0520dbf39eedbd8c685ac4989bf822ac57cc161924abf82ba567234620380a5"; - }; - deps = [ - - ]; - }; - - "bunyan" = self."bunyan-0.8.0"; - - "bunyan-0.8.0" = self.buildNodePackage rec { - name = "bunyan-0.8.0"; - src = fetchurl { - url = "http://registry.npmjs.org/bunyan/-/${name}.tgz"; - sha256 = "059b8948dd34d371d39aa87227d26d62180c365afeb6625c07187c8f0ad29f27"; - }; - deps = [ - - ]; - }; - - "byline" = self."byline-2.0.2"; - - "byline-2.0.2" = self.buildNodePackage rec { - name = "byline-2.0.2"; - src = fetchurl { - url = "http://registry.npmjs.org/byline/-/${name}.tgz"; - sha256 = "a916ffde5ee385f7d682c13028907a96fe33cdeed6d72cea903d09fb154dae50"; - }; - deps = [ - - ]; - }; - - "bytes" = self."bytes-0.2.0"; - - "bytes-0.2.0" = self.buildNodePackage rec { - name = "bytes-0.2.0"; - src = fetchurl { - url = "http://registry.npmjs.org/bytes/-/${name}.tgz"; - sha256 = "e70bd4dccc886a5cf1c925092b4acd7a262a9da3e1b51ccde10a3fcd0a328465"; - }; - deps = [ - - ]; - }; - - "bytes-0.1.0" = self.buildNodePackage rec { - name = "bytes-0.1.0"; - src = fetchurl { - url = "http://registry.npmjs.org/bytes/-/${name}.tgz"; - sha256 = "32954618600f6566ecd95aec0ea0ae3318a1b4a29bf6a7970462c29a843bf701"; - }; - deps = [ - - ]; - }; - - "cipher-block-size" = self."cipher-block-size-0.0.0"; - - "cipher-block-size-0.0.0" = self.buildNodePackage rec { - name = "cipher-block-size-0.0.0"; - src = fetchurl { - url = https://bitbucket.org/shlevy/node-cipher-block-size/get/0.0.0.tar.gz; - sha256 = "0j4i19ckb9ab9aqd4w3j0vrvcw7c6icq279x4fx8xs1h9massxng"; - name = "${name}.tgz"; - }; - deps = [ - self."bindings-1" - ]; - buildInputs = [ - pkgs.openssl - ]; - }; - - "coffee-script" = self."coffee-script-1.4.0"; - "coffee-script-~1" = self."coffee-script-1.4.0"; - - "coffee-script-~1.1.2" = self.buildNodePackage rec { - name = "coffee-script-1.1.3"; - src = fetchurl { - url = "http://registry.npmjs.org/coffee-script/-/${name}.tgz"; - sha256 = "3b431da901f753bde0ab26245c7111e1e4b8be1bba0086cf4a7470d739acae87"; - }; - deps = [ - - ]; - }; - - "coffee-script-1.3.3" = self.buildNodePackage rec { - name = "coffee-script-1.3.3"; - src = fetchurl { - url = "http://registry.npmjs.org/coffee-script/-/${name}.tgz"; - sha256 = "deedd2cf9d5abe2bad724e6809bec40efa07215dae85f44d78cd37736bb50bc5"; - }; - deps = [ - - ]; - }; - - "coffee-script-1.4.0" = self.buildNodePackage rec { - name = "coffee-script-1.4.0"; - src = fetchurl { - url = "http://registry.npmjs.org/coffee-script/-/${name}.tgz"; - sha256 = "146e8985d89210b63dae83378fd851ccf54d38d7d11cadcdca01520d50882613"; - }; - deps = [ - - ]; - }; - - "commander" = self."commander-~0.6.1"; - - "commander-0.5.1" = self.buildNodePackage rec { - name = "commander-0.5.1"; - src = fetchurl { - url = "http://registry.npmjs.org/commander/-/${name}.tgz"; - sha256 = "91042851d0731b28a5e7c342e5cbce7723a7243d31ae378fa86c45ca9493a924"; - }; - deps = [ - - ]; - }; - - "commander-~0.6.1" = self.buildNodePackage rec { - name = "commander-0.6.1"; - src = fetchurl { - url = "http://registry.npmjs.org/commander/-/${name}.tgz"; - sha256 = "7b7fdd1bc4d16f6776169a64f133d629efe2e3a7cd338b1d0884ee909abbd729"; - }; - deps = [ - - ]; - }; - - "connect" = self."connect-2.7.7"; - - "connect-2.7.7" = self.buildNodePackage rec { - name = "connect-2.7.7"; - src = fetchurl { - url = "http://registry.npmjs.org/connect/-/${name}.tgz"; - sha256 = "e4cf5b03c051d9b4b0e27a76ec76da0b8ca38d0e4ce1d8ba8c4c3b3caac7b032"; - }; - deps = [ - self."qs-0.6.1" - self."formidable-1.0.13" - self."cookie-signature-1.0.1" - self."buffer-crc32-0.2.1" - self."cookie-0.0.5" - self."send-0.1.0" - self."bytes-0.2.0" - self."fresh-0.1.0" - self."pause-0.0.1" - self."debug" - ]; - }; - - "connect-~1.7" = self.buildNodePackage rec { - name = "connect-1.7.3"; - src = fetchurl { - url = "http://registry.npmjs.org/connect/-/${name}.tgz"; - sha256 = "773fd6ca8c90e33cc28d012fb3d72d66eb99114b20d88228330458628f030d12"; - }; - deps = [ - self."qs->= 0.3.1" - self."mime->= 0.0.1" - ]; - }; - - "connect-2.4.4" = self.buildNodePackage rec { - name = "connect-2.4.4"; - src = fetchurl { - url = "http://registry.npmjs.org/connect/-/${name}.tgz"; - sha256 = "1f474ca9db05b9d58f3469ad4932722e49bec1f6ec35665ddea09155382914e9"; - }; - deps = [ - self."qs-0.4.2" - self."formidable-1.0.11" - self."crc-0.2.0" - self."cookie-0.0.4" - self."bytes-0.1.0" - self."send-0.0.4" - self."fresh-0.1.0" - self."pause-0.0.1" - self."debug" - ]; - }; - - "cookie" = self."cookie-0.0.5"; - - "cookie-0.0.5" = self.buildNodePackage rec { - name = "cookie-0.0.5"; - src = fetchurl { - url = "http://registry.npmjs.org/cookie/-/${name}.tgz"; - sha256 = "17938b21dcd85f09994b85484abb5aeddc4e92c61d1b599b764bbaaa7ad6adee"; - }; - deps = [ - - ]; - }; - - "cookie-0.0.4" = self.buildNodePackage rec { - name = "cookie-0.0.4"; - src = fetchurl { - url = "http://registry.npmjs.org/cookie/-/${name}.tgz"; - sha256 = "a917477c448a6a91ef73d550d8d8a6d4864e8fbd247b6f73baaca66c9bfc3b0b"; - }; - deps = [ - - ]; - }; - - "cookie-signature" = self."cookie-signature-1.0.1"; - - "cookie-signature-1.0.1" = self.buildNodePackage rec { - name = "cookie-signature-1.0.1"; - src = fetchurl { - url = "http://registry.npmjs.org/cookie-signature/-/${name}.tgz"; - sha256 = "e2ea4f290fdcfe82d8fb76991fee4106d4ae1f5d5a2f8b8d91442e047c538c8e"; - }; - deps = [ - - ]; - }; - - "crc" = self."crc-0.2.0"; - - "crc-0.2.0" = self.buildNodePackage rec { - name = "crc-0.2.0"; - src = fetchurl { - url = "http://registry.npmjs.org/crc/-/${name}.tgz"; - sha256 = "027c180bbbddd0960e6000f7ef60623997dfa61b3c2ef141acf00c29a1763b5d"; - }; - deps = [ - - ]; - }; - - "cssmin" = self."cssmin-0.3.1"; - - "cssmin-0.3.1" = self.buildNodePackage rec { - name = "cssmin-0.3.1"; - src = fetchurl { - url = "http://registry.npmjs.org/cssmin/-/${name}.tgz"; - sha256 = "56f1854fd0c6cb4cf78cea861e7b617ccf1daf91b47fba5bc80abdf2529b3102"; - }; - deps = [ - - ]; - }; - - "ctype" = self."ctype->=0.0.2"; - - "ctype->=0.0.2" = self.buildNodePackage rec { - name = "ctype-0.5.2"; - src = fetchurl { - url = "http://registry.npmjs.org/ctype/-/${name}.tgz"; - sha256 = "4a7224a74f19dc6a1206fa1c04ae1a4ab795cd4ba842466e2f511fa714f82c60"; - }; - deps = [ - - ]; - }; - - "ctype-0.5.0" = self.buildNodePackage rec { - name = "ctype-0.5.0"; - src = fetchurl { - url = "http://registry.npmjs.org/ctype/-/${name}.tgz"; - sha256 = "50157e6c5e44d1c833bfc239a7a337ee08fd6f3c5a15f7ef5cee5571a86b0378"; - }; - deps = [ - - ]; - }; - - "datetime" = self."datetime-0.0.3"; - - "datetime-0.0.3" = self.buildNodePackage rec { - name = "datetime-0.0.3"; - src = fetchurl { - url = "http://registry.npmjs.org/datetime/-/${name}.tgz"; - sha256 = "d584a5b140ced7bd44199fc5e1b6cd55ec2d3c946dc990ced42f6ab2687747f0"; - }; - deps = [ - self."vows->=0.5.4" - ]; - }; - - "debug" = self."debug-*"; - - "debug-*" = self.buildNodePackage rec { - name = "debug-0.7.2"; - src = fetchurl { - url = "http://registry.npmjs.org/debug/-/${name}.tgz"; - sha256 = "f9142856b1c2652a11e50f2aca068edbad7598f50d9e6d003b8ee85b2a333d63"; - }; - deps = [ - - ]; - }; - - - "diff" = self."diff-~1.0.3"; - - "diff-~1.0.3" = self.buildNodePackage rec { - name = "diff-1.0.3"; - src = fetchurl { - url = "http://registry.npmjs.org/diff/-/${name}.tgz"; - sha256 = "88e1bb04e3707c5601ec0841e170f8892a3b929bf8c4030f826cd32c1fa21472"; - }; - deps = [ - - ]; - }; - - "dtrace-provider" = self."dtrace-provider-0.0.6"; - - "dtrace-provider-0.0.6" = self.buildNodePackage rec { - name = "dtrace-provider-0.0.6"; - src = fetchurl { - url = "http://registry.npmjs.org/dtrace-provider/-/${name}.tgz"; - sha256 = "ce48363aefa9e8afb3c8e8e5ce8d321a5d5a7eecbb28eaa997c48c5e9d502508"; - }; - deps = [ - - ]; - }; - - "escape-html" = self."escape-html-0.0.1"; - - "escape-html-0.0.1" = self.buildNodePackage rec { - name = "escape-html-0.0.1"; - src = fetchurl { - url = "http://registry.npmjs.org/escape-html/-/${name}.tgz"; - sha256 = "03c24a492f80659c25f788809ae64277408a4c12594cff62f89db4b3259c6b58"; - }; - deps = [ - - ]; - }; - - "express" = self."express-*"; - - "express-*" = self.buildNodePackage rec { - name = "express-3.2.1"; - src = fetchurl { - url = "http://registry.npmjs.org/express/-/${name}.tgz"; - sha256 = "4ca52cccef971707a368f98c09baced9e06f4013b81c0cbcbf2c57c48982c428"; - }; - deps = [ - self."connect-2.7.7" - self."commander-~0.6.1" - self."range-parser-0.0.4" - self."mkdirp-0.3.4" - self."cookie-0.0.5" - self."buffer-crc32-0.2.1" - self."fresh-0.1.0" - self."methods-0.0.1" - self."send-0.1.0" - self."cookie-signature-1.0.1" - self."debug" - self."qs-0.6.1" - ]; - }; - - "extend" = self."extend-*"; - - "extend-*" = self.buildNodePackage rec { - name = "extend-1.1.3"; - src = fetchurl { - url = "http://registry.npmjs.org/extend/-/${name}.tgz"; - sha256 = "0b27709829110f2e84926ebe3494b82df6e79ad49a618ad3444e4edf62b57a57"; - }; - deps = [ - - ]; - }; - - "eyes" = self."eyes->=0.1.6"; - - "eyes->=0.1.6" = self.buildNodePackage rec { - name = "eyes-0.1.8"; - src = fetchurl { - url = "http://registry.npmjs.org/eyes/-/${name}.tgz"; - sha256 = "4fa6db8f2c9926fb39a211c622d7eb3a76efbc4878559f9bd155d647a6963735"; - }; - deps = [ - - ]; - }; - - "faye-websocket" = self."faye-websocket-0.4.0"; - - "faye-websocket-0.4.0" = self.buildNodePackage rec { - name = "faye-websocket-0.4.0"; - src = fetchurl { - url = "http://registry.npmjs.org/faye-websocket/-/${name}.tgz"; - sha256 = "853b8d2f4611013da89faf45b6c9f6e440ad6c46616e405b8cf59b4302e78e2f"; - }; - deps = [ - - ]; - }; - - "formidable" = self."formidable-1.0.13"; - - "formidable-1.0.13" = self.buildNodePackage rec { - name = "formidable-1.0.13"; - src = fetchurl { - url = "http://registry.npmjs.org/formidable/-/${name}.tgz"; - sha256 = "c3c7c6ecdd4b1ad9ec9b1c273d8dd1db2bc12f9a699c233d3885fcded58ceec6"; - }; - deps = [ - - ]; - }; - - "formidable-1.0.11" = self.buildNodePackage rec { - name = "formidable-1.0.11"; - src = fetchurl { - url = "http://registry.npmjs.org/formidable/-/${name}.tgz"; - sha256 = "39b345d14d69c27fe262e12f16900cef6be220510788866e0a12c9fedd03766e"; - }; - deps = [ - - ]; - }; - - "fresh" = self."fresh-0.1.0"; - - "fresh-0.1.0" = self.buildNodePackage rec { - name = "fresh-0.1.0"; - src = fetchurl { - url = "http://registry.npmjs.org/fresh/-/${name}.tgz"; - sha256 = "c402fbd25e26c0167bf288e1ba791716808bfaa5de32b76ae68e8e8a3d7e2b33"; - }; - deps = [ - - ]; - }; - - "fstream" = self."fstream-0.1.18"; - "fstream-~0.1.8" = self."fstream-0.1.18"; - "fstream-~0.1.13" = self."fstream-0.1.18"; - - "fstream-0.1.18" = self.buildNodePackage rec { - name = "fstream-0.1.18"; - src = fetchurl { - url = "http://registry.npmjs.org/fstream/-/${name}.tgz"; - sha256 = "fd5791dd0ce8d7b707fa171ac5bd482e09f80cd09ec8176b45d547416893372d"; - }; - deps = [ - self."rimraf-2" - self."mkdirp-0.3.4" - self."graceful-fs-~1.1.2" - self."inherits-~1.0.0" - ]; - }; - - "glob" = self."glob-3"; - - "glob-3" = self.buildNodePackage rec { - name = "glob-3.1.12"; - src = fetchurl { - url = "http://registry.npmjs.org/glob/-/${name}.tgz"; - sha256 = "a37c02e9a91915fe4e3232229676e842803151dde831d1046620ec96118f6036"; - }; - deps = [ - self."minimatch-0.2" - self."graceful-fs-~1.1.2" - self."inherits-1" - ]; - }; - - "graceful-fs" = self."graceful-fs-1.1.10"; - "graceful-fs-1" = self."graceful-fs-1.1.10"; - "graceful-fs-~1.1" = self."graceful-fs-1.1.10"; - "graceful-fs-~1.1.2" = self."graceful-fs-1.1.10"; - - "graceful-fs-1.1.10" = self.buildNodePackage rec { - name = "graceful-fs-1.1.10"; - src = fetchurl { - url = "http://registry.npmjs.org/graceful-fs/-/${name}.tgz"; - sha256 = "1f9b7da8b0c75db49e0e5d2aaecc6f1dd3fca2bdbb2aecf95d1dbdec7f0cee24"; - }; - deps = [ - - ]; - }; - - "hat" = self."hat-0.0.3"; - - "hat-0.0.3" = self.buildNodePackage rec { - name = "hat-0.0.3"; - src = fetchurl { - url = "http://registry.npmjs.org/hat/-/${name}.tgz"; - sha256 = "7bf52b3b020ca333a42eb67411090912b21abb6ac746d587022a0955b16e5f5c"; - }; - deps = [ - - ]; - }; - - "hiredis" = self."hiredis-*"; - - "hiredis-*" = self.buildNodePackage rec { - name = "hiredis-0.1.14"; - src = fetchurl { - url = "http://registry.npmjs.org/hiredis/-/${name}.tgz"; - sha256 = "9d7ce0a7ae81cf465a0c26c07fb618b6ffd98ca344f14369114abf548d75637a"; - }; - deps = [ - - ]; - }; - - "htdigest" = self."htdigest-1.0.7"; - - "htdigest-1.0.7" = self.buildNodePackage rec { - name = "htdigest-1.0.7"; - src = fetchurl { - url = "http://registry.npmjs.org/htdigest/-/${name}.tgz"; - sha256 = "10fb047addf1c4f1089a26389066d5ff8f5ffa1ccce272a701bb4c2a30d90c58"; - }; - deps = [ - self."commander-0.5.1" - ]; - }; - - "htpasswd" = self."htpasswd-1.1.0"; - - "htpasswd-1.1.0" = self.buildNodePackage rec { - name = "htpasswd-1.1.0"; - src = fetchurl { - url = "http://registry.npmjs.org/htpasswd/-/${name}.tgz"; - sha256 = "cee9c0a525e717e3565ba6ffea8a64c480bc8a9e7800cb9bfc385d1a8e713ec9"; - }; - deps = [ - self."commander-0.5.1" - ]; - }; - - "http-auth" = self."http-auth-*"; - - "http-auth-*" = self.buildNodePackage rec { - name = "http-auth-1.2.7"; - src = fetchurl { - url = "http://registry.npmjs.org/http-auth/-/${name}.tgz"; - sha256 = "874dbb5907d03602f31eae959a0927a3112da8e868231d9a2119bb50d2fe63d2"; - }; - deps = [ - self."node-uuid-1.2.0" - self."htpasswd-1.1.0" - self."htdigest-1.0.7" - ]; - }; - - "http-signature" = self."http-signature-0.9.9"; - - "http-signature-0.9.9" = self.buildNodePackage rec { - name = "http-signature-0.9.9"; - src = fetchurl { - url = "http://registry.npmjs.org/http-signature/-/${name}.tgz"; - sha256 = "c1e193f1195028f2cc8a8f402c7755fc215552a81f6bebbdf6f21de9390a438e"; - }; - deps = [ - self."asn1-0.1.11" - self."ctype-0.5.0" - ]; - }; - - "inherits" = self."inherits-1.0.0"; - "inherits-1" = self."inherits-1.0.0"; - "inherits-1.x" = self."inherits-1.0.0"; - "inherits-~1.0.0" = self."inherits-1.0.0"; - - "inherits-1.0.0" = self.buildNodePackage rec { - name = "inherits-1.0.0"; - src = fetchurl { - url = "http://registry.npmjs.org/inherits/-/${name}.tgz"; - sha256 = "2be196fa6bc6a0c65fecd737af457589ef88b22a95d5dc31aab01d92ace48186"; - }; - deps = [ - - ]; - }; - - "jsontool" = self."jsontool-*"; - - "jsontool-*" = self.buildNodePackage rec { - name = "jsontool-5.1.1"; - src = fetchurl { - url = "http://registry.npmjs.org/jsontool/-/${name}.tgz"; - sha256 = "f7c12a0de635905f8134dfc8385f237135494d8c99fc0a5f112ee9735c2b6d05"; - }; - deps = [ - - ]; - }; - - "knox" = self."knox-*"; - - "knox-*" = self.buildNodePackage rec { - name = "knox-0.3.1"; - src = fetchurl { - url = "http://registry.npmjs.org/knox/-/${name}.tgz"; - sha256 = "d62623482cc2f8b2fe08ff0c0cf2ed7f35a320e806ebdfa6ac36df5486018517"; - }; - deps = [ - self."mime" - ]; - }; - - "less" = self."less-1.3.0"; - - "less-1.3.0" = self.buildNodePackage rec { - name = "less-1.3.0"; - src = fetchurl { - url = "http://registry.npmjs.org/less/-/${name}.tgz"; - sha256 = "a182824764d5feefe8a66c5f9c7fe8b92d24a7677942fd650b9092bbd3f63d1b"; - }; - deps = [ - - ]; - }; - - "lru-cache" = self."lru-cache-~2.0.0"; - - "lru-cache-1.1.0" = self.buildNodePackage rec { - name = "lru-cache-1.1.0"; - src = fetchurl { - url = "http://registry.npmjs.org/lru-cache/-/${name}.tgz"; - sha256 = "735898f87ba800d6f2f3517ab92b631f03976c9d3fbaedb6ce357cfe3813ee8b"; - }; - deps = [ - - ]; - }; - - "lru-cache-~2.0.0" = self.buildNodePackage rec { - name = "lru-cache-2.0.1"; - src = fetchurl { - url = "http://registry.npmjs.org/lru-cache/-/${name}.tgz"; - sha256 = "3b4fd68f0bd75f5abf69e349b6ffa918bfe4990ff36d2d88dc74f334a9ed627e"; - }; - deps = [ - - ]; - }; - - "methods" = self."methods-0.0.1"; - - "methods-0.0.1" = self.buildNodePackage rec { - name = "methods-0.0.1"; - src = fetchurl { - url = "http://registry.npmjs.org/methods/-/${name}.tgz"; - sha256 = "2f7e32954dff5991dd8220e8f5dcdd32aeec5ec56ce9f7235872444af51b3adb"; - }; - deps = [ - - ]; - }; - - "mime" = self."mime-*"; - - "mime->= 0.0.1" = self."mime-*"; - - "mime-1.2.5" = self.buildNodePackage rec { - name = "mime-1.2.5"; - src = fetchurl { - url = "http://registry.npmjs.org/mime/-/${name}.tgz"; - sha256 = "ccf05a6c47146e8acb9d0671eee09d2eb077cf9ddd1f7e8eccf49dbf969d6c72"; - }; - deps = [ - - ]; - }; - - "mime-1.2.6" = self.buildNodePackage rec { - name = "mime-1.2.6"; - src = fetchurl { - url = "http://registry.npmjs.org/mime/-/${name}.tgz"; - sha256 = "7460134d6b4686d64fd1e7b878d34e2bdd258ad29b6665cf62e6d92659e81591"; - }; - deps = [ - - ]; - }; - - "mime-*" = self.buildNodePackage rec { - name = "mime-1.2.7"; - src = fetchurl { - url = "http://registry.npmjs.org/mime/-/${name}.tgz"; - sha256 = "a80244918c9c75fa4d0b37f311920c7d5270aab9a05aca9a74783764ad152df6"; - }; - deps = [ - - ]; - }; - - "minimatch" = self."minimatch-0.2"; - - "minimatch-0.2" = self.buildNodePackage rec { - name = "minimatch-0.2.6"; - src = fetchurl { - url = "http://registry.npmjs.org/minimatch/-/${name}.tgz"; - sha256 = "f0030112575a815ff304fa3bc64ee7e60ab8bfddb281602bc37eca0cddd48350"; - }; - deps = [ - self."lru-cache-~2.0.0" - ]; - }; - - "mkdirp" = self."mkdirp-0.3.4"; - - "mkdirp-0.3.4" = self.buildNodePackage rec { - name = "mkdirp-0.3.4"; - src = fetchurl { - url = "http://registry.npmjs.org/mkdirp/-/${name}.tgz"; - sha256 = "f87444f2376c56bf47846f3b885aae926c5d9504328923b166794b78c0e08425"; - }; - deps = [ - - ]; - }; - - "mongodb" = self."mongodb-1.1.11"; - - "mongodb-1.1.11" = self.buildNodePackage rec { - name = "mongodb-1.1.11"; - src = fetchurl { - url = "http://registry.npmjs.org/mongodb/-/${name}.tgz"; - sha256 = "fedd14b097a58ae5c2c83e5cb0af85a191ad00c2ce8d6db46520ee6cc1650277"; - }; - deps = [ - self."bson-0.1.5" - ]; - }; - - "mrclean" = self."mrclean-0.1.0"; - - "mrclean-0.1.0" = self.buildNodePackage rec { - name = "mrclean-0.1.0"; - src = fetchurl { - url = "http://registry.npmjs.org/mrclean/-/${name}.tgz"; - sha256 = "5a8921007d8d3db990d41924d220f90efc8cbeb1f425c52fe0fe28be22223705"; - }; - deps = [ - - ]; - }; - - "nijs" = self."nijs-0.0.5"; - - "nijs-0.0.5" = self.buildNodePackage rec { - name = "nijs-0.0.5"; - src = fetchurl { - url = "http://registry.npmjs.org/nijs/-/${name}.tgz"; - sha256 = "026lxgm75mqy5n1yjsk1n8xbgq5n9lw43lqa5nmy2mq74hzzksf5"; - }; - deps = [ - self."optparse" - ]; - }; - - "node-expat" = self."node-expat-*"; - - "node-expat-*" = self.buildNodePackage rec { - name = "node-expat-1.6.1"; - src = fetchurl { - url = "http://registry.npmjs.org/node-expat/-/${name}.tgz"; - sha256 = "15c0566889ef8a54b2b626956b7dfc160469eb6c0d44a582a0b1077fadf034d2"; - }; - deps = [ - - ]; - buildInputs = [ pkgs.expat ]; - }; - - "node-gyp" = self."node-gyp-*"; - - "node-gyp-*" = self.buildNodePackage rec { - name = "node-gyp-0.6.8"; - src = fetchurl { - url = "http://registry.npmjs.org/node-gyp/-/${name}.tgz"; - sha256 = "b40064d825c492c544389812ecea2089606c31cbe4f3ee9e68048ea56a9aed4d"; - }; - deps = [ - self."glob-3" - self."graceful-fs-1" - self."fstream-~0.1.13" - self."minimatch-0.2" - self."mkdirp-0.3.4" - self."nopt-2" - self."npmlog-0" - self."osenv-0" - self."request-2.9" - self."rimraf-2" - self."semver-1" - self."tar-~0.1.12" - self."which-1" - ]; - }; - - "node-uuid" = self."node-uuid-1.3.3"; - - "node-uuid-1.2.0" = self.buildNodePackage rec { - name = "node-uuid-1.2.0"; - src = fetchurl { - url = "http://registry.npmjs.org/node-uuid/-/${name}.tgz"; - sha256 = "96d3ce178ea0825d27a855630de74243a577dc988512512eea572829b208a3d2"; - }; - deps = [ - - ]; - }; - - "node-uuid-1.3.3" = self.buildNodePackage rec { - name = "node-uuid-1.3.3"; - src = fetchurl { - url = "http://registry.npmjs.org/node-uuid/-/${name}.tgz"; - sha256 = "a3fbccc904944a9c8eadc59e55aaac908cc458569f539b50077d9672a84587a8"; - }; - deps = [ - - ]; - }; - - "nopt" = self."nopt-2"; - - "nopt-1.0.10" = self.buildNodePackage rec { - name = "nopt-1.0.10"; - src = fetchurl { - url = "http://registry.npmjs.org/nopt/-/${name}.tgz"; - sha256 = "426562943bfbbfc059eac83575ade5b78c6c01e5c1000a90a7defecfe2334927"; - }; - deps = [ - self."abbrev-1" - ]; - }; - - "nopt-2" = self.buildNodePackage rec { - name = "nopt-2.0.0"; - src = fetchurl { - url = "http://registry.npmjs.org/nopt/-/${name}.tgz"; - sha256 = "112e9bea8b745a2e5a59d239e6f6f02e720e080ab8cdca89b6b8f0143ae718b5"; - }; - deps = [ - self."abbrev-1" - ]; - }; - - "npm2nix" = self."npm2nix-0.1.3"; - - "npm2nix-0.1.3" = self.buildNodePackage rec { - name = "npm2nix-0.1.3"; - src = fetchurl { - url = https://bitbucket.org/shlevy/npm2nix/get/0.1.3.tar.gz; - sha256 = "1728fzmixcyg4g8mqcgn5yf7d4nin9zyqv8bs8b6660swhfdn4il"; - name = "${name}.tgz"; - }; - deps = [ - self."semver-1" - ]; - }; - - "npmlog" = self."npmlog-0"; - - "npmlog-0" = self.buildNodePackage rec { - name = "npmlog-0.0.2"; - src = fetchurl { - url = "http://registry.npmjs.org/npmlog/-/${name}.tgz"; - sha256 = "ce98d4d3380390c0259695cce407e2e96d2970c5caee1461a62ecbd38e8caed4"; - }; - deps = [ - self."ansi-~0.1.2" - ]; - }; - - "optimist" = self."optimist-*"; - - "optimist-*" = self."optimist-0.3.5"; - "optimist-~0.3.5" = self."optimist-0.3.5"; - - "optimist-0.3.5" = self.buildNodePackage rec { - name = "optimist-0.3.5"; - src = fetchurl { - url = "http://registry.npmjs.org/optimist/-/${name}.tgz"; - sha256 = "17d06n3y9difknq9j340qksj2zllal6sg0pj4clj9ja5jxf721x4"; - }; - deps = [ - self."wordwrap-~0.0.2" - ]; - }; - - "options" = self."options-*"; - - "options-*" = self.buildNodePackage rec { - name = "options-0.0.3"; - src = fetchurl { - url = "http://registry.npmjs.org/options/-/${name}.tgz"; - sha256 = "06cfe21b54b45f8cf7bb0a184d6ea6de3adb2dc471bf0663d06c791b4d48536d"; - }; - deps = [ - - ]; - }; - - "optparse" = self."optparse-1.0.3"; - - "optparse-1.0.3" = self.buildNodePackage rec { - name = "optparse-1.0.3"; - src = fetchurl { - url = "http://registry.npmjs.org/optparse/-/${name}.tgz"; - sha256 = "1cg99i4rq8azxikzqz0ykw4q971azbj49d3m7slj041yscb6m883"; - }; - deps = [ - - ]; - }; - - "osenv" = self."osenv-0"; - - "osenv-0" = self.buildNodePackage rec { - name = "osenv-0.0.3"; - src = fetchurl { - url = "http://registry.npmjs.org/osenv/-/${name}.tgz"; - sha256 = "aafbb23637b7338c9025f9da336f31f96674d7926c30f209e4d93ce16d5251c4"; - }; - deps = [ - - ]; - }; - - "pause" = self."pause-0.0.1"; - - "pause-0.0.1" = self.buildNodePackage rec { - name = "pause-0.0.1"; - src = fetchurl { - url = "http://registry.npmjs.org/pause/-/${name}.tgz"; - sha256 = "d37b84046db0c28c9768be649e8f02bd991ede34b276b5dba7bade23b523235e"; - }; - deps = [ - - ]; - }; - - "policyfile" = self."policyfile-0.0.4"; - - "policyfile-0.0.4" = self.buildNodePackage rec { - name = "policyfile-0.0.4"; - src = fetchurl { - url = "http://registry.npmjs.org/policyfile/-/${name}.tgz"; - sha256 = "e19e9e57d6262ab7965212ec5456eae2c07438de3b09fd8f3cba36a61a14c43f"; - }; - deps = [ - - ]; - }; - - "qs" = self."qs-0.6.1"; - "qs->= 0.3.1" = self."qs-0.6.1"; - - "qs-0.4.2" = self.buildNodePackage rec { - name = "qs-0.4.2"; - src = fetchurl { - url = "http://registry.npmjs.org/qs/-/${name}.tgz"; - sha256 = "c44875d3aa882693cf73185b46fed63c1a89c34dce600b191b41dd90fb019b86"; - }; - deps = [ - - ]; - }; - - "qs-0.5.0" = self.buildNodePackage rec { - name = "qs-0.5.0"; - src = fetchurl { - url = "http://registry.npmjs.org/qs/-/${name}.tgz"; - sha256 = "229a99fc833d50307833a13d898f3de137f2823593220273295e7e1dc81ab993"; - }; - deps = [ - - ]; - }; - - "qs-0.6.1" = self.buildNodePackage rec { - name = "qs-0.6.1"; - src = fetchurl { - url = "http://registry.npmjs.org/qs/-/${name}.tgz"; - sha256 = "afb476cec9b40a7801fe21f4056bfffb2270e126d7136f955c810fa7181f972a"; - }; - deps = [ - - ]; - }; - - "range-parser" = self."range-parser-0.0.4"; - - "range-parser-0.0.4" = self.buildNodePackage rec { - name = "range-parser-0.0.4"; - src = fetchurl { - url = "http://registry.npmjs.org/range-parser/-/${name}.tgz"; - sha256 = "8e1bcce3544330b51644ea0cb4d25f0daa4b43008a75da27e285635f4ac4b1ce"; - }; - deps = [ - - ]; - }; - - "rbytes" = self."rbytes-0.0.2"; - - "rbytes-0.0.2" = self.buildNodePackage rec { - name = "rbytes-0.0.2"; - src = fetchurl { - url = "http://registry.npmjs.org/rbytes/-/${name}.tgz"; - sha256 = "0fd4697be996ee12c65f8fb13b2edc7a554d22c31d1a344539bc611ce73b69aa"; - }; - deps = [ - - ]; - buildInputs = [ - pkgs.openssl - ]; - }; - - "redis" = self."redis-0.7.2"; - - "redis-0.6.7" = self.buildNodePackage rec { - name = "redis-0.6.7"; - src = fetchurl { - url = "http://registry.npmjs.org/redis/-/${name}.tgz"; - sha256 = "6a65c0204a773ca4adec0635d747c80a7565ba5e2028775c7d0e95d23df088bb"; - }; - deps = [ - - ]; - }; - - "redis-0.7.2" = self.buildNodePackage rec { - name = "redis-0.7.2"; - src = fetchurl { - url = "http://registry.npmjs.org/redis/-/${name}.tgz"; - sha256 = "d56d99e15dd35f6fabf545d9e91545553d60eaeb32ecf5caa1f357458df161ab"; - }; - deps = [ - self."hiredis" - ]; - }; - - "request" = self."request-~2"; - - "request-2.9" = self.buildNodePackage rec { - name = "request-2.9.203"; - src = fetchurl { - url = "http://registry.npmjs.org/request/-/${name}.tgz"; - sha256 = "2af8f83a63c7227383fbdd6114e470e0921af86a037c4e82f42883120f35f836"; - }; - deps = [ - - ]; - }; - - "request-~2" = self.buildNodePackage rec { - name = "request-2.11.0"; - src = fetchurl { - url = "http://registry.npmjs.org/request/-/${name}.tgz"; - sha256 = "01e5c144c755c8ee1a1ec93077b684bd63efb8df32d54675e20737e8e1c1afa6"; - }; - deps = [ - - ]; - }; - - "requirejs" = self."requirejs-0.26.0"; - - "requirejs-==0.26.0" = self."requirejs-0.26.0"; - - "requirejs-0.26.0" = self.buildNodePackage rec { - name = "requirejs-0.26.0"; - src = fetchurl { - url = "http://registry.npmjs.org/requirejs/-/${name}.tgz"; - sha256 = "5ec7264031784fd1b5844aba813ace9045918a0b004a52fafa6b52e9e9760407"; - }; - deps = [ - - ]; - }; - - "restify" = self."restify-1.4.3"; - - "restify-1.4.3" = self.buildNodePackage rec { - name = "restify-1.4.3"; - src = fetchurl { - url = "http://registry.npmjs.org/restify/-/${name}.tgz"; - sha256 = "7c95b1e58d6effab3b947409892a20260b6d1142aefec9c3eb1e46165363d64e"; - }; - deps = [ - self."async-0.1.22" - self."bunyan-0.8.0" - self."byline-2.0.2" - self."formidable-1.0.11" - self."dtrace-provider-0.0.6" - self."http-signature-0.9.9" - self."lru-cache-1.1.0" - self."mime-1.2.5" - self."node-uuid-1.3.3" - self."qs-0.5.0" - self."retry-0.6.0" - self."semver-1.0.14" - ]; - }; - - "retry" = self."retry-0.6.0"; - - "retry-0.6.0" = self.buildNodePackage rec { - name = "retry-0.6.0"; - src = fetchurl { - url = "http://registry.npmjs.org/retry/-/${name}.tgz"; - sha256 = "983e676af24ff4dcbac396420fca3c195ce3b1de5f731f697888b4fe6b7bbd2a"; - }; - deps = [ - - ]; - }; - - "rimraf" = self."rimraf-2"; - - "rimraf-2" = self.buildNodePackage rec { - name = "rimraf-2.0.2"; - src = fetchurl { - url = "http://registry.npmjs.org/rimraf/-/${name}.tgz"; - sha256 = "3efcc60c9f6715a8746f3e0b82770468247f3e256778ef20733f334377392ab0"; - }; - deps = [ - self."graceful-fs-~1.1" - ]; - }; - - "s3http" = self."s3http-*"; - - "s3http-*" = self.buildNodePackage rec { - name = "s3http-0.0.1"; - src = fetchurl { - url = "http://registry.npmjs.org/s3http/-/${name}.tgz"; - sha256 = "7140a0ee6df9fb90fd74aa0b68b73f899c6d8e2eaa2de89fde3f634e9bf10dba"; - }; - deps = [ - self."aws-sdk-git" - self."commander-0.5.1" - self."http-auth-*" - ]; - }; - - "sax" = self."sax->=0.4.2"; - - "sax->=0.4.2" = self.buildNodePackage rec { - name = "sax-0.5.2"; - src = fetchurl { - url = "http://registry.npmjs.org/sax/-/${name}.tgz"; - sha256 = "6bb7cd44e9dfea598997d4ba9d3279dafe75bed7b45904561ca9eb4d85cfd953"; - }; - deps = [ - - ]; - }; - - "semver" = self."semver-1"; - - "semver-1" = self."semver-1.0.14"; - - "semver-1.0.14" = self.buildNodePackage rec { - name = "semver-1.0.14"; - src = fetchurl { - url = "http://registry.npmjs.org/semver/-/${name}.tgz"; - sha256 = "560df522ae0e8834d8b07f6ca9c60bd8836e844642361abde108018cbe9ca82f"; - }; - deps = [ - - ]; - }; - - "send" = self."send-0.1.0"; - - "send-0.1.0" = self.buildNodePackage rec { - name = "send-0.1.0"; - src = fetchurl { - url = "http://registry.npmjs.org/send/-/${name}.tgz"; - sha256 = "28b5a6ec41b5072521eb792cc901b92cdbb6b743c578d7008727dbbd3eb717de"; - }; - deps = [ - self."debug" - self."mime-1.2.6" - self."fresh-0.1.0" - self."range-parser-0.0.4" - ]; - }; - - "send-0.0.4" = self.buildNodePackage rec { - name = "send-0.0.4"; - src = fetchurl { - url = "http://registry.npmjs.org/send/-/${name}.tgz"; - sha256 = "7e028fa3760884d8103414f079dc4bcc99d0b72bc21bcaa9d66a319d59010d6c"; - }; - deps = [ - self."debug" - self."mime-1.2.6" - self."fresh-0.1.0" - self."range-parser-0.0.4" - ]; - }; - - "showdown" = self."showdown-0.0.1"; - - "showdown-0.0.1" = self.buildNodePackage rec { - name = "showdown-0.0.1"; - src = fetchurl { - url = "http://registry.npmjs.org/showdown/-/${name}.tgz"; - sha256 = "669a3284344a4cb51b0327af8d84b9e35c895ef1cedbafada5284a31f4d4783d"; - }; - deps = [ - - ]; - }; - - "smartdc" = self."smartdc-*"; - - "smartdc-*" = self.buildNodePackage rec { - name = "smartdc-6.5.6"; - src = fetchurl { - url = "http://registry.npmjs.org/smartdc/-/${name}.tgz"; - sha256 = "a5d7ba965a863a411b52f0321a9fa1be350cb6af807175beb16529e4282dff4d"; - }; - deps = [ - self."http-signature-0.9.9" - self."lru-cache-1.1.0" - self."nopt-1.0.10" - self."restify-1.4.3" - self."bunyan-0.8.0" - self."ssh-agent-0.1.0" - ]; - }; - - "ssh-agent" = self."ssh-agent-0.1.0"; - - "ssh-agent-0.1.0" = self.buildNodePackage rec { - name = "ssh-agent-0.1.0"; - src = fetchurl { - url = "http://registry.npmjs.org/ssh-agent/-/${name}.tgz"; - sha256 = "62860d09a84d0bf1250d8c90aae3d0a922a7812591a9f4243330178774eb87b5"; - }; - deps = [ - self."ctype->=0.0.2" - ]; - }; - - "socket.io" = self."socket.io-0.9.6"; - - "socket.io-0.9.6" = self.buildNodePackage rec { - name = "socket.io-0.9.6"; - src = fetchurl { - url = "http://registry.npmjs.org/socket.io/-/${name}.tgz"; - sha256 = "444e346e2701e2212590461a1fcf656f5d685ceb209e473517603286f09e743c"; - }; - deps = [ - self."socket.io-client-0.9.6" - self."policyfile-0.0.4" - self."redis-0.6.7" - ]; - }; - - "socket.io-client" = self."socket.io-client-0.9.6"; - - "socket.io-client-0.9.6" = self.buildNodePackage rec { - name = "socket.io-client-0.9.6"; - src = fetchurl { - url = "http://registry.npmjs.org/socket.io-client/-/${name}.tgz"; - sha256 = "eab65186515d5206fe18b9ced75aae8c803dbcd18295a9a1cb71e5ae772ba399"; - }; - deps = [ - self."uglify-js-1.2.5" - self."ws-0.4.x" - self."xmlhttprequest-1.2.2" - self."active-x-obfuscator-0.0.1" - ]; - }; - - "sockjs" = self."sockjs-0.3.1"; - - "sockjs-0.3.1" = self.buildNodePackage rec { - name = "sockjs-0.3.1"; - src = fetchurl { - url = "http://registry.npmjs.org/sockjs/-/${name}.tgz"; - sha256 = "056476f23dbe2e2182e5edea755108a8b6dbaea4b675b228172e876c8649efdf"; - }; - deps = [ - self."node-uuid-1.3.3" - self."faye-websocket-0.4.0" - self."rbytes-0.0.2" - ]; - }; - - "source-map" = self."source-map-0.1.7"; - - "source-map-~0.1.7" = self."source-map-0.1.7"; - - "source-map-0.1.7" = self.buildNodePackage rec { - name = "source-map-0.1.7"; - src = fetchurl { - url = "http://registry.npmjs.org/source-map/-/${name}.tgz"; - sha256 = "041skhq60kwpx319iy0m33zcgc7q2ddlfl3vvmwl5ssl9p46g8x2"; - }; - deps = [ - self."amdefine->=0.0.4" - ]; - }; - - "source-map-0.1.2" = self.buildNodePackage rec { - name = "source-map-0.1.2"; - src = fetchurl { - url = "http://registry.npmjs.org/source-map/-/${name}.tgz"; - sha256 = "4465bb3a293c0e86092affb7cbdd6d9356cad69231c56f6e73bba7750497035f"; - }; - deps = [ - self."requirejs-==0.26.0" - ]; - }; - - "swig" = self."swig-0.13.2"; - - "swig-0.13.2" = self.buildNodePackage rec { - name = "swig-0.13.2"; - src = fetchurl { - url = "http://registry.npmjs.org/swig/-/${name}.tgz"; - sha256 = "1fxc1cg0g5bn0ksm4gddx75ff5yzzbhqn4yqh6xqa5ag73nvxiyg"; - }; - deps = [ - self."underscore" - ]; - }; - - "tar" = self."tar-~0.1.12"; - - "tar-~0.1.12" = self.buildNodePackage rec { - name = "tar-0.1.13"; - src = fetchurl { - url = "http://registry.npmjs.org/tar/-/${name}.tgz"; - sha256 = "fdf79b5e172badf924a12b501686e5cbf33c3ec7631eccc29c0e3e9fdcbb5ffe"; - }; - deps = [ - self."inherits-1.x" - self."block-stream" - self."fstream-~0.1.8" - ]; - }; - - "temp" = self."temp-*"; - - "temp-*" = self.buildNodePackage rec { - name = "temp-0.4.0"; - src = fetchurl { - url = "http://registry.npmjs.org/temp/-/${name}.tgz"; - sha256 = "ca8274250d36d94e670b8773bf062a28bc43eb342ae47ff629fbb627d48d710b"; - }; - deps = [ - - ]; - }; - - "timerstub" = self."timerstub-*"; - - "timerstub-*" = self.buildNodePackage rec { - name = "timerstub-0.1.3"; - src = fetchurl { - url = "http://registry.npmjs.org/timerstub/-/${name}.tgz"; - sha256 = "0ecbd05a10e0db1d628505c8a3b6ae07246bb8cf1074c435ddc26f22fcb5e153"; - }; - deps = [ - self."coffee-script-~1.1.2" - ]; - }; - - "tinycolor" = self."tinycolor-0.x"; - - "tinycolor-0.x" = self.buildNodePackage rec { - name = "tinycolor-0.0.1"; - src = fetchurl { - url = "http://registry.npmjs.org/tinycolor/-/${name}.tgz"; - sha256 = "f5aaf5df002750c4af19181988c8789c9e230445747e511dde7c660424f286a0"; - }; - deps = [ - - ]; - }; - - "uglify-js" = self."uglify-js-2.2.5"; - - "uglify-js-2.2.5" = self.buildNodePackage rec { - name = "uglify-js-2.2.5"; - src = fetchurl { - url = "http://registry.npmjs.org/uglify-js/-/${name}.tgz"; - sha256 = "18ic581gjyvfl4gvlcdmzw4vrcbvn698i2rznnba70f8lk6ndlgr"; - }; - deps = [ - self."source-map-~0.1.7" - self."optimist-~0.3.5" - ]; - }; - - "uglify-js-1.2.5" = self.buildNodePackage rec { - name = "uglify-js-1.2.5"; - src = fetchurl { - url = "http://registry.npmjs.org/uglify-js/-/${name}.tgz"; - sha256 = "111fa1b844885b94df8cd73eb864bd96ff2e9173e8eb7045cc778fa237304a74"; - }; - deps = [ - - ]; - }; - - "uglify-js-1.2.6" = self.buildNodePackage rec { - name = "uglify-js-1.2.6"; - src = fetchurl { - url = "http://registry.npmjs.org/uglify-js/-/${name}.tgz"; - sha256 = "6d9202c8332e78868510a5441de4d54d8c2e08901ea7945eb332be8d7670788d"; - }; - deps = [ - - ]; - }; - - "underscore" = self."underscore-*"; - "underscore->=1.3.1" = self."underscore-*"; - - "underscore-*" = self.buildNodePackage rec { - name = "underscore-1.4.4"; - src = fetchurl { - url = "http://registry.npmjs.org/underscore/-/${name}.tgz"; - sha256 = "a848a28193850d58d7b98249d70844bc7f35a7d8b6b5ed75e08e829aa6e763d3"; - }; - deps = [ - - ]; - }; - - "vows" = self."vows->=0.5.4"; - - "vows->=0.5.4" = self.buildNodePackage rec { - name = "vows-0.6.4"; - src = fetchurl { - url = "http://registry.npmjs.org/vows/-/${name}.tgz"; - sha256 = "017586c2fbdd5cd15aacdc870ea0c1b1ab60558306457ddc9b0aa4dae8290597"; - }; - deps = [ - self."eyes->=0.1.6" - self."diff-~1.0.3" - ]; - }; - - "which" = self."which-1"; - - "which-1" = self.buildNodePackage rec { - name = "which-1.0.5"; - src = fetchurl { - url = "http://registry.npmjs.org/which/-/${name}.tgz"; - sha256 = "e26f39d7b152c700636472ab4da57bfb9af17972c49a9e2a06f9ff347d8fad42"; - }; - deps = [ - - ]; - }; - - "wordwrap" = self."wordwrap-~0.0.2"; - - "wordwrap-~0.0.2" = self.buildNodePackage rec { - name = "wordwrap-0.0.2"; - src = fetchurl { - url = "http://registry.npmjs.org/wordwrap/-/${name}.tgz"; - sha256 = "66a2fa688509738922c3ad62a6159fe3c93268bd3bca2bff24df4bc02cc31582"; - }; - deps = [ - - ]; - }; - - "ws" = self."ws-0.4.x"; - "ws-0.4.x" = self."ws-0.4.21"; - - "ws-0.4.21" = self.buildNodePackage rec { - name = "ws-0.4.21"; - src = self.patchLatest { - url = "http://registry.npmjs.org/ws/-/${name}.tgz"; - sha256 = "f21bc0058730355e1ff9d6ccf84a4cb56a2fc28e939edd15395770ea9e87fa0e"; - }; - deps = [ - self."commander-~0.6.1" - self."tinycolor-0.x" - self."options" - ]; - }; - - "wu" = self."wu-0.1.8"; - - "wu-0.1.8" = self.buildNodePackage rec { - name = "wu-0.1.8"; - src = fetchurl { - url = "http://registry.npmjs.org/wu/-/${name}.tgz"; - sha256 = "2400d0ca7da862a9063a6a8d914bb4e585f81a5121b0fda8e40b1f6e782c72c6"; - }; - deps = [ - - ]; - }; - - "xml2js" = self."xml2js-0.2.4"; - - "xml2js-0.2.4" = self.buildNodePackage rec { - name = "xml2js-0.2.4"; - src = fetchurl { - url = "http://registry.npmjs.org/xml2js/-/${name}.tgz"; - sha256 = "8daebb075fc7c564d84221a0cef7825ac824db8e312f873daee59a6adf38da28"; - }; - deps = [ - self."sax->=0.4.2" - ]; - }; - - "xmlbuilder" = self."xmlbuilder-*"; - - "xmlbuilder-*" = self.buildNodePackage rec { - name = "xmlbuilder-0.4.2"; - src = fetchurl { - url = "http://registry.npmjs.org/xmlbuilder/-/${name}.tgz"; - sha256 = "3137e5bf9db1f114767f8ba56be753f2a9f512e38a2df64d7677ae3c9318a0fe"; - }; - deps = [ - - ]; - }; - - "xmlhttprequest" = self."xmlhttprequest-1.2.2"; - - "xmlhttprequest-1.2.2" = self.buildNodePackage rec { - name = "xmlhttprequest-1.2.2"; - src = fetchurl { - url = "http://registry.npmjs.org/xmlhttprequest/-/${name}.tgz"; - sha256 = "44ce4ed6e5f7b5df84f27590fa142ecd175f53da4807b9f06c0c4733e23bd95d"; - }; - deps = [ - - ]; - }; - - "zeparser" = self."zeparser-0.0.5"; - - "zeparser-0.0.5" = self.buildNodePackage rec { - name = "zeparser-0.0.5"; - src = fetchurl { - url = "http://registry.npmjs.org/zeparser/-/${name}.tgz"; - sha256 = "8b5a57ae84a7b7adf8827d1469c8f66d08d1660bd1375a07381877cd1bb9ed0b"; - }; - deps = [ - - ]; - }; -}; - +let + inherit (self) buildNodePackage patchLatest; + + importGeneratedPackages = generated: nativeDeps: self: builtins.listToAttrs (pkgs.lib.fold (pkg: pairs: + (pkgs.lib.optional pkg.topLevel { name = pkg.baseName; value = builtins.getAttr pkg.fullName self; }) ++ [ + { + name = pkg.fullName; + value = buildNodePackage rec { + name = "${pkg.baseName}-${pkg.version}"; + src = (if pkg.patchLatest then patchLatest else fetchurl) { + url = "http://registry.npmjs.org/${pkg.baseName}/-/${name}.tgz"; + sha256 = pkg.hash; + }; + deps = map (dep: builtins.getAttr "${dep.name}-${dep.range}" self) pkg.dependencies; + buildInputs = if builtins.hasAttr name nativeDeps then builtins.getAttr name nativeDeps else []; + }; + } + ] ++ pairs + ) [] generated); + + self = { + inherit importGeneratedPackages; + + nativeDeps = { + "node-expat-*" = [ pkgs.expat ]; + "rbytes-0.0.2" = [ pkgs.openssl ]; + }; + + buildNodePackage = import ../development/web/nodejs/build-node-package.nix { + inherit stdenv nodejs neededNatives; + inherit (pkgs) runCommand; + }; + + patchLatest = srcAttrs: + let src = fetchurl srcAttrs; in pkgs.runCommand src.name {} '' + mkdir unpack + cd unpack + tar xf ${src} + mv */ package 2>/dev/null || true + sed -i -e "s/: \"latest\"/: \"*\"/" package/package.json + tar cf $out * + ''; + + /* Put manual packages below here (ideally eventually managed by npm2nix */ + } // importGeneratedPackages (import ./node-packages-generated.nix) self.nativeDeps self; in self diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e99065e10898..e927d55025b8 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -694,6 +694,26 @@ rec { [ CatalystRuntime MooseXTraitsPluggable namespaceautoclean ListMoreUtils ]; }; + CatalystXRoleApplicator = buildPerlPackage rec { + name = "CatalystX-RoleApplicator-0.005"; + src = fetchurl { + url = "mirror://cpan/authors/id/H/HD/HDP/${name}.tar.gz"; + sha256 = "0vwaapxn8g5hs2xp63c4dwv9jmapmji4272fakssvgc9frklg3p2"; + }; + buildInputs = [ ]; + propagatedBuildInputs = [ MooseXRelatedClassRoles CatalystRuntime ]; + }; + + CatalystTraitForRequestProxyBase = buildPerlPackage rec { + name = "Catalyst-TraitFor-Request-ProxyBase-0.000005"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/Catalyst/${name}.tar.gz"; + sha256 = "02kir63d5cs2ipj3fn1qlmmx3gqi1xqzrxfr4pv5vjhjgsm0zgx7"; + }; + buildInputs = [ CatalystRuntime ]; + propagatedBuildInputs = [ Moose URI CatalystXRoleApplicator ]; + }; + CatalystXScriptServerStarman = buildPerlPackage { name = "CatalystX-Script-Server-Starman-0.02"; src = fetchurl { @@ -1048,6 +1068,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 { @@ -1219,11 +1252,11 @@ rec { }; }; - CryptRandPasswd = buildPerlPackage rec { - name = "Crypt-RandPasswd-0.02"; + CryptRandPasswd = buildPerlPackage { + name = "Crypt-RandPasswd-0.03"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JD/JDPORTER/${name}.tar.gz"; - sha256 = "0r5w5i81s02x756alad9psxmpqmcxahzjpqxsb3kacsqj8s5br9b"; + url = mirror://cpan/authors/id/N/NE/NEILB/Crypt-RandPasswd-0.03.tar.gz; + sha256 = "0sz2b4gj2mcwj0nqvxw3gs5m49jzfbi0vla51hj957dvfk00plhf"; }; }; @@ -1915,6 +1948,7 @@ rec { }; }; + ExtUtilsCppGuess = buildPerlModule rec { name = "ExtUtils-CppGuess-0.07"; src = fetchurl { @@ -1924,6 +1958,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 +2015,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,11 +3036,19 @@ rec { }; }; - LWP = buildPerlPackage { - name = "libwww-perl-6.04"; + Log4Perl = buildPerlPackage rec { + name = "Log-Log4perl-1.41"; src = fetchurl { - url = mirror://cpan/authors/id/G/GA/GAAS/libwww-perl-6.04.tar.gz; - sha256 = "0z92fpwk6lh2gghv050r0qb216jmjl2m0c6zby935q8lv0q5wwgr"; + url = "mirror://cpan/modules/by-module/Log/${name}.tar.gz"; + sha256 = "0dajkgvlwsb4zdw6x3fil2n5phypq829dmqf8l9s88g9smms2a2i"; + }; + }; + + LWP = buildPerlPackage { + name = "libwww-perl-6.05"; + src = fetchurl { + url = mirror://cpan/authors/id/G/GA/GAAS/libwww-perl-6.05.tar.gz; + sha256 = "08wgwyz7748pv5cyngxia0xl6nragfnhrp4p9s78xhgfyygpj9bv"; }; propagatedBuildInputs = [ EncodeLocale FileListing HTMLParser HTTPCookies HTTPDaemon HTTPDate HTTPNegotiate HTTPMessage LWPMediaTypes NetHTTP URI WWWRobotRules ]; doCheck = false; # tries to start a daemon @@ -3008,14 +3071,18 @@ rec { }; LWPProtocolHttps = buildPerlPackage rec { - name = "LWP-Protocol-https-6.02"; + name = "LWP-Protocol-https-6.04"; src = fetchurl { - url = "mirror://cpan/modules/by-module/LWP/${name}.tar.gz"; - sha256 = "0y2an4v7g4jm8fsszk2489m179i28kx79ywwiywkwk1aw3yqh0y5"; + url = mirror://cpan/authors/id/G/GA/GAAS/LWP-Protocol-https-6.04.tar.gz; + sha256 = "0agnga5dg94222h6rlzqxa0dri2sh3gayncvfb7jad9nxr87gxhy"; }; patches = [ ../development/perl-modules/lwp-protocol-https-cert-file.patch ]; propagatedBuildInputs = [ LWP IOSocketSSL ]; doCheck = false; # tries to connect to https://www.apache.org/. + meta = { + description = "Provide https support for LWP::UserAgent"; + license = "perl5"; + }; }; LWPUserAgent = buildPerlPackage { @@ -3415,14 +3482,14 @@ rec { }; }; - MooseXSetOnce = buildPerlPackage rec { - name = "MooseX-SetOnce-0.200001"; + MooseXRelatedClassRoles = buildPerlPackage rec { + name = "MooseX-RelatedClassRoles-0.004"; src = fetchurl { url = "mirror://cpan/modules/by-module/MooseX/${name}.tar.gz"; - sha256 = "0qa2i45g2zn4r0wg7hba9va68nin5l63gr9l8b5q3hr4cjn97ll6"; + sha256 = "17vynkf6m5d039qkr4in1c9lflr8hnwp1fgzdwhj4q6jglipmnrh"; }; - buildInputs = [ TestFatal ]; - propagatedBuildInputs = [ Moose ]; + buildInputs = [ ]; + propagatedBuildInputs = [ MooseXRoleParameterized ]; }; MooseXParamsValidate = buildPerlPackage { @@ -3478,6 +3545,16 @@ rec { propagatedBuildInputs = [ Moose ]; }; + MooseXSetOnce = buildPerlPackage rec { + name = "MooseX-SetOnce-0.200001"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/MooseX/${name}.tar.gz"; + sha256 = "0qa2i45g2zn4r0wg7hba9va68nin5l63gr9l8b5q3hr4cjn97ll6"; + }; + buildInputs = [ TestFatal ]; + propagatedBuildInputs = [ Moose ]; + }; + MooseXTraits = buildPerlPackage rec { name = "MooseX-Traits-0.11"; src = fetchurl { @@ -3768,6 +3845,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 +5226,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 +5398,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 ce0e52de86b2..20bbc37e4d69 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 = [ @@ -869,6 +874,24 @@ pythonPackages = python.modules // rec { }; }); + # Buildbot 0.8.7p1 needs dateutil==1.5 + dateutil_1_5 = buildPythonPackage (rec { + name = "dateutil-1.5"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/python-dateutil/python-${name}.tar.gz"; + sha256 = "02dhw57jf5kjcp7ng1if7vdrbnlpb9yjmz7wygwwvf3gni4766bg"; + }; + + propagatedBuildInputs = [ pythonPackages.six ]; + + meta = { + description = "Powerful extensions to the standard datetime module"; + homepage = http://pypi.python.org/pypi/python-dateutil; + license = "BSD-style"; + }; + }); + decorator = buildPythonPackage rec { name = "decorator-3.3.1"; @@ -983,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"; @@ -1303,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; @@ -1368,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' @@ -1386,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 ]; @@ -1403,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"; @@ -1840,15 +1887,17 @@ pythonPackages = python.modules // rec { gyp = buildPythonPackage rec { - rev = "1435"; + rev = "1635"; name = "gyp-r${rev}"; src = fetchsvn { url = "http://gyp.googlecode.com/svn/trunk"; inherit rev; - sha256 = "1wmd1svx5344alb8ff9vzdam1ccqdl0h7shp1xnsk843hqwc0fz0"; + sha256 = "1hn5gxgj2z399f71kz11m61ifds7mx4zkymnd1c87k1wyp7bs5k5"; }; + patches = if pkgs.stdenv.isDarwin then [ ../development/python-modules/gyp/no-xcode.patch ../development/python-modules/gyp/no-darwin-cflags.patch ] else null; + # error: invalid command 'test' doCheck = false; @@ -1972,11 +2021,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 = { @@ -2625,6 +2674,18 @@ pythonPackages = python.modules // rec { sha256 = "1kh4spwgqxm534qlzzf2ijchckvs0pwjxl1irhicjmlg7mybnfvx"; }; + patches = pkgs.lib.singleton (fetchurl { + name = "libnotify07.patch"; + url = "http://pkgs.fedoraproject.org/cgit/notify-python.git/plain/" + + "libnotify07.patch?id2=289573d50ae4838a1658d573d2c9f4c75e86db0c"; + sha256 = "1lqdli13mfb59xxbq4rbq1f0znh6xr17ljjhwmzqb79jl3dig12z"; + }); + + postPatch = '' + sed -i -e '/^PYGTK_CODEGEN/s|=.*|="${pygtk}/bin/pygtk-codegen-2.0"|' \ + configure + ''; + buildInputs = [ python pkgs.pkgconfig pkgs.libnotify pygobject pygtk pkgs.glib pkgs.gtk pkgs.dbus_glib ]; postInstall = "cd $out/lib/python*/site-packages && ln -s gtk-*/pynotify ."; @@ -2910,11 +2971,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 ]; @@ -3012,6 +3073,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"; @@ -3145,6 +3246,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"; @@ -3826,15 +3946,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 ]; @@ -4582,11 +4702,11 @@ pythonPackages = python.modules // rec { }; waitress = buildPythonPackage rec { - name = "waitress-0.8.1"; + name = "waitress-0.8.5"; src = fetchurl { url = "http://pypi.python.org/packages/source/w/waitress/${name}.tar.gz"; - md5 = "aadfc692b780fc42eb05ac819102d336"; + md5 = "7a3094d812c0dffb948d1334ef5fd56f"; }; meta = { @@ -4644,8 +4764,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; @@ -4656,6 +4775,7 @@ pythonPackages = python.modules // rec { six beautifulsoup4 waitress + unittest2 mock pyquery wsgiproxy2 diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index 2c688ea71bdc..3895ee267797 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -334,4 +334,49 @@ in { mpg123.crossDrv = nativePlatforms; yacas.crossDrv = nativePlatforms; }; +}) // ( + + +/* Linux on Raspberrypi */ +let + crossSystem = { + config = "armv6l-unknown-linux-gnueabi"; + bigEndian = false; + arch = "arm"; + float = "hard"; + fpu = "vfp"; + withTLS = true; + libc = "glibc"; + platform = pkgs.platforms.raspberrypi; + openssl.system = "linux-generic32"; + gcc = { + arch = "armv6"; + fpu = "vfp"; + float = "softfp"; + abi = "aapcs-linux"; + }; + }; +in { + rpi = mapTestOnCross crossSystem { + coreutils.crossDrv = nativePlatforms; + ed.crossDrv = nativePlatforms; + inetutils.crossDrv = nativePlatforms; + nixUnstable.crossDrv = nativePlatforms; + patch.crossDrv = nativePlatforms; + vim.crossDrv = nativePlatforms; + tmux.crossDrv = nativePlatforms; + screen.crossDrv = nativePlatforms; + unrar.crossDrv = nativePlatforms; + unzip.crossDrv = nativePlatforms; + hdparm.crossDrv = nativePlatforms; + ddrescue.crossDrv = nativePlatforms; + git.crossDrv = nativePlatforms; + lynx.crossDrv = nativePlatforms; + patchelf.crossDrv = nativePlatforms; + nix.crossDrv = nativePlatforms; + fossil.crossDrv = nativePlatforms; + binutils.crossDrv = nativePlatforms; + mpg123.crossDrv = nativePlatforms; + yacas.crossDrv = nativePlatforms; + }; }) diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index efd0b4569f86..67647e11ccae 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 5052a41a96cf..3280df09dd54 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 f08c8a8189ce..ad2f8e901c14 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -1139,8 +1139,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; }; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 8fc364a60e38..f7c2ac399a43 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;